diff --git a/config/alfresco/avm-services-context.xml b/config/alfresco/avm-services-context.xml
index 45256a3760..546f98bfeb 100644
--- a/config/alfresco/avm-services-context.xml
+++ b/config/alfresco/avm-services-context.xml
@@ -30,73 +30,73 @@
 	
 	<!-- Issuers are not actual entities. More like pseudo entities. -->
 	
-	<bean id="issuerDAO" class="org.alfresco.repo.avm.IssuerDAOHibernate">
+	<bean id="issuerDAO" class="org.alfresco.repo.avm.hibernate.IssuerDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmNodeDAO" class="org.alfresco.repo.avm.AVMNodeDAOHibernate">
+	<bean id="avmNodeDAO" class="org.alfresco.repo.avm.hibernate.AVMNodeDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmStoreDAO" class="org.alfresco.repo.avm.AVMStoreDAOHibernate">
+	<bean id="avmStoreDAO" class="org.alfresco.repo.avm.hibernate.AVMStoreDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="versionRootDAO" class="org.alfresco.repo.avm.VersionRootDAOHibernate">
+	<bean id="versionRootDAO" class="org.alfresco.repo.avm.hibernate.VersionRootDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="childEntryDAO" class="org.alfresco.repo.avm.ChildEntryDAOHibernate">
+	<bean id="childEntryDAO" class="org.alfresco.repo.avm.hibernate.ChildEntryDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="historyLinkDAO" class="org.alfresco.repo.avm.HistoryLinkDAOHibernate">
+	<bean id="historyLinkDAO" class="org.alfresco.repo.avm.hibernate.HistoryLinkDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="mergeLinkDAO" class="org.alfresco.repo.avm.MergeLinkDAOHibernate">
+	<bean id="mergeLinkDAO" class="org.alfresco.repo.avm.hibernate.MergeLinkDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="deletedChildDAO" class="org.alfresco.repo.avm.DeletedChildDAOHibernate">
+	<bean id="deletedChildDAO" class="org.alfresco.repo.avm.hibernate.DeletedChildDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="newInAVMStoreDAO" class="org.alfresco.repo.avm.NewInAVMStoreDAOHibernate">
+	<bean id="newInAVMStoreDAO" class="org.alfresco.repo.avm.hibernate.NewInAVMStoreDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmNodePropertyDAO" class="org.alfresco.repo.avm.AVMNodePropertyDAOHibernate">
+	<bean id="avmNodePropertyDAO" class="org.alfresco.repo.avm.hibernate.AVMNodePropertyDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmStorePropertyDAO" class="org.alfresco.repo.avm.AVMStorePropertyDAOHibernate">
+	<bean id="avmStorePropertyDAO" class="org.alfresco.repo.avm.hibernate.AVMStorePropertyDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmAspectNameDAO" class="org.alfresco.repo.avm.AVMAspectNameDAOHibernate">
+	<bean id="avmAspectNameDAO" class="org.alfresco.repo.avm.hibernate.AVMAspectNameDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
@@ -165,7 +165,7 @@
 	
 	<!-- The Retrying Transaction Helper. -->
 	<bean id="retryingTransaction" 
-		  class="org.alfresco.repo.avm.HibernateRetryingTransactionHelper">
+		  class="org.alfresco.repo.avm.hibernate.HibernateRetryingTransactionHelper">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
diff --git a/source/java/org/alfresco/repo/avm/AVMAspectName.java b/source/java/org/alfresco/repo/avm/AVMAspectName.java
index 6a94b24387..550b27a4c2 100644
--- a/source/java/org/alfresco/repo/avm/AVMAspectName.java
+++ b/source/java/org/alfresco/repo/avm/AVMAspectName.java
@@ -23,7 +23,7 @@ import org.alfresco.service.namespace.QName;
  * Interface to Aspect names on AVM nodes.
  * @author britt
  */
-interface AVMAspectName
+public interface AVMAspectName
 {
     /**
      * Set the node that has the Aspect. 
diff --git a/source/java/org/alfresco/repo/avm/AVMAspectNameDAO.java b/source/java/org/alfresco/repo/avm/AVMAspectNameDAO.java
index d201f62037..f0b9214086 100644
--- a/source/java/org/alfresco/repo/avm/AVMAspectNameDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMAspectNameDAO.java
@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * DAO for AVMAspectNames.
  * @author britt
  */
-interface AVMAspectNameDAO
+public interface AVMAspectNameDAO
 {
     /**
      * Persist an aspect name.
diff --git a/source/java/org/alfresco/repo/avm/AVMContext.java b/source/java/org/alfresco/repo/avm/AVMContext.java
index da23907dba..e6daa146ad 100644
--- a/source/java/org/alfresco/repo/avm/AVMContext.java
+++ b/source/java/org/alfresco/repo/avm/AVMContext.java
@@ -5,11 +5,11 @@ package org.alfresco.repo.avm;
 
 import org.alfresco.repo.content.ContentStore;
 import org.alfresco.repo.security.authentication.AuthenticationComponent;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.repository.ContentService;
 import org.alfresco.service.cmr.repository.MimetypeService;
 import org.alfresco.service.cmr.repository.NodeService;
-import org.alfresco.service.cmr.security.AuthenticationService;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawler.java b/source/java/org/alfresco/repo/avm/AVMCrawler.java
index a52e6f1c29..b91c4c6ee7 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawler.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawler.java
@@ -26,6 +26,11 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+
 
 /**
  * This is another tester designed to emulate more typical use patterns.
diff --git a/source/java/org/alfresco/repo/avm/AVMInterpreter.java b/source/java/org/alfresco/repo/avm/AVMInterpreter.java
index e759a68a69..8b1f4a070a 100644
--- a/source/java/org/alfresco/repo/avm/AVMInterpreter.java
+++ b/source/java/org/alfresco/repo/avm/AVMInterpreter.java
@@ -32,6 +32,10 @@ import java.util.Map;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.util.BulkLoader;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.NodeService;
diff --git a/source/java/org/alfresco/repo/avm/AVMNode.java b/source/java/org/alfresco/repo/avm/AVMNode.java
index 22fdd4b56e..85fe9825cb 100644
--- a/source/java/org/alfresco/repo/avm/AVMNode.java
+++ b/source/java/org/alfresco/repo/avm/AVMNode.java
@@ -20,13 +20,14 @@ import java.util.Map;
 
 import org.alfresco.repo.domain.DbAccessControlList;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.namespace.QName;
 
 /**
  * The Interface for versionable objects.
  * @author britt
  */
-interface AVMNode
+public interface AVMNode
 {
     /**
      * Set the ancestor of this node.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
index a6954bdf4e..6b3c0148b0 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeConverter.java
@@ -17,6 +17,7 @@
 
 package org.alfresco.repo.avm;
 
+import org.alfresco.service.cmr.avm.AVMException;
 import org.alfresco.service.cmr.repository.NodeRef;
 import org.alfresco.service.cmr.repository.StoreRef;
 import org.apache.log4j.Logger;
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java b/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
index e7a6b7d6f6..645aaa8759 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
@@ -30,7 +30,7 @@ import org.alfresco.service.namespace.QName;
  * Base class for all repository file system like objects.
  * @author britt
  */
-abstract class AVMNodeImpl implements AVMNode, Serializable
+public abstract class AVMNodeImpl implements AVMNode, Serializable
 {
     /**
      * The Object ID.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeProperty.java b/source/java/org/alfresco/repo/avm/AVMNodeProperty.java
index 7e934f4098..3abf3176f0 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeProperty.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeProperty.java
@@ -24,7 +24,7 @@ import org.alfresco.service.namespace.QName;
  * Alfresco Properties for AVM..
  * @author britt
  */
-interface AVMNodeProperty
+public interface AVMNodeProperty
 {
     /**
      * Set the node that owns this property.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodePropertyDAO.java b/source/java/org/alfresco/repo/avm/AVMNodePropertyDAO.java
index fcc5ad01cd..34795937e4 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodePropertyDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodePropertyDAO.java
@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * DAO for AVMNodeProperty.
  * @author britt
  */
-interface AVMNodePropertyDAO
+public interface AVMNodePropertyDAO
 {
     /**
      * Save the given AVMNodeProperty.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeService.java b/source/java/org/alfresco/repo/avm/AVMNodeService.java
index b2fa511911..49cedb801b 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeService.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeService.java
@@ -31,6 +31,13 @@ import java.util.SortedMap;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.repo.node.AbstractNodeServiceImpl;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.ClassDefinition;
 import org.alfresco.service.cmr.dictionary.InvalidAspectException;
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java b/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java
index f5987e7ebf..722e596a4e 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java
@@ -25,7 +25,7 @@ import org.hibernate.proxy.HibernateProxy;
  * types are fundamentally broken.
  * @author britt
  */
-class AVMNodeUnwrapper
+public class AVMNodeUnwrapper
 {
     public static AVMNode Unwrap(AVMNode node)
     {
diff --git a/source/java/org/alfresco/repo/avm/AVMRemote.java b/source/java/org/alfresco/repo/avm/AVMRemote.java
index af8e560c36..11254e6ee1 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemote.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemote.java
@@ -23,6 +23,10 @@ import java.util.Map;
 import java.util.SortedMap;
 
 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.namespace.QName;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
index 4182ad3c38..c2d99b1ae4 100644
--- a/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMRemoteImpl.java
@@ -28,6 +28,12 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+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.namespace.QName;
 import org.alfresco.util.GUID;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java
index f0a3a63476..e61d887299 100644
--- a/source/java/org/alfresco/repo/avm/AVMRepository.java
+++ b/source/java/org/alfresco/repo/avm/AVMRepository.java
@@ -27,6 +27,15 @@ import java.util.Map;
 import java.util.SortedMap;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
index 3da92ffec1..fadd97a1e6 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
@@ -29,6 +29,16 @@ import java.util.SortedMap;
 
 import org.alfresco.repo.avm.AVMRepository;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.LayeringDescriptor;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.util.TempFileProvider;
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTest.java b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
index b825673736..c297e9212f 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTest.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTest.java
@@ -31,6 +31,11 @@ import java.util.TreeMap;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.util.BulkLoader;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+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.namespace.QName;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
index 16f2c70a47..74510e1228 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceTestBase.java
@@ -24,6 +24,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import junit.framework.TestCase;
diff --git a/source/java/org/alfresco/repo/avm/AVMStore.java b/source/java/org/alfresco/repo/avm/AVMStore.java
index 8ee5069bed..0e3b9e0492 100644
--- a/source/java/org/alfresco/repo/avm/AVMStore.java
+++ b/source/java/org/alfresco/repo/avm/AVMStore.java
@@ -25,6 +25,9 @@ import java.util.Map;
 import java.util.SortedMap;
 
 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.VersionDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.namespace.QName;
 
@@ -33,7 +36,7 @@ import org.alfresco.service.namespace.QName;
  * and layering operations.
  * @author britt
  */
-interface AVMStore
+public interface AVMStore
 {
     /**
      * This returns the next version in this store that will be snapshotted.
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreDAO.java b/source/java/org/alfresco/repo/avm/AVMStoreDAO.java
index f49fd6fd4c..305968f226 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for Repositories.
  * @author britt
  */
-interface AVMStoreDAO
+public interface AVMStoreDAO
 {
     /**
      * Save an AVMStore, never before saved.
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index e26c5ae739..36e01f6f0e 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -31,6 +31,14 @@ import java.util.TreeMap;
 
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+import org.alfresco.service.cmr.avm.VersionDescriptor;
 import org.alfresco.service.cmr.dictionary.AspectDefinition;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -46,7 +54,7 @@ import org.alfresco.service.namespace.QName;
  * operation.
  * @author britt
  */
-class AVMStoreImpl implements AVMStore, Serializable
+public class AVMStoreImpl implements AVMStore, Serializable
 {
     static final long serialVersionUID = -1485972568675732904L;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreProperty.java b/source/java/org/alfresco/repo/avm/AVMStoreProperty.java
index 20e9662a88..7e437a1be6 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreProperty.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreProperty.java
@@ -24,7 +24,7 @@ import org.alfresco.service.namespace.QName;
  * Arbitrary properties associated with AVMStores.
  * @author britt
  */
-interface AVMStoreProperty
+public interface AVMStoreProperty
 {
     /**
      * Set the AVMStore.
diff --git a/source/java/org/alfresco/repo/avm/AVMStorePropertyDAO.java b/source/java/org/alfresco/repo/avm/AVMStorePropertyDAO.java
index 0c106e35be..0b3acd9715 100644
--- a/source/java/org/alfresco/repo/avm/AVMStorePropertyDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMStorePropertyDAO.java
@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * The DAO interface for AVMStoreProperties.
  * @author britt
  */
-interface AVMStorePropertyDAO
+public interface AVMStorePropertyDAO
 {
     /**
      * Persist a property.
diff --git a/source/java/org/alfresco/repo/avm/AVMTestRemote.java b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
index 7d0f5854a3..dec00018c1 100644
--- a/source/java/org/alfresco/repo/avm/AVMTestRemote.java
+++ b/source/java/org/alfresco/repo/avm/AVMTestRemote.java
@@ -19,6 +19,8 @@ package org.alfresco.repo.avm;
 
 import java.util.List;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMStoreDescriptor;
 import org.springframework.context.support.FileSystemXmlApplicationContext;
 
 import junit.framework.TestCase;
diff --git a/source/java/org/alfresco/repo/avm/AVMTester.java b/source/java/org/alfresco/repo/avm/AVMTester.java
index 51c010270b..3f6ff0ee72 100644
--- a/source/java/org/alfresco/repo/avm/AVMTester.java
+++ b/source/java/org/alfresco/repo/avm/AVMTester.java
@@ -28,6 +28,14 @@ import java.util.Map;
 import java.util.Random;
 import java.util.Set;
 
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMExistsException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
+import org.alfresco.service.cmr.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMWrongTypeException;
+
 /**
  * This is a Runnable which randomly performs operations on an AVM Repository.
  * It's purpose is to act as a single thread in a multithreaded stress tester.
diff --git a/source/java/org/alfresco/repo/avm/ChildEntry.java b/source/java/org/alfresco/repo/avm/ChildEntry.java
index ddbbdb1d9d..6f3b4a7e39 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntry.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntry.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * This interface represents an entry in a directory.
  * @author britt
  */
-interface ChildEntry
+public interface ChildEntry
 {
     /**
      * Set the name of the child. 
diff --git a/source/java/org/alfresco/repo/avm/ChildEntryDAO.java b/source/java/org/alfresco/repo/avm/ChildEntryDAO.java
index 69f7314e5c..6420cfd514 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntryDAO.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntryDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for ChildEntries.
  * @author britt
  */
-interface ChildEntryDAO
+public interface ChildEntryDAO
 {
     /**
      * Save an unsaved ChildEntry.
diff --git a/source/java/org/alfresco/repo/avm/DeletedChild.java b/source/java/org/alfresco/repo/avm/DeletedChild.java
index 60c0848fbd..73e8206a7d 100644
--- a/source/java/org/alfresco/repo/avm/DeletedChild.java
+++ b/source/java/org/alfresco/repo/avm/DeletedChild.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Interface to a deleted directory entry in a layered directory.
  * @author britt
  */
-interface DeletedChild
+public interface DeletedChild
 {
     /**
      * Get the name of the deleted child.
diff --git a/source/java/org/alfresco/repo/avm/DeletedChildDAO.java b/source/java/org/alfresco/repo/avm/DeletedChildDAO.java
index 4cbcca3bdc..635aa83cc6 100644
--- a/source/java/org/alfresco/repo/avm/DeletedChildDAO.java
+++ b/source/java/org/alfresco/repo/avm/DeletedChildDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for DeletedChildren.
  * @author britt
  */
-interface DeletedChildDAO
+public interface DeletedChildDAO
 {
     /**
      * Save an unsaved DeletedChild.
diff --git a/source/java/org/alfresco/repo/avm/DirectoryNode.java b/source/java/org/alfresco/repo/avm/DirectoryNode.java
index 3d618940d1..a6558fdb8f 100644
--- a/source/java/org/alfresco/repo/avm/DirectoryNode.java
+++ b/source/java/org/alfresco/repo/avm/DirectoryNode.java
@@ -20,11 +20,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * The interface for Directory Nodes.
  * @author britt
  */
-interface DirectoryNode extends AVMNode
+public interface DirectoryNode extends AVMNode
 {
     /**
      * Does this directory directly contain the specified node.
diff --git a/source/java/org/alfresco/repo/avm/HistoryLink.java b/source/java/org/alfresco/repo/avm/HistoryLink.java
index fe22acdccf..eeb7953b5c 100644
--- a/source/java/org/alfresco/repo/avm/HistoryLink.java
+++ b/source/java/org/alfresco/repo/avm/HistoryLink.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Interface for the ancestor-descendent relationship.
  * @author britt
  */
-interface HistoryLink
+public interface HistoryLink
 {
     /**
      * Set the ancestor part of this.
diff --git a/source/java/org/alfresco/repo/avm/HistoryLinkDAO.java b/source/java/org/alfresco/repo/avm/HistoryLinkDAO.java
index db2123c5af..895de21759 100644
--- a/source/java/org/alfresco/repo/avm/HistoryLinkDAO.java
+++ b/source/java/org/alfresco/repo/avm/HistoryLinkDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for history links.
  * @author britt
  */
-interface HistoryLinkDAO
+public interface HistoryLinkDAO
 {
     /**
      * Save and unsaved HistoryLink.
diff --git a/source/java/org/alfresco/repo/avm/IssuerDAO.java b/source/java/org/alfresco/repo/avm/IssuerDAO.java
index 4dde36090b..71a42e24d3 100644
--- a/source/java/org/alfresco/repo/avm/IssuerDAO.java
+++ b/source/java/org/alfresco/repo/avm/IssuerDAO.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * DAO for Issuers.
  * @author britt
  */
-interface IssuerDAO
+public interface IssuerDAO
 {
     /**
      * Get the Issuer value.
diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
index ff8789b441..8176562d09 100644
--- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
+++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
@@ -6,7 +6,7 @@ import java.util.List;
  * Interface for Layered Directories.
  * @author britt
  */
-interface LayeredDirectoryNode extends DirectoryNode, Layered
+public interface LayeredDirectoryNode extends DirectoryNode, Layered
 {
     /**
      * Does this node have a primary indirection.
diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
index fd5ba0c945..869dd0e6e6 100644
--- a/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/LayeredDirectoryNodeImpl.java
@@ -24,6 +24,11 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMCycleException;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * A layered directory node.  A layered directory node points at
  * an underlying directory, which may or may not exist.  The visible
diff --git a/source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java b/source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java
index bd4e0e7173..38c8167569 100644
--- a/source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/LayeredFileNodeImpl.java
@@ -17,6 +17,8 @@
 
 package org.alfresco.repo.avm;
 
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/MergeLink.java b/source/java/org/alfresco/repo/avm/MergeLink.java
index 1be0b9c153..7be48ddb5b 100644
--- a/source/java/org/alfresco/repo/avm/MergeLink.java
+++ b/source/java/org/alfresco/repo/avm/MergeLink.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * This is the interface for the merged from - to relationship.
  * @author britt
  */
-interface MergeLink
+public interface MergeLink
 {
     /**
      * Set the from part.
diff --git a/source/java/org/alfresco/repo/avm/MergeLinkDAO.java b/source/java/org/alfresco/repo/avm/MergeLinkDAO.java
index 830ba735b1..fb27f61572 100644
--- a/source/java/org/alfresco/repo/avm/MergeLinkDAO.java
+++ b/source/java/org/alfresco/repo/avm/MergeLinkDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for MergeLinks.
  * @author britt
  */
-interface MergeLinkDAO
+public interface MergeLinkDAO
 {
     /**
      * Save an unsaved MergeLink.
diff --git a/source/java/org/alfresco/repo/avm/NewInAVMStore.java b/source/java/org/alfresco/repo/avm/NewInAVMStore.java
index e07ed4f63f..cf03bb8969 100644
--- a/source/java/org/alfresco/repo/avm/NewInAVMStore.java
+++ b/source/java/org/alfresco/repo/avm/NewInAVMStore.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Eensy-weensy interface for tracking nodes that are new in a store. 
  * @author britt
  */
-interface NewInAVMStore
+public interface NewInAVMStore
 {
     /**
      * Get the AVMStore part.
diff --git a/source/java/org/alfresco/repo/avm/NewInAVMStoreDAO.java b/source/java/org/alfresco/repo/avm/NewInAVMStoreDAO.java
index fd3595739c..b5ecee1017 100644
--- a/source/java/org/alfresco/repo/avm/NewInAVMStoreDAO.java
+++ b/source/java/org/alfresco/repo/avm/NewInAVMStoreDAO.java
@@ -23,7 +23,7 @@ import java.util.List;
  * DAO for NewInAVMStore markers.
  * @author britt
  */
-interface NewInAVMStoreDAO
+public interface NewInAVMStoreDAO
 {
     /**
      * Save one.
diff --git a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
index e13634576f..95c9082271 100644
--- a/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/PlainDirectoryNodeImpl.java
@@ -24,6 +24,9 @@ import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
 
+import org.alfresco.service.cmr.avm.AVMBadArgumentException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
+
 /**
  * A plain directory.  No monkey tricks except for possiblyCopy.
  * @author britt
diff --git a/source/java/org/alfresco/repo/avm/PlainFileNodeImpl.java b/source/java/org/alfresco/repo/avm/PlainFileNodeImpl.java
index a9a0ee0c27..5c8af50e1c 100644
--- a/source/java/org/alfresco/repo/avm/PlainFileNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/PlainFileNodeImpl.java
@@ -20,6 +20,8 @@ package org.alfresco.repo.avm;
 import java.util.Map;
 
 import org.alfresco.repo.domain.PropertyValue;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNodeDescriptor;
 import org.alfresco.service.cmr.repository.ContentData;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.namespace.QName;
diff --git a/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java b/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java
index a17ec88801..ca780860c3 100644
--- a/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java
+++ b/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * Worker object for AVM Retrying Transactions.
  * @author britt
  */
-interface RetryingTransactionCallback
+public interface RetryingTransactionCallback
 {
     /**
      * Do our work.
diff --git a/source/java/org/alfresco/repo/avm/RetryingTransactionHelper.java b/source/java/org/alfresco/repo/avm/RetryingTransactionHelper.java
index 195948ba88..2735ac9f26 100644
--- a/source/java/org/alfresco/repo/avm/RetryingTransactionHelper.java
+++ b/source/java/org/alfresco/repo/avm/RetryingTransactionHelper.java
@@ -6,7 +6,7 @@ package org.alfresco.repo.avm;
  * when a transaction fails for synchronization reasons.
  * @author britt
  */
-interface RetryingTransactionHelper
+public interface RetryingTransactionHelper
 {
     /**
      * Perform a set of operations under a single transaction.
diff --git a/source/java/org/alfresco/repo/avm/VersionRoot.java b/source/java/org/alfresco/repo/avm/VersionRoot.java
index 3995be6355..b19e2d704e 100644
--- a/source/java/org/alfresco/repo/avm/VersionRoot.java
+++ b/source/java/org/alfresco/repo/avm/VersionRoot.java
@@ -20,7 +20,7 @@ package org.alfresco.repo.avm;
  * Represents a single version root.
  * @author britt
  */
-interface VersionRoot
+public interface VersionRoot
 {
     /**
      * @return the createDate
diff --git a/source/java/org/alfresco/repo/avm/VersionRootDAO.java b/source/java/org/alfresco/repo/avm/VersionRootDAO.java
index 64e8c67647..c9cba6e2fd 100644
--- a/source/java/org/alfresco/repo/avm/VersionRootDAO.java
+++ b/source/java/org/alfresco/repo/avm/VersionRootDAO.java
@@ -24,7 +24,7 @@ import java.util.List;
  * DAO for VersionRoot objects.
  * @author britt
  */
-interface VersionRootDAO
+public interface VersionRootDAO
 {
     /**
      * Save an unsaved VersionRoot.
diff --git a/source/java/org/alfresco/repo/avm/AVMAspectNameDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMAspectNameDAOHibernate.java
similarity index 94%
rename from source/java/org/alfresco/repo/avm/AVMAspectNameDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/AVMAspectNameDAOHibernate.java
index 1a4e590703..8054782076 100644
--- a/source/java/org/alfresco/repo/avm/AVMAspectNameDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMAspectNameDAOHibernate.java
@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMAspectName;
+import org.alfresco.repo.avm.AVMAspectNameDAO;
+import org.alfresco.repo.avm.AVMNode;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
similarity index 93%
rename from source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
index 460d2839c5..b03368425d 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
@@ -15,10 +15,16 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMNodeDAO;
+import org.alfresco.repo.avm.AVMNodeImpl;
+import org.alfresco.repo.avm.AVMNodeUnwrapper;
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.DirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java
similarity index 94%
rename from source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java
index e780840c6c..9c5fe6f3c9 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java
@@ -1,7 +1,10 @@
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMNodeProperty;
+import org.alfresco.repo.avm.AVMNodePropertyDAO;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
index bdefe7ed0b..45c632ccd9 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.AVMStoreDAO;
+import org.alfresco.repo.avm.AVMStoreImpl;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java
similarity index 94%
rename from source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java
index 2cc3c52f2b..00e794dfac 100644
--- a/source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java
@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.AVMStoreProperty;
+import org.alfresco.repo.avm.AVMStorePropertyDAO;
 import org.alfresco.service.namespace.QName;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
diff --git a/source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
similarity index 94%
rename from source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
index 7cb596889c..0b777db167 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
@@ -15,11 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
-import java.io.Serializable;
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.ChildEntry;
+import org.alfresco.repo.avm.ChildEntryDAO;
+import org.alfresco.repo.avm.DirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java
index dd685536e5..36df26bb8d 100644
--- a/source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java
@@ -15,10 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.DeletedChild;
+import org.alfresco.repo.avm.DeletedChildDAO;
+import org.alfresco.repo.avm.LayeredDirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java b/source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java
similarity index 93%
rename from source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java
rename to source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java
index 8bc879c640..2ec0c9abbd 100644
--- a/source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java
@@ -14,10 +14,11 @@
  * language governing permissions and limitations under the
  * License.
  */
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.sql.SQLException;
 
+import org.alfresco.repo.avm.RetryingTransactionCallback;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.springframework.orm.hibernate3.HibernateCallback;
diff --git a/source/java/org/alfresco/repo/avm/HibernateRetryingTransactionHelper.java b/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransactionHelper.java
similarity index 95%
rename from source/java/org/alfresco/repo/avm/HibernateRetryingTransactionHelper.java
rename to source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransactionHelper.java
index 8118ca2b8a..4751aa3c48 100644
--- a/source/java/org/alfresco/repo/avm/HibernateRetryingTransactionHelper.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransactionHelper.java
@@ -1,4 +1,4 @@
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 /*
  * Copyright (C) 2006 Alfresco, Inc.
@@ -19,6 +19,10 @@ package org.alfresco.repo.avm;
 
 import java.util.Random;
 
+import org.alfresco.repo.avm.RetryingTransactionCallback;
+import org.alfresco.repo.avm.RetryingTransactionHelper;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMNotFoundException;
 import org.apache.log4j.Logger;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.DeadlockLoserDataAccessException;
diff --git a/source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java
index c487b01c63..05c0655f1b 100644
--- a/source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java
@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.HistoryLink;
+import org.alfresco.repo.avm.HistoryLinkDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java
similarity index 93%
rename from source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java
index f7c07acee1..4cdf48bdd1 100644
--- a/source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java
@@ -15,9 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 
+import org.alfresco.repo.avm.IssuerDAO;
+import org.alfresco.service.cmr.avm.AVMException;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
diff --git a/source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java
index 15254497f8..ae8017ff60 100644
--- a/source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java
@@ -15,10 +15,13 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.MergeLink;
+import org.alfresco.repo.avm.MergeLinkDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java
similarity index 90%
rename from source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java
index 01d2ffa537..6bfbe516c7 100644
--- a/source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java
@@ -15,10 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMNode;
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.NewInAVMStore;
+import org.alfresco.repo.avm.NewInAVMStoreDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java b/source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java
similarity index 96%
rename from source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java
index 1defb50dc2..ce2519461a 100644
--- a/source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java
@@ -15,11 +15,14 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.repo.avm.hibernate;
 
 import java.util.Date;
 import java.util.List;
 
+import org.alfresco.repo.avm.AVMStore;
+import org.alfresco.repo.avm.VersionRoot;
+import org.alfresco.repo.avm.VersionRootDAO;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
diff --git a/source/java/org/alfresco/repo/avm/util/BulkLoader.java b/source/java/org/alfresco/repo/avm/util/BulkLoader.java
index 56a663214f..866cc9700a 100644
--- a/source/java/org/alfresco/repo/avm/util/BulkLoader.java
+++ b/source/java/org/alfresco/repo/avm/util/BulkLoader.java
@@ -23,8 +23,8 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 
-import org.alfresco.repo.avm.AVMException;
-import org.alfresco.repo.avm.AVMService;
+import org.alfresco.service.cmr.avm.AVMException;
+import org.alfresco.service.cmr.avm.AVMService;
 
 /**
  * This takes a filesystem directory path and a repository path and name
diff --git a/source/java/org/alfresco/repo/content/RoutingContentService.java b/source/java/org/alfresco/repo/content/RoutingContentService.java
index 506f9476a7..7e1901d2a7 100644
--- a/source/java/org/alfresco/repo/content/RoutingContentService.java
+++ b/source/java/org/alfresco/repo/content/RoutingContentService.java
@@ -25,7 +25,6 @@ import java.util.Set;
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
 import org.alfresco.repo.avm.AVMNodeConverter;
-import org.alfresco.repo.avm.AVMService;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentReadPolicy;
 import org.alfresco.repo.content.ContentServicePolicies.OnContentUpdatePolicy;
 import org.alfresco.repo.content.filestore.FileContentStore;
@@ -35,6 +34,7 @@ import org.alfresco.repo.content.transform.magick.ImageMagickContentTransformer;
 import org.alfresco.repo.policy.ClassPolicyDelegate;
 import org.alfresco.repo.policy.JavaBehaviour;
 import org.alfresco.repo.policy.PolicyComponent;
+import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.dictionary.DataTypeDefinition;
 import org.alfresco.service.cmr.dictionary.DictionaryService;
 import org.alfresco.service.cmr.dictionary.InvalidTypeException;
diff --git a/source/java/org/alfresco/repo/avm/AVMBadArgumentException.java b/source/java/org/alfresco/service/cmr/avm/AVMBadArgumentException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMBadArgumentException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMBadArgumentException.java
index bfe4515378..e1814e9f29 100644
--- a/source/java/org/alfresco/repo/avm/AVMBadArgumentException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMBadArgumentException.java
@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when bad or illegal arguments are passed.
diff --git a/source/java/org/alfresco/repo/avm/AVMCycleException.java b/source/java/org/alfresco/service/cmr/avm/AVMCycleException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMCycleException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMCycleException.java
index 34fa31a001..302db1695f 100644
--- a/source/java/org/alfresco/repo/avm/AVMCycleException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMCycleException.java
@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when a cycle is detected during lookup.
diff --git a/source/java/org/alfresco/repo/avm/AVMException.java b/source/java/org/alfresco/service/cmr/avm/AVMException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMException.java
index f6dc4b8c1c..a7a797a443 100644
--- a/source/java/org/alfresco/repo/avm/AVMException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMException.java
@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMExistsException.java b/source/java/org/alfresco/service/cmr/avm/AVMExistsException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMExistsException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMExistsException.java
index 6bdbb9f39a..5a50d82ec9 100644
--- a/source/java/org/alfresco/repo/avm/AVMExistsException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMExistsException.java
@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is thrown when a node exists and shouldn't.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
similarity index 99%
rename from source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java
rename to source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
index e5d84fcd84..89f1873415 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMNodeDescriptor.java
@@ -15,10 +15,12 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 
+import org.alfresco.repo.avm.AVMNodeType;
+
 /**
  * This class describes an AVM node object.  
  * It serves a similar purpose to the data structure
diff --git a/source/java/org/alfresco/repo/avm/AVMNotFoundException.java b/source/java/org/alfresco/service/cmr/avm/AVMNotFoundException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMNotFoundException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMNotFoundException.java
index 1cd760e20f..489c78d0ba 100644
--- a/source/java/org/alfresco/repo/avm/AVMNotFoundException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMNotFoundException.java
@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * This is the exception thrown when a node is not found.
diff --git a/source/java/org/alfresco/repo/avm/AVMService.java b/source/java/org/alfresco/service/cmr/avm/AVMService.java
similarity index 99%
rename from source/java/org/alfresco/repo/avm/AVMService.java
rename to source/java/org/alfresco/service/cmr/avm/AVMService.java
index f536e63652..db14ee4ca7 100644
--- a/source/java/org/alfresco/repo/avm/AVMService.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMService.java
@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.InputStream;
 import java.io.OutputStream;
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java b/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java
rename to source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java
index 4f279ede42..11a4e9757f 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMStoreDescriptor.java
@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 import java.util.Date;
diff --git a/source/java/org/alfresco/repo/avm/AVMWrongTypeException.java b/source/java/org/alfresco/service/cmr/avm/AVMWrongTypeException.java
similarity index 97%
rename from source/java/org/alfresco/repo/avm/AVMWrongTypeException.java
rename to source/java/org/alfresco/service/cmr/avm/AVMWrongTypeException.java
index 8562f95fc6..c2066879af 100644
--- a/source/java/org/alfresco/repo/avm/AVMWrongTypeException.java
+++ b/source/java/org/alfresco/service/cmr/avm/AVMWrongTypeException.java
@@ -15,7 +15,8 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
+
 
 /**
  * Thrown when an object of the wrong type is looked up.
diff --git a/source/java/org/alfresco/repo/avm/LayeringDescriptor.java b/source/java/org/alfresco/service/cmr/avm/LayeringDescriptor.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/LayeringDescriptor.java
rename to source/java/org/alfresco/service/cmr/avm/LayeringDescriptor.java
index 4600d59155..41bdee92e6 100644
--- a/source/java/org/alfresco/repo/avm/LayeringDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/LayeringDescriptor.java
@@ -15,10 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 
+
 /**
  * A value class containing information about the layering state of a looked up
  * node.
diff --git a/source/java/org/alfresco/repo/avm/VersionDescriptor.java b/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java
similarity index 98%
rename from source/java/org/alfresco/repo/avm/VersionDescriptor.java
rename to source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java
index dcc813f0cf..09eb1bafd7 100644
--- a/source/java/org/alfresco/repo/avm/VersionDescriptor.java
+++ b/source/java/org/alfresco/service/cmr/avm/VersionDescriptor.java
@@ -15,7 +15,7 @@
  * License.
  */
 
-package org.alfresco.repo.avm;
+package org.alfresco.service.cmr.avm;
 
 import java.io.Serializable;
 import java.util.Date;