diff --git a/config/alfresco/avm-clt-context.xml b/config/alfresco/avm-clt-context.xml
index 22e0b6cea6..8c939fa361 100644
--- a/config/alfresco/avm-clt-context.xml
+++ b/config/alfresco/avm-clt-context.xml
@@ -3,7 +3,7 @@
 
 <beans>
     <!-- Remote AVM interface -->
-    <bean id="avmRemote" class="org.alfresco.repo.avm.clt.AVMRemoteImpl">
+    <bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
         <property name="avmRemoteTransport">
             <ref bean="avmRemoteTransport"/>
         </property>
@@ -14,14 +14,14 @@
             <value>rmi://localhost:1313/avm</value>
         </property>
         <property name="serviceInterface">
-            <value>org.alfresco.repo.avm.AVMRemoteTransport</value>
+            <value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
         </property>
         <property name="refreshStubOnConnectFailure">
             <value>true</value>
         </property>
     </bean>
 
-	<bean id="avmSyncService" class="org.alfresco.repo.avm.clt.AVMSyncServiceClient">
+	<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceClient">
 	    <property name="avmSyncServiceTransport">
 	    	<ref bean="avmSyncServiceTransport"/>
 	    </property>
@@ -32,7 +32,7 @@
             <value>rmi://localhost:1313/avmsync</value>
         </property>
         <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
+            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
         </property>
         <property name="refreshStubOnConnectFailure">
             <value>true</value>
diff --git a/config/alfresco/avm-services-context.xml b/config/alfresco/avm-services-context.xml
index ad06e1b88f..9da214476f 100644
--- a/config/alfresco/avm-services-context.xml
+++ b/config/alfresco/avm-services-context.xml
@@ -209,7 +209,7 @@
 			<ref bean="avmRemoteTransport"/>
 		</property>
 		<property name="serviceInterface">
-			<value>org.alfresco.repo.avm.AVMRemoteTransport</value>
+			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
 		</property>
 		<property name="serviceName">
 			<value>avm</value>
@@ -233,7 +233,7 @@
             <ref bean="avmSyncServiceTransport"/>
         </property>
         <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
+            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
         </property>
         <property name="serviceName">
             <value>avmsync</value>
diff --git a/config/alfresco/remote-avm-test-context.xml b/config/alfresco/remote-avm-test-context.xml
index 6dcf6d6411..4eb26fc473 100644
--- a/config/alfresco/remote-avm-test-context.xml
+++ b/config/alfresco/remote-avm-test-context.xml
@@ -17,7 +17,7 @@
     </bean>
 
 	<!-- Remote interface for AVM. -->
-	<bean id="avmRemote" class="org.alfresco.repo.avm.clt.AVMRemoteImpl">
+	<bean id="avmRemote" class="org.alfresco.repo.remote.AVMRemoteImpl">
 	    <property name="avmRemoteTransport">
 	        <ref bean="avmRemoteTransport"/>
 	    </property>
@@ -29,14 +29,14 @@
 			<value>rmi://localhost:1313/avm</value>
 		</property>
 		<property name="serviceInterface">
-			<value>org.alfresco.repo.avm.AVMRemoteTransport</value>
+			<value>org.alfresco.service.cmr.remote.AVMRemoteTransport</value>
 		</property>
 		<property name="refreshStubOnConnectFailure">
 			<value>true</value>
 		</property>
 	</bean>
 
-	<bean id="avmSyncService" class="org.alfresco.repo.avm.clt.AVMSyncServiceClient">
+	<bean id="avmSyncService" class="org.alfresco.repo.remote.AVMSyncServiceClient">
 	    <property name="avmSyncServiceTransport">
 	    	<ref bean="avmSyncServiceTransport"/>
 	    </property>
@@ -47,7 +47,7 @@
             <value>rmi://localhost:1313/avmsync</value>
         </property>
         <property name="serviceInterface">
-            <value>org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport</value>
+            <value>org.alfresco.service.cmr.remote.AVMSyncServiceTransport</value>
         </property>
         <property name="refreshStubOnConnectFailure">
             <value>true</value>
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
index cb35a21543..4176df1c8e 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteLocal.java
@@ -16,6 +16,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
+import org.alfresco.service.cmr.remote.AVMRemote;
 import org.alfresco.service.namespace.QName;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
index c43916380b..875d227f0f 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteTransportService.java
@@ -20,6 +20,7 @@ import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
+import org.alfresco.service.cmr.remote.AVMRemoteTransport;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.GUID;
diff --git a/source/java/org/alfresco/repo/avm/AVMSyncServiceTransportImpl.java b/source/java/org/alfresco/repo/avm/AVMSyncServiceTransportImpl.java
index 70bf50bfb2..7492e38653 100644
--- a/source/java/org/alfresco/repo/avm/AVMSyncServiceTransportImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMSyncServiceTransportImpl.java
@@ -7,7 +7,7 @@ import java.util.List;
 
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
-import org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport;
+import org.alfresco.service.cmr.remote.AVMSyncServiceTransport;
 import org.alfresco.service.cmr.security.AuthenticationService;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/AVMTestRemote.java b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
index 0afc730973..25d7d8f5ed 100644
--- a/source/java/org/alfresco/repo/avm/AVMTestRemote.java
+++ b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
@@ -21,10 +21,11 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.List;
 
-import org.alfresco.repo.avm.clt.ClientTicketHolder;
+import org.alfresco.repo.remote.ClientTicketHolder;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.remote.AVMRemote;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
diff --git a/source/java/org/alfresco/repo/avm/FileNameValidator.java b/source/java/org/alfresco/repo/avm/FileNameValidator.java
index d4b8c542ee..49cfe049a5 100644
--- a/source/java/org/alfresco/repo/avm/FileNameValidator.java
+++ b/source/java/org/alfresco/repo/avm/FileNameValidator.java
@@ -28,7 +28,7 @@ public class FileNameValidator
     /**
      * The bad file name pattern.
      */
-    private static String fgBadPattern = ".*[\"\\*\\\\><\\?/:\\|\\xA3\\xAC%&\\+;]+.*";
+    private static String fgBadPattern = ".*[\"\\*\\\\><\\?/:\\|\\xA3\\xAC%&;]+.*";
     
     /**
      * The compiled regex.
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMCopyIn.java b/source/java/org/alfresco/repo/clt/AVMCopyIn.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/clt/AVMCopyIn.java
rename to source/java/org/alfresco/repo/clt/AVMCopyIn.java
index e3b4a3cbba..72bebf71e7 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMCopyIn.java
+++ b/source/java/org/alfresco/repo/clt/AVMCopyIn.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -17,7 +17,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
  * Like cp from a local filesystem to AVM.
  * @author britt
  */
-public class AVMCopyIn extends AVMCltBase 
+public class AVMCopyIn extends CltBase 
 {
     private static Object [] flagDefs = { "-r", 0, "-v", 0 };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMCopyOut.java b/source/java/org/alfresco/repo/clt/AVMCopyOut.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/clt/AVMCopyOut.java
rename to source/java/org/alfresco/repo/clt/AVMCopyOut.java
index ca030ddd0d..81254a74ea 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMCopyOut.java
+++ b/source/java/org/alfresco/repo/clt/AVMCopyOut.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -18,7 +18,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
  * to a local filesystem.
  * @author britt
  */
-public class AVMCopyOut extends AVMCltBase 
+public class AVMCopyOut extends CltBase 
 {
     private static Object [] flagDefs = { "-r", 0, "-v", 0 };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMLs.java b/source/java/org/alfresco/repo/clt/AVMLs.java
similarity index 96%
rename from source/java/org/alfresco/repo/avm/clt/AVMLs.java
rename to source/java/org/alfresco/repo/clt/AVMLs.java
index 35f4ae4c4a..31fec158c5 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMLs.java
+++ b/source/java/org/alfresco/repo/clt/AVMLs.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
  * Get a listing of a node.
  * @author britt
  */
-public class AVMLs extends AVMCltBase
+public class AVMLs extends CltBase
 {
     private static Object [] flagDefs = { "-R", 0 };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMLsStores.java b/source/java/org/alfresco/repo/clt/AVMLsStores.java
similarity index 91%
rename from source/java/org/alfresco/repo/avm/clt/AVMLsStores.java
rename to source/java/org/alfresco/repo/clt/AVMLsStores.java
index cd3b9a7d6d..a18ac597fb 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMLsStores.java
+++ b/source/java/org/alfresco/repo/clt/AVMLsStores.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
  * List all avm stores in the repository.
  * @author britt
  */
-public class AVMLsStores extends AVMCltBase 
+public class AVMLsStores extends CltBase 
 {
     private static Object[] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMLsVersions.java b/source/java/org/alfresco/repo/clt/AVMLsVersions.java
similarity index 91%
rename from source/java/org/alfresco/repo/avm/clt/AVMLsVersions.java
rename to source/java/org/alfresco/repo/clt/AVMLsVersions.java
index 2ebb866de2..c8f0c7c707 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMLsVersions.java
+++ b/source/java/org/alfresco/repo/clt/AVMLsVersions.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.VersionDescriptor;
  * List all versions of a given store.
  * @author britt
  */
-public class AVMLsVersions extends AVMCltBase 
+public class AVMLsVersions extends CltBase 
 {
     private static Object [] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMMkDir.java b/source/java/org/alfresco/repo/clt/AVMMkDir.java
similarity index 95%
rename from source/java/org/alfresco/repo/avm/clt/AVMMkDir.java
rename to source/java/org/alfresco/repo/clt/AVMMkDir.java
index 3970e7933c..f32542567e 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMMkDir.java
+++ b/source/java/org/alfresco/repo/clt/AVMMkDir.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -12,7 +12,7 @@ import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
  * Make a directory.
  * @author britt
  */
-public class AVMMkDir extends AVMCltBase 
+public class AVMMkDir extends CltBase 
 {
     private static Object [] flagDefs = { "-p", 0 };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMMkLayeredDir.java b/source/java/org/alfresco/repo/clt/AVMMkLayeredDir.java
similarity index 91%
rename from source/java/org/alfresco/repo/avm/clt/AVMMkLayeredDir.java
rename to source/java/org/alfresco/repo/clt/AVMMkLayeredDir.java
index 2e4045f0e7..a500ba8b67 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMMkLayeredDir.java
+++ b/source/java/org/alfresco/repo/clt/AVMMkLayeredDir.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
  * @author britt
  *
  */
-public class AVMMkLayeredDir extends AVMCltBase 
+public class AVMMkLayeredDir extends CltBase 
 {
     private static Object [] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMMkStore.java b/source/java/org/alfresco/repo/clt/AVMMkStore.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/clt/AVMMkStore.java
rename to source/java/org/alfresco/repo/clt/AVMMkStore.java
index 1314911b3e..ff207373b4 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMMkStore.java
+++ b/source/java/org/alfresco/repo/clt/AVMMkStore.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
  * Create an AVM store.
  * @author britt
  */
-public class AVMMkStore extends AVMCltBase 
+public class AVMMkStore extends CltBase 
 {
     private static Object [] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMRm.java b/source/java/org/alfresco/repo/clt/AVMRm.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/clt/AVMRm.java
rename to source/java/org/alfresco/repo/clt/AVMRm.java
index bc8a5bb62a..a6351eab56 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMRm.java
+++ b/source/java/org/alfresco/repo/clt/AVMRm.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
  * Remove an AVM Node.
  * @author britt
  */
-public class AVMRm extends AVMCltBase 
+public class AVMRm extends CltBase 
 {
     private static Object [] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMSnapshot.java b/source/java/org/alfresco/repo/clt/AVMSnapshot.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/clt/AVMSnapshot.java
rename to source/java/org/alfresco/repo/clt/AVMSnapshot.java
index c7b33426b6..f01c3beac1 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMSnapshot.java
+++ b/source/java/org/alfresco/repo/clt/AVMSnapshot.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.util.List;
 import java.util.Map;
@@ -10,7 +10,7 @@ import java.util.Map;
  * Snapshot a store.
  * @author britt
  */
-public class AVMSnapshot extends AVMCltBase 
+public class AVMSnapshot extends CltBase 
 {
     private static Object [] flagDefs = { };
     
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java b/source/java/org/alfresco/repo/clt/CltBase.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/clt/AVMCltBase.java
rename to source/java/org/alfresco/repo/clt/CltBase.java
index d134887c94..f9659ba6fc 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMCltBase.java
+++ b/source/java/org/alfresco/repo/clt/CltBase.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.clt;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,8 +11,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.alfresco.repo.avm.AVMRemote;
+import org.alfresco.repo.remote.ClientTicketHolder;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
+import org.alfresco.service.cmr.remote.AVMRemote;
 import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -21,7 +22,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
  * This is the base class for AVM clts.
  * @author britt
  */
-public abstract class AVMCltBase 
+public abstract class CltBase 
 {
     /**
      * The instance of the remote interface.
@@ -49,7 +50,7 @@ public abstract class AVMCltBase
      * services. 
      * @param args The program arguments.
      */
-    protected AVMCltBase()
+    protected CltBase()
     {
         fContext = new ClassPathXmlApplicationContext("alfresco/avm-clt-context.xml");
         fAVMRemote = (AVMRemote)fContext.getBean("avmRemote");
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMRemoteImpl.java b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/clt/AVMRemoteImpl.java
rename to source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
index bc3b5200a5..ebe4c95c1e 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMRemoteImpl.java
+++ b/source/java/org/alfresco/repo/remote/AVMRemoteImpl.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.remote;
 
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -10,15 +10,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 
-import org.alfresco.repo.avm.AVMRemote;
-import org.alfresco.repo.avm.AVMRemoteInputStream;
-import org.alfresco.repo.avm.AVMRemoteOutputStream;
-import org.alfresco.repo.avm.AVMRemoteTransport;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.alfresco.service.cmr.avm.LayeringDescriptor;
 import org.alfresco.service.cmr.avm.VersionDescriptor;
+import org.alfresco.service.cmr.remote.AVMRemote;
+import org.alfresco.service.cmr.remote.AVMRemoteTransport;
 import org.alfresco.service.namespace.QName;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteInputStream.java b/source/java/org/alfresco/repo/remote/AVMRemoteInputStream.java
similarity index 96%
rename from source/java/org/alfresco/repo/avm/AVMRemoteInputStream.java
rename to source/java/org/alfresco/repo/remote/AVMRemoteInputStream.java
index c050e950de..925ded78ba 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteInputStream.java
+++ b/source/java/org/alfresco/repo/remote/AVMRemoteInputStream.java
@@ -15,12 +15,12 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.remote;
 
 import java.io.IOException;
 import java.io.InputStream;
 
-import org.alfresco.repo.avm.clt.ClientTicketHolder;
+import org.alfresco.service.cmr.remote.AVMRemoteTransport;
 
 /**
  * Wrapper around AVMRemote stream reading.
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteOutputStream.java b/source/java/org/alfresco/repo/remote/AVMRemoteOutputStream.java
similarity index 96%
rename from source/java/org/alfresco/repo/avm/AVMRemoteOutputStream.java
rename to source/java/org/alfresco/repo/remote/AVMRemoteOutputStream.java
index b6e625579b..cb8296babb 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteOutputStream.java
+++ b/source/java/org/alfresco/repo/remote/AVMRemoteOutputStream.java
@@ -14,12 +14,12 @@
  * language governing permissions and limitations under the
  * License.
  */
-package org.alfresco.repo.avm;
+package org.alfresco.repo.remote;
 
 import java.io.IOException;
 import java.io.OutputStream;
 
-import org.alfresco.repo.avm.clt.ClientTicketHolder;
+import org.alfresco.service.cmr.remote.AVMRemoteTransport;
 
 public class AVMRemoteOutputStream extends OutputStream 
 {
diff --git a/source/java/org/alfresco/repo/avm/clt/AVMSyncServiceClient.java b/source/java/org/alfresco/repo/remote/AVMSyncServiceClient.java
similarity index 95%
rename from source/java/org/alfresco/repo/avm/clt/AVMSyncServiceClient.java
rename to source/java/org/alfresco/repo/remote/AVMSyncServiceClient.java
index facd9c5670..84f43b7b77 100644
--- a/source/java/org/alfresco/repo/avm/clt/AVMSyncServiceClient.java
+++ b/source/java/org/alfresco/repo/remote/AVMSyncServiceClient.java
@@ -1,13 +1,13 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.remote;
 
 import java.util.List;
 
 import org.alfresco.service.cmr.avmsync.AVMDifference;
 import org.alfresco.service.cmr.avmsync.AVMSyncService;
-import org.alfresco.service.cmr.avmsync.AVMSyncServiceTransport;
+import org.alfresco.service.cmr.remote.AVMSyncServiceTransport;
 
 /**
  * Client side wrapper around the RMI based AVMSyncServiceTransport.
diff --git a/source/java/org/alfresco/repo/avm/clt/ClientTicketHolder.java b/source/java/org/alfresco/repo/remote/ClientTicketHolder.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/clt/ClientTicketHolder.java
rename to source/java/org/alfresco/repo/remote/ClientTicketHolder.java
index bd1d4762ff..5bc6ab83ee 100644
--- a/source/java/org/alfresco/repo/avm/clt/ClientTicketHolder.java
+++ b/source/java/org/alfresco/repo/remote/ClientTicketHolder.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm.clt;
+package org.alfresco.repo.remote;
 
 /**
  * Remote client utility to hold an authentication ticket.
diff --git a/source/java/org/alfresco/repo/avm/AVMRemote.java b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java
similarity index 99%
rename from source/java/org/alfresco/repo/avm/AVMRemote.java
rename to source/java/org/alfresco/service/cmr/remote/AVMRemote.java
index 974a47b9d3..2717258421 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemote.java
+++ b/source/java/org/alfresco/service/cmr/remote/AVMRemote.java
@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.remote;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteTransport.java b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
similarity index 99%
rename from source/java/org/alfresco/repo/avm/AVMRemoteTransport.java
rename to source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
index 36a1802c9e..24d9e13a0f 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteTransport.java
+++ b/source/java/org/alfresco/service/cmr/remote/AVMRemoteTransport.java
@@ -1,7 +1,7 @@
 /**
  * 
  */
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.remote;
 
 import java.util.Date;
 import java.util.List;
diff --git a/source/java/org/alfresco/service/cmr/avmsync/AVMSyncServiceTransport.java b/source/java/org/alfresco/service/cmr/remote/AVMSyncServiceTransport.java
similarity index 96%
rename from source/java/org/alfresco/service/cmr/avmsync/AVMSyncServiceTransport.java
rename to source/java/org/alfresco/service/cmr/remote/AVMSyncServiceTransport.java
index 9ef205c6a1..e47c6f17f3 100644
--- a/source/java/org/alfresco/service/cmr/avmsync/AVMSyncServiceTransport.java
+++ b/source/java/org/alfresco/service/cmr/remote/AVMSyncServiceTransport.java
@@ -1,10 +1,12 @@
 /**
  * 
  */
-package org.alfresco.service.cmr.avmsync;
+package org.alfresco.service.cmr.remote;
 
 import java.util.List;
 
+import org.alfresco.service.cmr.avmsync.AVMDifference;
+
 /**
  * A wrapper around AVMSyncService for remote access.
  * @author britt