-import org.wamblee.system.spring.DatabaseTesterComponent;
-import org.wamblee.usermgt.HibernateComponent;
+import org.wamblee.system.components.DatabaseComponentFactory;
+import org.wamblee.system.components.PropertyComponent;
+import org.wamblee.system.spring.component.DatabaseTesterComponent;
+import org.wamblee.system.spring.component.DatasourceComponent;
+import org.wamblee.system.spring.component.HibernateComponent;