diff --git a/service-layer/src/main/java/com/iluwatar/App.java b/service-layer/src/main/java/com/iluwatar/app/App.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/App.java
rename to service-layer/src/main/java/com/iluwatar/app/App.java
index 2500a98fc..27411ddb0 100644
--- a/service-layer/src/main/java/com/iluwatar/App.java
+++ b/service-layer/src/main/java/com/iluwatar/app/App.java
@@ -1,4 +1,16 @@
-package com.iluwatar;
+package com.iluwatar.app;
+
+import com.iluwatar.magic.MagicService;
+import com.iluwatar.magic.MagicServiceImpl;
+import com.iluwatar.spell.Spell;
+import com.iluwatar.spell.SpellDao;
+import com.iluwatar.spell.SpellDaoImpl;
+import com.iluwatar.spellbook.Spellbook;
+import com.iluwatar.spellbook.SpellbookDao;
+import com.iluwatar.spellbook.SpellbookDaoImpl;
+import com.iluwatar.wizard.Wizard;
+import com.iluwatar.wizard.WizardDao;
+import com.iluwatar.wizard.WizardDaoImpl;
 
 
 /**
diff --git a/service-layer/src/main/java/com/iluwatar/BaseEntity.java b/service-layer/src/main/java/com/iluwatar/common/BaseEntity.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/BaseEntity.java
rename to service-layer/src/main/java/com/iluwatar/common/BaseEntity.java
index 68c3def47..752d5bfdc 100644
--- a/service-layer/src/main/java/com/iluwatar/BaseEntity.java
+++ b/service-layer/src/main/java/com/iluwatar/common/BaseEntity.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.common;
 
 import javax.persistence.Inheritance;
 import javax.persistence.InheritanceType;
diff --git a/service-layer/src/main/java/com/iluwatar/Dao.java b/service-layer/src/main/java/com/iluwatar/common/Dao.java
similarity index 86%
rename from service-layer/src/main/java/com/iluwatar/Dao.java
rename to service-layer/src/main/java/com/iluwatar/common/Dao.java
index a0edd386e..768cd4e43 100644
--- a/service-layer/src/main/java/com/iluwatar/Dao.java
+++ b/service-layer/src/main/java/com/iluwatar/common/Dao.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.common;
 
 import java.util.List;
 
diff --git a/service-layer/src/main/java/com/iluwatar/DaoBaseImpl.java b/service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java
similarity index 96%
rename from service-layer/src/main/java/com/iluwatar/DaoBaseImpl.java
rename to service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java
index 36981a3ce..4c7c4f89f 100644
--- a/service-layer/src/main/java/com/iluwatar/DaoBaseImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/common/DaoBaseImpl.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.common;
 
 import java.lang.reflect.ParameterizedType;
 import java.util.List;
@@ -8,6 +8,8 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Restrictions;
 
+import com.iluwatar.hibernate.HibernateUtil;
+
 public abstract class DaoBaseImpl<E extends BaseEntity> implements Dao<E> {
 	
 	@SuppressWarnings("unchecked")
diff --git a/service-layer/src/main/java/com/iluwatar/HibernateUtil.java b/service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java
similarity index 87%
rename from service-layer/src/main/java/com/iluwatar/HibernateUtil.java
rename to service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java
index d0e1b6d84..d6f26765f 100644
--- a/service-layer/src/main/java/com/iluwatar/HibernateUtil.java
+++ b/service-layer/src/main/java/com/iluwatar/hibernate/HibernateUtil.java
@@ -1,8 +1,12 @@
-package com.iluwatar;
+package com.iluwatar.hibernate;
 
 import org.hibernate.SessionFactory;
 import org.hibernate.cfg.Configuration;
 
+import com.iluwatar.spell.Spell;
+import com.iluwatar.spellbook.Spellbook;
+import com.iluwatar.wizard.Wizard;
+
 public class HibernateUtil {
 
 	private static final SessionFactory sessionFactory;
diff --git a/service-layer/src/main/java/com/iluwatar/MagicService.java b/service-layer/src/main/java/com/iluwatar/magic/MagicService.java
similarity index 54%
rename from service-layer/src/main/java/com/iluwatar/MagicService.java
rename to service-layer/src/main/java/com/iluwatar/magic/MagicService.java
index a93af08c9..846705a38 100644
--- a/service-layer/src/main/java/com/iluwatar/MagicService.java
+++ b/service-layer/src/main/java/com/iluwatar/magic/MagicService.java
@@ -1,7 +1,11 @@
-package com.iluwatar;
+package com.iluwatar.magic;
 
 import java.util.List;
 
+import com.iluwatar.spell.Spell;
+import com.iluwatar.spellbook.Spellbook;
+import com.iluwatar.wizard.Wizard;
+
 
 public interface MagicService {
 
diff --git a/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java b/service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java
similarity index 71%
rename from service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java
rename to service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java
index ff2434491..fc300eab8 100644
--- a/service-layer/src/main/java/com/iluwatar/MagicServiceImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/magic/MagicServiceImpl.java
@@ -1,7 +1,14 @@
-package com.iluwatar;
+package com.iluwatar.magic;
 
 import java.util.List;
 
+import com.iluwatar.spell.Spell;
+import com.iluwatar.spell.SpellDao;
+import com.iluwatar.spellbook.Spellbook;
+import com.iluwatar.spellbook.SpellbookDao;
+import com.iluwatar.wizard.Wizard;
+import com.iluwatar.wizard.WizardDao;
+
 public class MagicServiceImpl implements MagicService {
 	
 	private WizardDao wizardDao;
diff --git a/service-layer/src/main/java/com/iluwatar/Spell.java b/service-layer/src/main/java/com/iluwatar/spell/Spell.java
similarity index 90%
rename from service-layer/src/main/java/com/iluwatar/Spell.java
rename to service-layer/src/main/java/com/iluwatar/spell/Spell.java
index 04b9dcd8b..6db7f2c5a 100644
--- a/service-layer/src/main/java/com/iluwatar/Spell.java
+++ b/service-layer/src/main/java/com/iluwatar/spell/Spell.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.spell;
 
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -8,6 +8,9 @@ import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 
+import com.iluwatar.common.BaseEntity;
+import com.iluwatar.spellbook.Spellbook;
+
 @Entity
 @Table(name="SPELL")
 public class Spell extends BaseEntity {
diff --git a/service-layer/src/main/java/com/iluwatar/SpellDao.java b/service-layer/src/main/java/com/iluwatar/spell/SpellDao.java
similarity index 58%
rename from service-layer/src/main/java/com/iluwatar/SpellDao.java
rename to service-layer/src/main/java/com/iluwatar/spell/SpellDao.java
index ea762e30f..65e6fdc38 100644
--- a/service-layer/src/main/java/com/iluwatar/SpellDao.java
+++ b/service-layer/src/main/java/com/iluwatar/spell/SpellDao.java
@@ -1,4 +1,6 @@
-package com.iluwatar;
+package com.iluwatar.spell;
+
+import com.iluwatar.common.Dao;
 
 public interface SpellDao extends Dao<Spell> {
 	
diff --git a/service-layer/src/main/java/com/iluwatar/SpellDaoImpl.java b/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/SpellDaoImpl.java
rename to service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java
index 94fc842cc..4b816af60 100644
--- a/service-layer/src/main/java/com/iluwatar/SpellDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/spell/SpellDaoImpl.java
@@ -1,10 +1,12 @@
-package com.iluwatar;
+package com.iluwatar.spell;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Expression;
 
+import com.iluwatar.common.DaoBaseImpl;
+
 public class SpellDaoImpl extends DaoBaseImpl<Spell> implements SpellDao {
 
 	@Override
diff --git a/service-layer/src/main/java/com/iluwatar/Spellbook.java b/service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/Spellbook.java
rename to service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java
index e3fc4b37f..85cbb594e 100644
--- a/service-layer/src/main/java/com/iluwatar/Spellbook.java
+++ b/service-layer/src/main/java/com/iluwatar/spellbook/Spellbook.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.spellbook;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -12,6 +12,10 @@ import javax.persistence.ManyToMany;
 import javax.persistence.OneToMany;
 import javax.persistence.Table;
 
+import com.iluwatar.common.BaseEntity;
+import com.iluwatar.spell.Spell;
+import com.iluwatar.wizard.Wizard;
+
 @Entity
 @Table(name="SPELLBOOK")
 public class Spellbook extends BaseEntity {
diff --git a/service-layer/src/main/java/com/iluwatar/SpellbookDao.java b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java
similarity index 59%
rename from service-layer/src/main/java/com/iluwatar/SpellbookDao.java
rename to service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java
index 17d66fe80..54a963a0c 100644
--- a/service-layer/src/main/java/com/iluwatar/SpellbookDao.java
+++ b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDao.java
@@ -1,4 +1,6 @@
-package com.iluwatar;
+package com.iluwatar.spellbook;
+
+import com.iluwatar.common.Dao;
 
 public interface SpellbookDao extends Dao<Spellbook> {
 	
diff --git a/service-layer/src/main/java/com/iluwatar/SpellbookDaoImpl.java b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/SpellbookDaoImpl.java
rename to service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java
index 07d1853d9..d918bab58 100644
--- a/service-layer/src/main/java/com/iluwatar/SpellbookDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/spellbook/SpellbookDaoImpl.java
@@ -1,10 +1,12 @@
-package com.iluwatar;
+package com.iluwatar.spellbook;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Expression;
 
+import com.iluwatar.common.DaoBaseImpl;
+
 public class SpellbookDaoImpl extends DaoBaseImpl<Spellbook> implements SpellbookDao {
 
 	@Override
diff --git a/service-layer/src/main/java/com/iluwatar/Wizard.java b/service-layer/src/main/java/com/iluwatar/wizard/Wizard.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/Wizard.java
rename to service-layer/src/main/java/com/iluwatar/wizard/Wizard.java
index c7854c60e..a8aac9187 100644
--- a/service-layer/src/main/java/com/iluwatar/Wizard.java
+++ b/service-layer/src/main/java/com/iluwatar/wizard/Wizard.java
@@ -1,4 +1,4 @@
-package com.iluwatar;
+package com.iluwatar.wizard;
 
 import java.util.HashSet;
 import java.util.Set;
@@ -11,6 +11,9 @@ import javax.persistence.Id;
 import javax.persistence.ManyToMany;
 import javax.persistence.Table;
 
+import com.iluwatar.common.BaseEntity;
+import com.iluwatar.spellbook.Spellbook;
+
 @Entity
 @Table(name="WIZARD")
 public class Wizard extends BaseEntity {
diff --git a/service-layer/src/main/java/com/iluwatar/WizardDao.java b/service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java
similarity index 58%
rename from service-layer/src/main/java/com/iluwatar/WizardDao.java
rename to service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java
index 55960b3e1..eaa6b4cef 100644
--- a/service-layer/src/main/java/com/iluwatar/WizardDao.java
+++ b/service-layer/src/main/java/com/iluwatar/wizard/WizardDao.java
@@ -1,4 +1,6 @@
-package com.iluwatar;
+package com.iluwatar.wizard;
+
+import com.iluwatar.common.Dao;
 
 public interface WizardDao extends Dao<Wizard> {
 	
diff --git a/service-layer/src/main/java/com/iluwatar/WizardDaoImpl.java b/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java
similarity index 91%
rename from service-layer/src/main/java/com/iluwatar/WizardDaoImpl.java
rename to service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java
index ba56f4984..d14f1c20e 100644
--- a/service-layer/src/main/java/com/iluwatar/WizardDaoImpl.java
+++ b/service-layer/src/main/java/com/iluwatar/wizard/WizardDaoImpl.java
@@ -1,10 +1,12 @@
-package com.iluwatar;
+package com.iluwatar.wizard;
 
 import org.hibernate.Criteria;
 import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.hibernate.criterion.Expression;
 
+import com.iluwatar.common.DaoBaseImpl;
+
 public class WizardDaoImpl extends DaoBaseImpl<Wizard> implements WizardDao {
 
 	@Override
diff --git a/service-layer/src/test/java/com/iluwatar/AppTest.java b/service-layer/src/test/java/com/iluwatar/app/AppTest.java
similarity index 68%
rename from service-layer/src/test/java/com/iluwatar/AppTest.java
rename to service-layer/src/test/java/com/iluwatar/app/AppTest.java
index b81f7499d..e0eb3d65e 100644
--- a/service-layer/src/test/java/com/iluwatar/AppTest.java
+++ b/service-layer/src/test/java/com/iluwatar/app/AppTest.java
@@ -1,7 +1,9 @@
-package com.iluwatar;
+package com.iluwatar.app;
 
 import org.junit.Test;
 
+import com.iluwatar.app.App;
+
 public class AppTest {
 	
 	@Test