diff --git a/config/alfresco/avm-base-context.xml b/config/alfresco/avm-base-context.xml
index c14f52042b..d47b7bd2b6 100644
--- a/config/alfresco/avm-base-context.xml
+++ b/config/alfresco/avm-base-context.xml
@@ -85,73 +85,73 @@
 		</property>
 	</bean>
 
-	<bean id="issuerDAO" class="org.alfresco.repo.avm.hibernate.IssuerDAOHibernate">
+	<bean id="issuerDAO" class="org.alfresco.repo.avm.IssuerDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="nodeDAO" class="org.alfresco.repo.avm.hibernate.AVMNodeDAOHibernate">
+	<bean id="nodeDAO" class="org.alfresco.repo.avm.AVMNodeDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmStoreDAO" class="org.alfresco.repo.avm.hibernate.AVMStoreDAOHibernate">
+	<bean id="avmStoreDAO" class="org.alfresco.repo.avm.AVMStoreDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="versionRootDAO" class="org.alfresco.repo.avm.hibernate.VersionRootDAOHibernate">
+	<bean id="versionRootDAO" class="org.alfresco.repo.avm.VersionRootDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="fileContentDAO" class="org.alfresco.repo.avm.hibernate.FileContentDAOHibernate">
+	<bean id="fileContentDAO" class="org.alfresco.repo.avm.FileContentDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="childEntryDAO" class="org.alfresco.repo.avm.hibernate.ChildEntryDAOHibernate">
+	<bean id="childEntryDAO" class="org.alfresco.repo.avm.ChildEntryDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="historyLinkDAO" class="org.alfresco.repo.avm.hibernate.HistoryLinkDAOHibernate">
+	<bean id="historyLinkDAO" class="org.alfresco.repo.avm.HistoryLinkDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="mergeLinkDAO" class="org.alfresco.repo.avm.hibernate.MergeLinkDAOHibernate">
+	<bean id="mergeLinkDAO" class="org.alfresco.repo.avm.MergeLinkDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 
-	<bean id="deletedChildDAO" class="org.alfresco.repo.avm.hibernate.DeletedChildDAOHibernate">
+	<bean id="deletedChildDAO" class="org.alfresco.repo.avm.DeletedChildDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="newInAVMStoreDAO" class="org.alfresco.repo.avm.hibernate.NewInAVMStoreDAOHibernate">
+	<bean id="newInAVMStoreDAO" class="org.alfresco.repo.avm.NewInAVMStoreDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmNodePropertyDAO" class="org.alfresco.repo.avm.hibernate.AVMNodePropertyDAOHibernate">
+	<bean id="avmNodePropertyDAO" class="org.alfresco.repo.avm.AVMNodePropertyDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
 	</bean>
 	
-	<bean id="avmStorePropertyDAO" class="org.alfresco.repo.avm.hibernate.AVMStorePropertyDAOHibernate">
+	<bean id="avmStorePropertyDAO" class="org.alfresco.repo.avm.AVMStorePropertyDAOHibernate">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
@@ -237,7 +237,7 @@
 
 	<!-- The Hibernate Transaction wrapper. -->
 	<bean id="retryingTransaction" 
-		  class="org.alfresco.repo.avm.hibernate.HibernateRetryingTransaction">
+		  class="org.alfresco.repo.avm.HibernateRetryingTransaction">
 		<property name="sessionFactory">
 			<ref bean="sessionFactory"/>
 		</property>
diff --git a/config/alfresco/avm-console-context.xml b/config/alfresco/avm-console-context.xml
index dde3a4f6da..b81a726440 100644
--- a/config/alfresco/avm-console-context.xml
+++ b/config/alfresco/avm-console-context.xml
@@ -13,7 +13,7 @@
 		</property>
 	</bean>
 	
-    <import resource="classpath:alfresco/avm-base-context.xml"/>
+    <import resource="file:config/alfresco/avm-base-context.xml"/>
 	
 	<bean id="bulkLoader" class="org.alfresco.repo.avm.util.BulkLoader">
 		<property name="avmService">
diff --git a/config/alfresco/avm-test-context.xml b/config/alfresco/avm-test-context.xml
index 0f30ffc1b0..a9c03c3397 100644
--- a/config/alfresco/avm-test-context.xml
+++ b/config/alfresco/avm-test-context.xml
@@ -13,6 +13,6 @@
 		</property>
 	</bean>
 
-    <import resource="classpath:alfresco/avm-base-context.xml"/>
+    <import resource="file:config/alfresco/avm-base-context.xml"/>
 
 </beans>
diff --git a/source/java/org/alfresco/repo/avm/AVMContext.java b/source/java/org/alfresco/repo/avm/AVMContext.java
index 3cfe817d08..4e088608b5 100644
--- a/source/java/org/alfresco/repo/avm/AVMContext.java
+++ b/source/java/org/alfresco/repo/avm/AVMContext.java
@@ -8,14 +8,14 @@ package org.alfresco.repo.avm;
  * point for access to needed global instances.
  * @author britt
  */
-public class AVMContext
+class AVMContext
 {
     /**
      * The single instance of an AVMContext.
      */
     public static AVMContext fgInstance;
     
-    public AVMContext()
+    AVMContext()
     {
         fgInstance = this;
     }
diff --git a/source/java/org/alfresco/repo/avm/AVMCrawler.java b/source/java/org/alfresco/repo/avm/AVMCrawler.java
index 10e5a7d0ab..0883844373 100644
--- a/source/java/org/alfresco/repo/avm/AVMCrawler.java
+++ b/source/java/org/alfresco/repo/avm/AVMCrawler.java
@@ -222,8 +222,7 @@ class AVMCrawler implements Runnable
                 return;
             }
             e.printStackTrace(System.err);
-            return;
-//            throw new AVMException("Failure", e);
+            throw new AVMException("Failure", e);
         }
     }
     
diff --git a/source/java/org/alfresco/repo/avm/AVMNode.java b/source/java/org/alfresco/repo/avm/AVMNode.java
index 295e79b151..7282182227 100644
--- a/source/java/org/alfresco/repo/avm/AVMNode.java
+++ b/source/java/org/alfresco/repo/avm/AVMNode.java
@@ -25,7 +25,7 @@ import org.alfresco.service.namespace.QName;
  * The Interface for versionable objects.
  * @author britt
  */
-public interface AVMNode
+interface AVMNode
 {
     /**
      * Set the ancestor of this node.
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeDAO.java b/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
index 8aa3b49bc8..1a6e5371dd 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeDAO.java
@@ -22,7 +22,7 @@ import java.util.List;
  * DAO for AVMNodes interface.
  * @author britt
  */
-public interface AVMNodeDAO
+interface AVMNodeDAO
 {
     /**
      * Save the given node, having never been saved before.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java b/source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java
similarity index 90%
rename from source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java
index 77fa28b9f4..4402509473 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMNodeDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeDAOHibernate.java
@@ -15,16 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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.DirectoryNode;
-import org.alfresco.repo.avm.AVMStore;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
@@ -32,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * @author britt
  *
  */
-public class AVMNodeDAOHibernate extends HibernateDaoSupport implements
+class AVMNodeDAOHibernate extends HibernateDaoSupport implements
         AVMNodeDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java b/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
index 56ac0a96e7..f246840cb5 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodeImpl.java
@@ -29,7 +29,7 @@ import org.alfresco.service.namespace.QName;
  * Base class for all repository file system like objects.
  * @author britt
  */
-public abstract class AVMNodeImpl implements AVMNode, Serializable
+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 3abf3176f0..7e934f4098 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
  */
-public interface AVMNodeProperty
+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 34795937e4..fcc5ad01cd 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
  */
-public interface AVMNodePropertyDAO
+interface AVMNodePropertyDAO
 {
     /**
      * Save the given AVMNodeProperty.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java b/source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java
similarity index 91%
rename from source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java
index ceb66c5b22..e780840c6c 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMNodePropertyDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodePropertyDAOHibernate.java
@@ -1,10 +1,7 @@
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
@@ -13,7 +10,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * Hibernate implemenation for DAO for AVMNodeProperties.
  * @author britt
  */
-public class AVMNodePropertyDAOHibernate extends HibernateDaoSupport 
+class AVMNodePropertyDAOHibernate extends HibernateDaoSupport 
     implements AVMNodePropertyDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/AVMNodePropertyImpl.java b/source/java/org/alfresco/repo/avm/AVMNodePropertyImpl.java
index 6ddeea1a84..3c4ec46654 100644
--- a/source/java/org/alfresco/repo/avm/AVMNodePropertyImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMNodePropertyImpl.java
@@ -23,10 +23,10 @@ import org.alfresco.repo.domain.PropertyValue;
 import org.alfresco.service.namespace.QName;
 
 /**
+ * A Property attached to an AVMNode.
  * @author britt
- *
  */
-public class AVMNodePropertyImpl implements AVMNodeProperty, Serializable
+class AVMNodePropertyImpl implements AVMNodeProperty, Serializable
 {
     private static final long serialVersionUID = -7194228119659288619L;
 
diff --git a/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java b/source/java/org/alfresco/repo/avm/AVMNodeUnwrapper.java
index 722e596a4e..f5987e7ebf 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
  */
-public class AVMNodeUnwrapper
+class AVMNodeUnwrapper
 {
     public static AVMNode Unwrap(AVMNode node)
     {
diff --git a/source/java/org/alfresco/repo/avm/AVMRepository.java b/source/java/org/alfresco/repo/avm/AVMRepository.java
index aeeced87a8..3df4c4f7bd 100644
--- a/source/java/org/alfresco/repo/avm/AVMRepository.java
+++ b/source/java/org/alfresco/repo/avm/AVMRepository.java
@@ -35,7 +35,7 @@ import org.alfresco.service.namespace.QName;
  * the implementors of the operations specified by AVMService.
  * @author britt
  */
-public class AVMRepository
+class AVMRepository
 {
     /**
      * The single instance of AVMRepository.
@@ -70,7 +70,7 @@ public class AVMRepository
     /**
      * Create a new one.
      */
-    public AVMRepository()
+    AVMRepository()
     {
         fLookupCount = new ThreadLocal<Integer>();
         fgInstance = this;
@@ -112,7 +112,7 @@ public class AVMRepository
         fLayerIssuer = layerIssuer;
     }
 
-    public void init()
+    void init()
     {
         File storageDir = new File(fStorage);
         storageDir.mkdirs();
diff --git a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
index e535710a59..03523d4231 100644
--- a/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMServiceImpl.java
@@ -37,7 +37,7 @@ import org.apache.log4j.Logger;
  * Implements the AVMService.  Stub.
  * @author britt
  */
-public class AVMServiceImpl implements AVMService
+class AVMServiceImpl implements AVMService
 {
     private static Logger fgLogger = Logger.getLogger(AVMServiceImpl.class);
     
@@ -64,7 +64,7 @@ public class AVMServiceImpl implements AVMService
     /**
      * Basic constructor for the service.
      */
-    public AVMServiceImpl()
+    AVMServiceImpl()
     {
     }
     
@@ -81,7 +81,7 @@ public class AVMServiceImpl implements AVMService
      * Final initialization of the service.  Must be called only on a 
      * fully initialized instance.
      */
-    public void init()
+    void init()
     {
         if (fInitialize)
         {
diff --git a/source/java/org/alfresco/repo/avm/AVMStore.java b/source/java/org/alfresco/repo/avm/AVMStore.java
index abbcd91a0d..5f8fa32614 100644
--- a/source/java/org/alfresco/repo/avm/AVMStore.java
+++ b/source/java/org/alfresco/repo/avm/AVMStore.java
@@ -33,7 +33,7 @@ import org.alfresco.service.namespace.QName;
  * and layering operations.
  * @author britt
  */
-public interface AVMStore
+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 305968f226..f49fd6fd4c 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
  */
-public interface AVMStoreDAO
+interface AVMStoreDAO
 {
     /**
      * Save an AVMStore, never before saved.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java b/source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java
index 7c40f77962..bdefe7ed0b 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMStoreDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreDAOHibernate.java
@@ -15,13 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
 
@@ -29,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * The Hibernate version for AVMStoreDAO
  * @author britt
  */
-public class AVMStoreDAOHibernate extends HibernateDaoSupport implements
+class AVMStoreDAOHibernate extends HibernateDaoSupport implements
         AVMStoreDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
index c3b36d56f8..74dc5f44b2 100644
--- a/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStoreImpl.java
@@ -41,7 +41,7 @@ import org.alfresco.service.namespace.QName;
  * operation.
  * @author britt
  */
-public class AVMStoreImpl implements AVMStore, Serializable
+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 7e437a1be6..20e9662a88 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
  */
-public interface AVMStoreProperty
+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 0b3acd9715..0c106e35be 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
  */
-public interface AVMStorePropertyDAO
+interface AVMStorePropertyDAO
 {
     /**
      * Persist a property.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java b/source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java
index 50815cbd0b..2cc3c52f2b 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/AVMStorePropertyDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/AVMStorePropertyDAOHibernate.java
@@ -15,13 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
@@ -30,7 +27,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * The Hibernate implementation of the DAO for AVMNodeProperties.
  * @author britt
  */
-public class AVMStorePropertyDAOHibernate extends HibernateDaoSupport implements AVMStorePropertyDAO
+class AVMStorePropertyDAOHibernate extends HibernateDaoSupport implements AVMStorePropertyDAO
 {
     /**
      * Persist a property.
diff --git a/source/java/org/alfresco/repo/avm/AVMStorePropertyImpl.java b/source/java/org/alfresco/repo/avm/AVMStorePropertyImpl.java
index fe6ea8c7d0..ac5b7a1329 100644
--- a/source/java/org/alfresco/repo/avm/AVMStorePropertyImpl.java
+++ b/source/java/org/alfresco/repo/avm/AVMStorePropertyImpl.java
@@ -26,7 +26,7 @@ import org.alfresco.service.namespace.QName;
  * Simple bean to hold properties attached to AVMStores.
  * @author britt
  */
-public class AVMStorePropertyImpl implements AVMStoreProperty, Serializable
+class AVMStorePropertyImpl implements AVMStoreProperty, Serializable
 {
     private static final long serialVersionUID = -5419606158990318723L;
 
diff --git a/source/java/org/alfresco/repo/avm/BasicAttributes.java b/source/java/org/alfresco/repo/avm/BasicAttributes.java
index 5336e97ecf..dbd1e81226 100644
--- a/source/java/org/alfresco/repo/avm/BasicAttributes.java
+++ b/source/java/org/alfresco/repo/avm/BasicAttributes.java
@@ -7,7 +7,7 @@ package org.alfresco.repo.avm;
  * Ownership, timestamps, later perhaps ACLs
  * @author britt
  */
-public interface BasicAttributes
+interface BasicAttributes
 {
     /**
      * Set the creator of the node.
diff --git a/source/java/org/alfresco/repo/avm/BasicAttributesImpl.java b/source/java/org/alfresco/repo/avm/BasicAttributesImpl.java
index d888c5b6cc..5a467272a8 100644
--- a/source/java/org/alfresco/repo/avm/BasicAttributesImpl.java
+++ b/source/java/org/alfresco/repo/avm/BasicAttributesImpl.java
@@ -10,7 +10,7 @@ import java.io.Serializable;
  * Implementation of the BasicAttributesBean.
  * @author britt
  */
-public class BasicAttributesImpl implements BasicAttributes, Serializable
+class BasicAttributesImpl implements BasicAttributes, Serializable
 {
     private static final long serialVersionUID = -3796354564923670005L;
 
diff --git a/source/java/org/alfresco/repo/avm/ChildEntry.java b/source/java/org/alfresco/repo/avm/ChildEntry.java
index 6f3b4a7e39..ddbbdb1d9d 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
  */
-public interface ChildEntry
+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 6420cfd514..69f7314e5c 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
  */
-public interface ChildEntryDAO
+interface ChildEntryDAO
 {
     /**
      * Save an unsaved ChildEntry.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java b/source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java
similarity index 90%
rename from source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java
index 18840c4ce0..630bdd2480 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/ChildEntryDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntryDAOHibernate.java
@@ -15,16 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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.ChildEntryImpl;
-import org.alfresco.repo.avm.DirectoryNode;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
@@ -32,7 +27,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * The Hibernate version of the ChildEntry DAO.
  * @author britt
  */
-public class ChildEntryDAOHibernate extends HibernateDaoSupport implements
+class ChildEntryDAOHibernate extends HibernateDaoSupport implements
         ChildEntryDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
index 1b0de5961d..fde14f3eee 100644
--- a/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
+++ b/source/java/org/alfresco/repo/avm/ChildEntryImpl.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * An entry in a directory. Contains a name, parent, and child.
  * @author britt
  */
-public class ChildEntryImpl implements ChildEntry, Serializable
+class ChildEntryImpl implements ChildEntry, Serializable
 {
     private static final long serialVersionUID = -307752114272916930L;
 
diff --git a/source/java/org/alfresco/repo/avm/DeletedChild.java b/source/java/org/alfresco/repo/avm/DeletedChild.java
index 73e8206a7d..60c0848fbd 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
  */
-public interface DeletedChild
+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 635aa83cc6..4cbcca3bdc 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
  */
-public interface DeletedChildDAO
+interface DeletedChildDAO
 {
     /**
      * Save an unsaved DeletedChild.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java b/source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java
similarity index 90%
rename from source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java
index ed811f78da..dd685536e5 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/DeletedChildDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/DeletedChildDAOHibernate.java
@@ -15,14 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
 
@@ -30,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * Hibernate implementation of DAO for DeletedChildren.
  * @author britt
  */
-public class DeletedChildDAOHibernate extends HibernateDaoSupport implements
+class DeletedChildDAOHibernate extends HibernateDaoSupport implements
         DeletedChildDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/DeletedChildImpl.java b/source/java/org/alfresco/repo/avm/DeletedChildImpl.java
index 57c2b210a1..bc4de4597b 100644
--- a/source/java/org/alfresco/repo/avm/DeletedChildImpl.java
+++ b/source/java/org/alfresco/repo/avm/DeletedChildImpl.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * Represents a deleted child in a layered directory.
  * @author britt
  */
-public class DeletedChildImpl implements DeletedChild, Serializable
+class DeletedChildImpl implements DeletedChild, Serializable
 {
     private static final long serialVersionUID = 4997060636280774719L;
 
diff --git a/source/java/org/alfresco/repo/avm/DirectoryNode.java b/source/java/org/alfresco/repo/avm/DirectoryNode.java
index 1cd5439775..567b69e345 100644
--- a/source/java/org/alfresco/repo/avm/DirectoryNode.java
+++ b/source/java/org/alfresco/repo/avm/DirectoryNode.java
@@ -23,7 +23,7 @@ import java.util.SortedMap;
  * The interface for Directory Nodes.
  * @author britt
  */
-public interface DirectoryNode extends AVMNode
+interface DirectoryNode extends AVMNode
 {
     /**
      * Does this directory directly contain the specified node.
diff --git a/source/java/org/alfresco/repo/avm/FileContent.java b/source/java/org/alfresco/repo/avm/FileContent.java
index 4a5cc20195..e4b9b357fd 100644
--- a/source/java/org/alfresco/repo/avm/FileContent.java
+++ b/source/java/org/alfresco/repo/avm/FileContent.java
@@ -24,7 +24,7 @@ import java.io.RandomAccessFile;
  * Interface for file content.  FileContent can be shared between files.
  * @author britt
  */
-public interface FileContent
+interface FileContent
 {
     /**
      * Get the number of files that refer to this content.
diff --git a/source/java/org/alfresco/repo/avm/FileContentDAO.java b/source/java/org/alfresco/repo/avm/FileContentDAO.java
index 5a707848f6..b3d0abe189 100644
--- a/source/java/org/alfresco/repo/avm/FileContentDAO.java
+++ b/source/java/org/alfresco/repo/avm/FileContentDAO.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * DAO for FileContent objects.
  * @author britt
  */
-public interface FileContentDAO
+interface FileContentDAO
 {
     /**
      * Save one.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/FileContentDAOHibernate.java b/source/java/org/alfresco/repo/avm/FileContentDAOHibernate.java
similarity index 84%
rename from source/java/org/alfresco/repo/avm/hibernate/FileContentDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/FileContentDAOHibernate.java
index 0c07376ce3..4747197dc5 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/FileContentDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/FileContentDAOHibernate.java
@@ -15,17 +15,15 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
-import org.alfresco.repo.avm.FileContent;
-import org.alfresco.repo.avm.FileContentDAO;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
  * @author britt
  *
  */
-public class FileContentDAOHibernate extends HibernateDaoSupport implements
+class FileContentDAOHibernate extends HibernateDaoSupport implements
         FileContentDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java b/source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java
similarity index 56%
rename from source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java
rename to source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java
index d4b03e2b47..8bc879c640 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/HibernateCallbackWrapper.java
+++ b/source/java/org/alfresco/repo/avm/HibernateCallbackWrapper.java
@@ -1,11 +1,23 @@
-/**
- * 
+/*
+ * Copyright (C) 2006 Alfresco, Inc.
+ *
+ * Licensed under the Mozilla Public License version 1.1 
+ * with a permitted attribution clause. You may obtain a
+ * copy of the License at
+ *
+ *   http://www.alfresco.org/legal/license.txt
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND,
+ * either express or implied. See the License for the specific
+ * language governing permissions and limitations under the
+ * License.
  */
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 import java.sql.SQLException;
 
-import org.alfresco.repo.avm.RetryingTransactionCallback;
 import org.hibernate.HibernateException;
 import org.hibernate.Session;
 import org.springframework.orm.hibernate3.HibernateCallback;
@@ -14,7 +26,7 @@ import org.springframework.orm.hibernate3.HibernateCallback;
  * This is a wrapper around HibernateTxnCallback implementation.
  * @author britt
  */
-public class HibernateCallbackWrapper implements HibernateCallback
+class HibernateCallbackWrapper implements HibernateCallback
 {
     /**
      * The HibernateTxnCallback to execute.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java b/source/java/org/alfresco/repo/avm/HibernateRetryingTransaction.java
similarity index 92%
rename from source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
rename to source/java/org/alfresco/repo/avm/HibernateRetryingTransaction.java
index 5b93f442df..c469329259 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/HibernateRetryingTransaction.java
+++ b/source/java/org/alfresco/repo/avm/HibernateRetryingTransaction.java
@@ -1,4 +1,4 @@
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 /*
  * Copyright (C) 2006 Alfresco, Inc.
@@ -19,10 +19,6 @@ package org.alfresco.repo.avm.hibernate;
 
 import java.util.Random;
 
-import org.alfresco.repo.avm.AVMException;
-import org.alfresco.repo.avm.AVMNotFoundException;
-import org.alfresco.repo.avm.RetryingTransactionCallback;
-import org.alfresco.repo.avm.RetryingTransaction;
 import org.apache.log4j.Logger;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.dao.DeadlockLoserDataAccessException;
@@ -37,7 +33,7 @@ import org.springframework.transaction.TransactionStatus;
  * Helper for DAOs.
  * @author britt
  */
-public class HibernateRetryingTransaction extends HibernateTemplate implements RetryingTransaction
+class HibernateRetryingTransaction extends HibernateTemplate implements RetryingTransaction
 {
     private static Logger fgLogger = Logger.getLogger(HibernateRetryingTransaction.class);
     
@@ -65,7 +61,7 @@ public class HibernateRetryingTransaction extends HibernateTemplate implements R
      * Make one up.
      * @param sessionFactory The SessionFactory.
      */
-    public HibernateRetryingTransaction()
+    HibernateRetryingTransaction()
     {
         fRandom = new Random();
     }
@@ -89,6 +85,10 @@ public class HibernateRetryingTransaction extends HibernateTemplate implements R
             }
             catch (Throwable t)
             {
+                if (status == null)
+                {
+                    t.printStackTrace(System.err);
+                }
                 if (!status.isCompleted())
                 {
                     fTransactionManager.rollback(status);
diff --git a/source/java/org/alfresco/repo/avm/HistoryLink.java b/source/java/org/alfresco/repo/avm/HistoryLink.java
index eeb7953b5c..fe22acdccf 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
  */
-public interface HistoryLink
+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 895de21759..db2123c5af 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
  */
-public interface HistoryLinkDAO
+interface HistoryLinkDAO
 {
     /**
      * Save and unsaved HistoryLink.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java b/source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java
index 6c1575c7fe..c487b01c63 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/HistoryLinkDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/HistoryLinkDAOHibernate.java
@@ -15,13 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
 
@@ -29,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * The Hibernate implementation of the DAO for HistoryLinks.
  * @author britt
  */
-public class HistoryLinkDAOHibernate extends HibernateDaoSupport implements
+class HistoryLinkDAOHibernate extends HibernateDaoSupport implements
         HistoryLinkDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/Issuer.java b/source/java/org/alfresco/repo/avm/Issuer.java
index 33dc665874..466ed623de 100644
--- a/source/java/org/alfresco/repo/avm/Issuer.java
+++ b/source/java/org/alfresco/repo/avm/Issuer.java
@@ -21,7 +21,7 @@ package org.alfresco.repo.avm;
  * This is a helper class that knows how to issue identifiers.
  * @author britt
  */
-public class Issuer
+class Issuer
 {
     /**
      * The next number to issue.
@@ -41,7 +41,7 @@ public class Issuer
     /**
      * Default constructor.
      */
-    public Issuer()
+    Issuer()
     {
     }
     
@@ -66,7 +66,7 @@ public class Issuer
     /**
      * After the database is up, get our value.
      */
-    public void init()
+    void init()
     {
         class TxnCallback implements RetryingTransactionCallback 
         {
diff --git a/source/java/org/alfresco/repo/avm/IssuerDAO.java b/source/java/org/alfresco/repo/avm/IssuerDAO.java
index 71a42e24d3..4dde36090b 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
  */
-public interface IssuerDAO
+interface IssuerDAO
 {
     /**
      * Get the Issuer value.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java b/source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java
index 4324b99d84..f7c07acee1 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/IssuerDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/IssuerDAOHibernate.java
@@ -15,18 +15,16 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 
-import org.alfresco.repo.avm.AVMException;
-import org.alfresco.repo.avm.IssuerDAO;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
 /**
  * DAO for Issuers.  Hibernate version.
  * @author britt
  */
-public class IssuerDAOHibernate extends HibernateDaoSupport implements
+class IssuerDAOHibernate extends HibernateDaoSupport implements
         IssuerDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java b/source/java/org/alfresco/repo/avm/LayeredDirectoryNode.java
index 8176562d09..ff8789b441 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
  */
-public interface LayeredDirectoryNode extends DirectoryNode, Layered
+interface LayeredDirectoryNode extends DirectoryNode, Layered
 {
     /**
      * Does this node have a primary indirection.
diff --git a/source/java/org/alfresco/repo/avm/MergeLink.java b/source/java/org/alfresco/repo/avm/MergeLink.java
index 7be48ddb5b..1be0b9c153 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
  */
-public interface MergeLink
+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 fb27f61572..830ba735b1 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
  */
-public interface MergeLinkDAO
+interface MergeLinkDAO
 {
     /**
      * Save an unsaved MergeLink.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java b/source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java
similarity index 89%
rename from source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java
index 6efcf32c2b..15254497f8 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/MergeLinkDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/MergeLinkDAOHibernate.java
@@ -15,13 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
 
@@ -29,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * The Hibernate implementation of the DAO for a MergeLink
  * @author britt
  */
-public class MergeLinkDAOHibernate extends HibernateDaoSupport implements
+class MergeLinkDAOHibernate extends HibernateDaoSupport implements
         MergeLinkDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/NewInAVMStore.java b/source/java/org/alfresco/repo/avm/NewInAVMStore.java
index cf03bb8969..e07ed4f63f 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
  */
-public interface NewInAVMStore
+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 b5ecee1017..fd3595739c 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
  */
-public interface NewInAVMStoreDAO
+interface NewInAVMStoreDAO
 {
     /**
      * Save one.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java b/source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java
similarity index 87%
rename from source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java
index 6bf37285ba..01d2ffa537 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/NewInAVMStoreDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/NewInAVMStoreDAOHibernate.java
@@ -15,14 +15,10 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 import java.util.List;
 
-import org.alfresco.repo.avm.AVMNode;
-import org.alfresco.repo.avm.NewInAVMStore;
-import org.alfresco.repo.avm.NewInAVMStoreDAO;
-import org.alfresco.repo.avm.AVMStore;
 import org.hibernate.Query;
 import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
 
@@ -30,7 +26,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * Hibernate implementation of NewInAVMStore DAO.
  * @author britt
  */
-public class NewInAVMStoreDAOHibernate extends HibernateDaoSupport implements
+class NewInAVMStoreDAOHibernate extends HibernateDaoSupport implements
         NewInAVMStoreDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/NewInAVMStoreImpl.java b/source/java/org/alfresco/repo/avm/NewInAVMStoreImpl.java
index 016ecc6183..2f232078a1 100644
--- a/source/java/org/alfresco/repo/avm/NewInAVMStoreImpl.java
+++ b/source/java/org/alfresco/repo/avm/NewInAVMStoreImpl.java
@@ -23,7 +23,7 @@ import java.io.Serializable;
  * A record of a node that is new and in which store it resides.
  * @author britt
  */
-public class NewInAVMStoreImpl implements NewInAVMStore, Serializable
+class NewInAVMStoreImpl implements NewInAVMStore, Serializable
 {
     private static final long serialVersionUID = 1905996612150732182L;
 
diff --git a/source/java/org/alfresco/repo/avm/OrphanReaper.java b/source/java/org/alfresco/repo/avm/OrphanReaper.java
index 2f085e9cca..4afdb698c6 100644
--- a/source/java/org/alfresco/repo/avm/OrphanReaper.java
+++ b/source/java/org/alfresco/repo/avm/OrphanReaper.java
@@ -27,7 +27,7 @@ import org.apache.commons.logging.LogFactory;
  * in the AVM repository.  These orphans arise from purge operations.
  * @author britt
  */
-public class OrphanReaper implements Runnable
+class OrphanReaper implements Runnable
 {
     private Log fgLogger = LogFactory.getLog(OrphanReaper.class);
     /**
@@ -69,7 +69,7 @@ public class OrphanReaper implements Runnable
     /**
      * Create one with default parameters.
      */
-    public OrphanReaper()
+    OrphanReaper()
     {
         fInactiveBaseSleep = 30000;
         fActiveBaseSleep = 1000;
@@ -119,7 +119,7 @@ public class OrphanReaper implements Runnable
     /**
      * Start things up after configuration is complete.
      */
-    public void init()
+    void init()
     {
         fThread = new Thread(this);
         fThread.start();
@@ -129,7 +129,7 @@ public class OrphanReaper implements Runnable
      * Shutdown the reaper. This needs to be called when 
      * the application shuts down.
      */
-    public void shutDown()
+    void shutDown()
     {
         fDone = true;
         try
diff --git a/source/java/org/alfresco/repo/avm/RetryingTransaction.java b/source/java/org/alfresco/repo/avm/RetryingTransaction.java
index d489e04e29..4e8c0a0fb6 100644
--- a/source/java/org/alfresco/repo/avm/RetryingTransaction.java
+++ b/source/java/org/alfresco/repo/avm/RetryingTransaction.java
@@ -1,9 +1,13 @@
 package org.alfresco.repo.avm;
 
-
-public interface RetryingTransaction
+/**
+ * Interface for a retrying transaction. All operations, so far,
+ * in the AVM repository are idempotent and can thus be retried
+ * when a transaction fails for synchronization reasons.
+ * @author britt
+ */
+interface RetryingTransaction
 {
-
     /**
      * Perform a set of operations under a single transaction.
      * Keep trying if the operation fails because of a concurrency issue.
diff --git a/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java b/source/java/org/alfresco/repo/avm/RetryingTransactionCallback.java
index ca780860c3..a17ec88801 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
  */
-public interface RetryingTransactionCallback
+interface RetryingTransactionCallback
 {
     /**
      * Do our work.
diff --git a/source/java/org/alfresco/repo/avm/VersionRoot.java b/source/java/org/alfresco/repo/avm/VersionRoot.java
index b19e2d704e..3995be6355 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
  */
-public interface VersionRoot
+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 c9cba6e2fd..64e8c67647 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
  */
-public interface VersionRootDAO
+interface VersionRootDAO
 {
     /**
      * Save an unsaved VersionRoot.
diff --git a/source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java b/source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java
similarity index 94%
rename from source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java
rename to source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java
index fbbd7c585d..1defb50dc2 100644
--- a/source/java/org/alfresco/repo/avm/hibernate/VersionRootDAOHibernate.java
+++ b/source/java/org/alfresco/repo/avm/VersionRootDAOHibernate.java
@@ -15,14 +15,11 @@
  * License.
  */
 
-package org.alfresco.repo.avm.hibernate;
+package org.alfresco.repo.avm;
 
 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;
 
@@ -30,7 +27,7 @@ import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
  * This is the Hibernate version of the DAO for version roots.
  * @author britt
  */
-public class VersionRootDAOHibernate extends HibernateDaoSupport implements
+class VersionRootDAOHibernate extends HibernateDaoSupport implements
         VersionRootDAO
 {
     /**
diff --git a/source/java/org/alfresco/repo/avm/VersionRootImpl.java b/source/java/org/alfresco/repo/avm/VersionRootImpl.java
index b725b33fd6..0d9b441610 100644
--- a/source/java/org/alfresco/repo/avm/VersionRootImpl.java
+++ b/source/java/org/alfresco/repo/avm/VersionRootImpl.java
@@ -24,7 +24,7 @@ import java.io.Serializable;
  * Hold a single version root.
  * @author britt
  */
-public class VersionRootImpl implements VersionRoot, Serializable
+class VersionRootImpl implements VersionRoot, Serializable
 {
     static final long serialVersionUID = 8826954538210455917L;