diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/ComponentManagerAdaptor.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ComponentManagerAdaptor.java
similarity index 87%
rename from proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/ComponentManagerAdaptor.java
rename to proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ComponentManagerAdaptor.java
index a8eb3a686..2d8cce445 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/service/ComponentManagerAdaptor.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/ComponentManagerAdaptor.java
@@ -5,10 +5,12 @@
  * version 1.1, a copy of which has been included  with this distribution in
  * the LICENSE.txt file.
  */
-package org.apache.myrmidon.interfaces.service;
+package org.apache.myrmidon.components.workspace;
 
 import org.apache.avalon.framework.component.ComponentException;
 import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.myrmidon.interfaces.service.ServiceException;
+import org.apache.myrmidon.interfaces.service.ServiceManager;
 
 /**
  * An adaptor from {@link ComponentManager} to {@link ServiceManager}.
@@ -16,7 +18,7 @@ import org.apache.avalon.framework.component.ComponentManager;
  * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  * @version $Revision$ $Date$
  */
-public class ComponentManagerAdaptor
+class ComponentManagerAdaptor
     implements ServiceManager
 {
     private final ComponentManager m_componentManager;
diff --git a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
index 1ebdb7570..133f07d2f 100644
--- a/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
+++ b/proposal/myrmidon/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
@@ -37,7 +37,6 @@ import org.apache.myrmidon.interfaces.executor.Executor;
 import org.apache.myrmidon.interfaces.model.Project;
 import org.apache.myrmidon.interfaces.model.Target;
 import org.apache.myrmidon.interfaces.model.TypeLib;
-import org.apache.myrmidon.interfaces.service.ComponentManagerAdaptor;
 import org.apache.myrmidon.interfaces.service.MultiSourceServiceManager;
 import org.apache.myrmidon.interfaces.service.ServiceManager;
 import org.apache.myrmidon.interfaces.type.TypeManager;