diff --git a/spring-hibernate3/.springBeans b/spring-hibernate3/.springBeans
index 7623a7e888..b854542b58 100644
--- a/spring-hibernate3/.springBeans
+++ b/spring-hibernate3/.springBeans
@@ -7,7 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/main/webapp/WEB-INF/mvc-servlet.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/AbstractHibernateDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/AbstractHibernateDao.java
similarity index 97%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/AbstractHibernateDao.java
rename to spring-hibernate3/src/main/java/org/baeldung/persistence/dao/AbstractHibernateDao.java
index 9a579245d3..0f8b132891 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/AbstractHibernateDao.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/AbstractHibernateDao.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.dao;
+package org.baeldung.persistence.dao;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java
similarity index 70%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java
rename to spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java
index 1c76ed1f04..23de04169e 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/FooDao.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java
@@ -1,6 +1,6 @@
-package org.baeldung.spring.persistence.dao;
+package org.baeldung.persistence.dao;
 
-import org.baeldung.spring.persistence.model.Foo;
+import org.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository
diff --git a/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..6a3bd95d71
--- /dev/null
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IFooDao.java
@@ -0,0 +1,7 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.model.Foo;
+
+public interface IFooDao extends IOperations<Foo> {
+    //
+}
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IOperations.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IOperations.java
similarity index 87%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IOperations.java
rename to spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IOperations.java
index 51591c57b4..8c5a5e1aed 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IOperations.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/dao/IOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.dao;
+package org.baeldung.persistence.dao;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/model/Foo.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/model/Foo.java
similarity index 97%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/model/Foo.java
rename to spring-hibernate3/src/main/java/org/baeldung/persistence/model/Foo.java
index 2043d087e0..8e1dee33e8 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/model/Foo.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.model;
+package org.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/service/FooService.java b/spring-hibernate3/src/main/java/org/baeldung/persistence/service/FooService.java
similarity index 73%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/service/FooService.java
rename to spring-hibernate3/src/main/java/org/baeldung/persistence/service/FooService.java
index 1d3b5c4a02..b07698c438 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/service/FooService.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/persistence/service/FooService.java
@@ -1,7 +1,7 @@
-package org.baeldung.spring.persistence.service;
+package org.baeldung.persistence.service;
 
-import org.baeldung.spring.persistence.dao.IFooDao;
-import org.baeldung.spring.persistence.model.Foo;
+import org.baeldung.persistence.dao.IFooDao;
+import org.baeldung.persistence.model.Foo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
similarity index 98%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java
rename to spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
index 769f3132f5..b205c27cdc 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.config;
+package org.baeldung.spring;
 
 import java.util.Properties;
 
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceXmlConfig.java b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
similarity index 91%
rename from spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceXmlConfig.java
rename to spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
index e38b57fbca..c535d1b1bd 100644
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/config/PersistenceXmlConfig.java
+++ b/spring-hibernate3/src/main/java/org/baeldung/spring/PersistenceXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.config;
+package org.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ImportResource;
diff --git a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java b/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java
deleted file mode 100644
index eea1f17b5a..0000000000
--- a/spring-hibernate3/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.baeldung.spring.persistence.dao;
-
-import org.baeldung.spring.persistence.model.Foo;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}
diff --git a/spring-hibernate3/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-hibernate3/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index 5463820874..0000000000
--- a/spring-hibernate3/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" >
-
-</beans>
\ No newline at end of file
diff --git a/spring-hibernate3/src/main/webapp/WEB-INF/web.xml b/spring-hibernate3/src/main/webapp/WEB-INF/web.xml
index e0de9aefd4..5db6f59746 100644
--- a/spring-hibernate3/src/main/webapp/WEB-INF/web.xml
+++ b/spring-hibernate3/src/main/webapp/WEB-INF/web.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-  <display-name>Spring MVC Application</display-name>
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+    <display-name>Spring Hibernate 3 Application</display-name>
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>
             org.springframework.web.context.support.AnnotationConfigWebApplicationContext
       	</param-value>
-  </context-param>
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>org.baeldung.spring.persistence.config</param-value>
-  </context-param>
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.spring</param-value>
+    </context-param>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 </web-app>
\ No newline at end of file
diff --git a/spring-hibernate3/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-hibernate3/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
index 576f536adc..9744985356 100644
--- a/spring-hibernate3/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-hibernate3/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -2,8 +2,9 @@ package org.baeldung.spring.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import org.baeldung.spring.persistence.config.PersistenceConfig;
-import org.baeldung.spring.persistence.model.Foo;
+import org.baeldung.persistence.model.Foo;
+import org.baeldung.persistence.service.FooService;
+import org.baeldung.spring.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-hibernate4/.springBeans b/spring-hibernate4/.springBeans
index 7623a7e888..b854542b58 100644
--- a/spring-hibernate4/.springBeans
+++ b/spring-hibernate4/.springBeans
@@ -7,7 +7,6 @@
 	</configSuffixes>
 	<enableImports><![CDATA[false]]></enableImports>
 	<configs>
-		<config>src/main/webapp/WEB-INF/mvc-servlet.xml</config>
 	</configs>
 	<configSets>
 	</configSets>
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IChildDao.java
new file mode 100644
index 0000000000..3bc0dc1fc4
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IChildDao.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Child;
+
+public interface IChildDao extends IOperations<Child> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IFooDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IFooDao.java
new file mode 100644
index 0000000000..fc3928d8a6
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IFooDao.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Foo;
+
+public interface IFooDao extends IOperations<Foo> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IParentDao.java
new file mode 100644
index 0000000000..09158a4143
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/IParentDao.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.dao;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Parent;
+
+public interface IParentDao extends IOperations<Parent> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/AbstractHibernateDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/AbstractHibernateDao.java
similarity index 96%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/AbstractHibernateDao.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/AbstractHibernateDao.java
index 3476b8cadc..048253d17a 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/AbstractHibernateDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/AbstractHibernateDao.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.dao.common;
+package org.baeldung.persistence.dao.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/IOperations.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/IOperations.java
similarity index 85%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/IOperations.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/IOperations.java
index 12ac048d74..1c84b06c85 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/common/IOperations.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/IOperations.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.dao.common;
+package org.baeldung.persistence.dao.common;
 
 import java.io.Serializable;
 import java.util.List;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
similarity index 63%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ChildDao.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
index 380787823c..d9c8fdceec 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ChildDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.spring.persistence.dao.impl;
+package org.baeldung.persistence.dao.impl;
 
-import org.baeldung.spring.persistence.dao.IChildDao;
-import org.baeldung.spring.persistence.dao.common.AbstractHibernateDao;
-import org.baeldung.spring.persistence.model.Child;
+import org.baeldung.persistence.dao.IChildDao;
+import org.baeldung.persistence.dao.common.AbstractHibernateDao;
+import org.baeldung.persistence.model.Child;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/FooDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
similarity index 63%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/FooDao.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
index c083b41799..4441215a94 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/FooDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.spring.persistence.dao.impl;
+package org.baeldung.persistence.dao.impl;
 
-import org.baeldung.spring.persistence.dao.IFooDao;
-import org.baeldung.spring.persistence.dao.common.AbstractHibernateDao;
-import org.baeldung.spring.persistence.model.Foo;
+import org.baeldung.persistence.dao.IFooDao;
+import org.baeldung.persistence.dao.common.AbstractHibernateDao;
+import org.baeldung.persistence.model.Foo;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
similarity index 63%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ParentDao.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
index 6604c7a774..003ec62741 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/impl/ParentDao.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java
@@ -1,8 +1,8 @@
-package org.baeldung.spring.persistence.dao.impl;
+package org.baeldung.persistence.dao.impl;
 
-import org.baeldung.spring.persistence.dao.IParentDao;
-import org.baeldung.spring.persistence.dao.common.AbstractHibernateDao;
-import org.baeldung.spring.persistence.model.Parent;
+import org.baeldung.persistence.dao.IParentDao;
+import org.baeldung.persistence.dao.common.AbstractHibernateDao;
+import org.baeldung.persistence.model.Parent;
 import org.hibernate.SessionFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Child.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Child.java
similarity index 94%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Child.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/model/Child.java
index 978502242c..4eec4cf1d3 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Child.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Child.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.model;
+package org.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Foo.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Foo.java
similarity index 97%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Foo.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/model/Foo.java
index 2043d087e0..8e1dee33e8 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Foo.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Foo.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.model;
+package org.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Parent.java
similarity index 96%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/model/Parent.java
index 5a87028960..19e405615d 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/model/Parent.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/model/Parent.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.model;
+package org.baeldung.persistence.model;
 
 import java.io.Serializable;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IChildService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IChildService.java
new file mode 100644
index 0000000000..c6c5e2cfb1
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IChildService.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.service;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Child;
+
+public interface IChildService extends IOperations<Child> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IFooService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IFooService.java
new file mode 100644
index 0000000000..8774320450
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IFooService.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.service;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Foo;
+
+public interface IFooService extends IOperations<Foo> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IParentService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IParentService.java
new file mode 100644
index 0000000000..1782c281d2
--- /dev/null
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/IParentService.java
@@ -0,0 +1,8 @@
+package org.baeldung.persistence.service;
+
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Parent;
+
+public interface IParentService extends IOperations<Parent> {
+    //
+}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/common/AbstractService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
similarity index 87%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/common/AbstractService.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
index 6d0f2f49d6..3b32bc3ebb 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/common/AbstractService.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/common/AbstractService.java
@@ -1,9 +1,9 @@
-package org.baeldung.spring.persistence.service.common;
+package org.baeldung.persistence.service.common;
 
 import java.io.Serializable;
 import java.util.List;
 
-import org.baeldung.spring.persistence.dao.common.IOperations;
+import org.baeldung.persistence.dao.common.IOperations;
 import org.springframework.transaction.annotation.Transactional;
 
 @Transactional
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ChildService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java
similarity index 52%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ChildService.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java
index d28682fdfd..2ea64285b3 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ChildService.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java
@@ -1,10 +1,10 @@
-package org.baeldung.spring.persistence.service.impl;
+package org.baeldung.persistence.service.impl;
 
-import org.baeldung.spring.persistence.dao.IChildDao;
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Child;
-import org.baeldung.spring.persistence.service.IChildService;
-import org.baeldung.spring.persistence.service.common.AbstractService;
+import org.baeldung.persistence.dao.IChildDao;
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Child;
+import org.baeldung.persistence.service.IChildService;
+import org.baeldung.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/FooService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java
similarity index 52%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/FooService.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java
index 19223a82ca..4b76eba3e5 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/FooService.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java
@@ -1,10 +1,10 @@
-package org.baeldung.spring.persistence.service.impl;
+package org.baeldung.persistence.service.impl;
 
-import org.baeldung.spring.persistence.dao.IFooDao;
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Foo;
-import org.baeldung.spring.persistence.service.IFooService;
-import org.baeldung.spring.persistence.service.common.AbstractService;
+import org.baeldung.persistence.dao.IFooDao;
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Foo;
+import org.baeldung.persistence.service.IFooService;
+import org.baeldung.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ParentService.java b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java
similarity index 53%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ParentService.java
rename to spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java
index 84d4277299..73239f1d00 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/impl/ParentService.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java
@@ -1,10 +1,10 @@
-package org.baeldung.spring.persistence.service.impl;
+package org.baeldung.persistence.service.impl;
 
-import org.baeldung.spring.persistence.dao.IParentDao;
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Parent;
-import org.baeldung.spring.persistence.service.IParentService;
-import org.baeldung.spring.persistence.service.common.AbstractService;
+import org.baeldung.persistence.dao.IParentDao;
+import org.baeldung.persistence.dao.common.IOperations;
+import org.baeldung.persistence.model.Parent;
+import org.baeldung.persistence.service.IParentService;
+import org.baeldung.persistence.service.common.AbstractService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java b/spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
similarity index 92%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java
rename to spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
index 51fbcd27c1..10ead2fd6c 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/HibernateXmlConfig.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/spring/HibernateXmlConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.config;
+package org.baeldung.spring;
 
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java b/spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceConfig.java
similarity index 98%
rename from spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java
rename to spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceConfig.java
index 3157c92e99..765a37962f 100644
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/config/PersistenceConfig.java
+++ b/spring-hibernate4/src/main/java/org/baeldung/spring/PersistenceConfig.java
@@ -1,4 +1,4 @@
-package org.baeldung.spring.persistence.config;
+package org.baeldung.spring;
 
 import java.util.Properties;
 
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IChildDao.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IChildDao.java
deleted file mode 100644
index 0a2180bed3..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IChildDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.dao;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Child;
-
-public interface IChildDao extends IOperations<Child> {
-    //
-}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java
deleted file mode 100644
index 646b3af228..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IFooDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.dao;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Foo;
-
-public interface IFooDao extends IOperations<Foo> {
-    //
-}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IParentDao.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IParentDao.java
deleted file mode 100644
index 1b35ba9f01..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/dao/IParentDao.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.dao;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Parent;
-
-public interface IParentDao extends IOperations<Parent> {
-    //
-}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IChildService.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IChildService.java
deleted file mode 100644
index 785d581c79..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IChildService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.service;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Child;
-
-public interface IChildService extends IOperations<Child> {
-    //
-}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IFooService.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IFooService.java
deleted file mode 100644
index 59d532aa54..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IFooService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.service;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Foo;
-
-public interface IFooService extends IOperations<Foo> {
-    //
-}
diff --git a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IParentService.java b/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IParentService.java
deleted file mode 100644
index 6d37d75354..0000000000
--- a/spring-hibernate4/src/main/java/org/baeldung/spring/persistence/service/IParentService.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.baeldung.spring.persistence.service;
-
-import org.baeldung.spring.persistence.dao.common.IOperations;
-import org.baeldung.spring.persistence.model.Parent;
-
-public interface IParentService extends IOperations<Parent> {
-    //
-}
diff --git a/spring-hibernate4/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-hibernate4/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index 5463820874..0000000000
--- a/spring-hibernate4/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.2.xsd" >
-
-</beans>
\ No newline at end of file
diff --git a/spring-hibernate4/src/main/webapp/WEB-INF/view/sample.jsp b/spring-hibernate4/src/main/webapp/WEB-INF/view/sample.jsp
deleted file mode 100644
index 7cc14b5dcd..0000000000
--- a/spring-hibernate4/src/main/webapp/WEB-INF/view/sample.jsp
+++ /dev/null
@@ -1,7 +0,0 @@
-<html>
-<head></head>
-
-<body>
-	<h1>This is the body of the sample view</h1>
-</body>
-</html>
\ No newline at end of file
diff --git a/spring-hibernate4/src/main/webapp/WEB-INF/web.xml b/spring-hibernate4/src/main/webapp/WEB-INF/web.xml
index e0de9aefd4..64b5f6826d 100644
--- a/spring-hibernate4/src/main/webapp/WEB-INF/web.xml
+++ b/spring-hibernate4/src/main/webapp/WEB-INF/web.xml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
-  <display-name>Spring MVC Application</display-name>
-  <context-param>
-    <param-name>contextClass</param-name>
-    <param-value>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+    <display-name>Spring Hibernate 4 Application</display-name>
+    <context-param>
+        <param-name>contextClass</param-name>
+        <param-value>
             org.springframework.web.context.support.AnnotationConfigWebApplicationContext
       	</param-value>
-  </context-param>
-  <context-param>
-    <param-name>contextConfigLocation</param-name>
-    <param-value>org.baeldung.spring.persistence.config</param-value>
-  </context-param>
-  <listener>
-    <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
-  </listener>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.spring</param-value>
+    </context-param>
+    <listener>
+        <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+    </listener>
 </web-app>
\ No newline at end of file
diff --git a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
index 69d094f5d8..99dd630803 100644
--- a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
+++ b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/FooServicePersistenceIntegrationTest.java
@@ -2,8 +2,9 @@ package org.baeldung.spring.persistence.service;
 
 import static org.apache.commons.lang3.RandomStringUtils.randomAlphabetic;
 
-import org.baeldung.spring.persistence.config.PersistenceConfig;
-import org.baeldung.spring.persistence.model.Foo;
+import org.baeldung.persistence.model.Foo;
+import org.baeldung.persistence.service.IFooService;
+import org.baeldung.spring.PersistenceConfig;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
diff --git a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
index 753d94ac79..1c219ac2fa 100644
--- a/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
+++ b/spring-hibernate4/src/test/java/org/baeldung/spring/persistence/service/ParentServicePersistenceIntegrationTest.java
@@ -1,8 +1,10 @@
 package org.baeldung.spring.persistence.service;
 
-import org.baeldung.spring.persistence.config.PersistenceConfig;
-import org.baeldung.spring.persistence.model.Child;
-import org.baeldung.spring.persistence.model.Parent;
+import org.baeldung.persistence.model.Child;
+import org.baeldung.persistence.model.Parent;
+import org.baeldung.persistence.service.IChildService;
+import org.baeldung.persistence.service.IParentService;
+import org.baeldung.spring.PersistenceConfig;
 import org.hibernate.SessionFactory;
 import org.junit.Test;
 import org.junit.runner.RunWith;