diff --git a/src/main/java/com/l2jserver/GameServerModule.java b/src/main/java/com/l2jserver/GameServerModule.java
index 0466829e3..a7fbf5895 100644
--- a/src/main/java/com/l2jserver/GameServerModule.java
+++ b/src/main/java/com/l2jserver/GameServerModule.java
@@ -18,9 +18,9 @@ package com.l2jserver;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
-import com.l2jserver.model.MySQL5DAOModule;
 import com.l2jserver.model.id.provider.IDProviderModule;
 import com.l2jserver.service.ServiceModule;
+import com.l2jserver.service.database.MySQL5DAOModule;
 
 /**
  * The game server Google Guice {@link Module}.
diff --git a/src/main/java/com/l2jserver/model/H2DAOModule.java b/src/main/java/com/l2jserver/service/database/H2DAOModule.java
similarity index 81%
rename from src/main/java/com/l2jserver/model/H2DAOModule.java
rename to src/main/java/com/l2jserver/service/database/H2DAOModule.java
index 7030e0d14..5ab307435 100644
--- a/src/main/java/com/l2jserver/model/H2DAOModule.java
+++ b/src/main/java/com/l2jserver/service/database/H2DAOModule.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model;
+package com.l2jserver.service.database;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
@@ -25,12 +25,12 @@ import com.l2jserver.model.dao.ChatMessageDAO;
 import com.l2jserver.model.dao.ClanDAO;
 import com.l2jserver.model.dao.ItemDAO;
 import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2CharacterDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2CharacterFriendDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2ChatMessageDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2ClanDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2ItemDAO;
-import com.l2jserver.model.dao.jdbc.h2.H2NPCDAO;
+import com.l2jserver.service.database.jdbc.h2.H2CharacterDAO;
+import com.l2jserver.service.database.jdbc.h2.H2CharacterFriendDAO;
+import com.l2jserver.service.database.jdbc.h2.H2ChatMessageDAO;
+import com.l2jserver.service.database.jdbc.h2.H2ClanDAO;
+import com.l2jserver.service.database.jdbc.h2.H2ItemDAO;
+import com.l2jserver.service.database.jdbc.h2.H2NPCDAO;
 
 /**
  * Google Guice {@link Module} for H2 DAOs
diff --git a/src/main/java/com/l2jserver/model/MySQL5DAOModule.java b/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java
similarity index 79%
rename from src/main/java/com/l2jserver/model/MySQL5DAOModule.java
rename to src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java
index a801b847a..ec14f507a 100644
--- a/src/main/java/com/l2jserver/model/MySQL5DAOModule.java
+++ b/src/main/java/com/l2jserver/service/database/MySQL5DAOModule.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model;
+package com.l2jserver.service.database;
 
 import com.google.inject.AbstractModule;
 import com.google.inject.Module;
@@ -25,12 +25,12 @@ import com.l2jserver.model.dao.ChatMessageDAO;
 import com.l2jserver.model.dao.ClanDAO;
 import com.l2jserver.model.dao.ItemDAO;
 import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5CharacterFriendDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ChatMessageDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ClanDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5ItemDAO;
-import com.l2jserver.model.dao.jdbc.mysql5.MySQL5NPCDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5CharacterDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5CharacterFriendDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5ChatMessageDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5ClanDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5ItemDAO;
+import com.l2jserver.service.database.jdbc.mysql5.MySQL5NPCDAO;
 
 /**
  * Google Guice {@link Module} for MySQL5 DAOs
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java
similarity index 97%
rename from src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java
index 55b0a563a..c48c416c3 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/AbstractJDBCDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/AbstractJDBCDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.Model;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java
index 0fc980f4d..08553bcd0 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java
index 01ff4dcf0..959802574 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCCharacterFriendDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCCharacterFriendDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java
index 2237e2cf7..6809819a6 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCChatMessageDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCChatMessageDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java
index 68801b1c2..642e166e2 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCClanDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCClanDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java
index ead207a5b..b29a4e8f4 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCItemDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCItemDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java
similarity index 99%
rename from src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java
index cce5e1406..a77b7828e 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/JDBCNPCDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/JDBCNPCDAO.java
@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc;
+package com.l2jserver.service.database.jdbc;
 
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java
similarity index 93%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java
index 5279161e9..c300e741d 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterDAO.java
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
-import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ClanIDProvider;
 import com.l2jserver.model.id.provider.AccountIDProvider;
 import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCCharacterDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java
index 7d5ee5adf..3b875e79d 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2CharacterFriendDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2CharacterFriendDAO.java
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterFriendDAO;
-import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.provider.FriendIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO;
 
 /**
  * {@link CharacterFriendDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java
index b4598b2eb..52e4eb276 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ChatMessageDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ChatMessageDAO.java
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.ChatMessageDAO;
-import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.provider.ChatMessageIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCChatMessageDAO;
 
 /**
  * {@link ChatMessageDAO} implementation for H2 database
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java
index 7a8b124e6..5f1f83623 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ClanDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ClanDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
 import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.model.dao.jdbc.JDBCClanDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ClanIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCClanDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java
similarity index 93%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java
index b46b5d9d6..77d1037e8 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2ItemDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2ItemDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.ItemDAO;
-import com.l2jserver.model.dao.jdbc.JDBCItemDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ItemIDProvider;
 import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCItemDAO;
 
 /**
  * {@link ItemDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java
index e60f90429..28ee53de2 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/h2/H2NPCDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/h2/H2NPCDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.h2;
+package com.l2jserver.service.database.jdbc.h2;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
 import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.model.dao.jdbc.JDBCNPCDAO;
 import com.l2jserver.model.id.object.provider.NPCIDProvider;
 import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCNPCDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java
similarity index 93%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java
index 6cdec70b5..2c34bd11b 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterDAO.java
@@ -14,16 +14,16 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
-import com.l2jserver.model.dao.jdbc.JDBCCharacterDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ClanIDProvider;
 import com.l2jserver.model.id.provider.AccountIDProvider;
 import com.l2jserver.model.id.template.provider.CharacterTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCCharacterDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java
index 16b9d32c8..ea2b4958f 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5CharacterFriendDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5CharacterFriendDAO.java
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterFriendDAO;
-import com.l2jserver.model.dao.jdbc.JDBCCharacterFriendDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.provider.FriendIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCCharacterFriendDAO;
 
 /**
  * {@link CharacterFriendDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java
index 29e88a864..b76a00ade 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ChatMessageDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ChatMessageDAO.java
@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.ChatMessageDAO;
-import com.l2jserver.model.dao.jdbc.JDBCChatMessageDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.provider.ChatMessageIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCChatMessageDAO;
 
 /**
  * {@link ChatMessageDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java
index 948d6074e..1f4800cc7 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ClanDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ClanDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
 import com.l2jserver.model.dao.ClanDAO;
-import com.l2jserver.model.dao.jdbc.JDBCClanDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ClanIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCClanDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java
similarity index 93%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java
index 6b7014d37..2da78f4b6 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5ItemDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5ItemDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.ItemDAO;
-import com.l2jserver.model.dao.jdbc.JDBCItemDAO;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
 import com.l2jserver.model.id.object.provider.ItemIDProvider;
 import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCItemDAO;
 
 /**
  * {@link ItemDAO} implementation for MySQL5
diff --git a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java
similarity index 92%
rename from src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java
rename to src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java
index 48b5b34c8..fd6a1dfdd 100644
--- a/src/main/java/com/l2jserver/model/dao/jdbc/mysql5/MySQL5NPCDAO.java
+++ b/src/main/java/com/l2jserver/service/database/jdbc/mysql5/MySQL5NPCDAO.java
@@ -14,15 +14,15 @@
  * You should have received a copy of the GNU General Public License
  * along with l2jserver.  If not, see <http://www.gnu.org/licenses/>.
  */
-package com.l2jserver.model.dao.jdbc.mysql5;
+package com.l2jserver.service.database.jdbc.mysql5;
 
 import com.google.inject.Inject;
 import com.l2jserver.model.dao.CharacterDAO;
 import com.l2jserver.model.dao.NPCDAO;
-import com.l2jserver.model.dao.jdbc.JDBCNPCDAO;
 import com.l2jserver.model.id.object.provider.NPCIDProvider;
 import com.l2jserver.model.id.template.provider.NPCTemplateIDProvider;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.jdbc.JDBCNPCDAO;
 
 /**
  * {@link CharacterDAO} implementation for MySQL5
diff --git a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
index 590ce85da..994c82687 100644
--- a/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
+++ b/src/test/java/com/l2jserver/model/id/factory/IDFactoryTest.java
@@ -23,7 +23,6 @@ import org.junit.Test;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.l2jserver.model.H2DAOModule;
 import com.l2jserver.model.id.ID;
 import com.l2jserver.model.id.object.CharacterID;
 import com.l2jserver.model.id.object.provider.CharacterIDProvider;
@@ -33,6 +32,7 @@ import com.l2jserver.service.ServiceManager;
 import com.l2jserver.service.ServiceModule;
 import com.l2jserver.service.ServiceStartException;
 import com.l2jserver.service.database.DatabaseService;
+import com.l2jserver.service.database.H2DAOModule;
 import com.l2jserver.service.game.template.TemplateService;
 import com.l2jserver.service.game.world.WorldService;
 
diff --git a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
index e8ad9540a..88eb58f93 100644
--- a/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
+++ b/src/test/java/com/l2jserver/service/game/template/StaticTemplateServiceTest.java
@@ -20,12 +20,12 @@ import org.junit.Test;
 
 import com.google.inject.Guice;
 import com.google.inject.Injector;
-import com.l2jserver.model.H2DAOModule;
 import com.l2jserver.model.id.provider.IDProviderModule;
 import com.l2jserver.model.id.template.provider.ItemTemplateIDProvider;
 import com.l2jserver.service.ServiceManager;
 import com.l2jserver.service.ServiceModule;
 import com.l2jserver.service.ServiceStartException;
+import com.l2jserver.service.database.H2DAOModule;
 
 public class StaticTemplateServiceTest {
 	private final Injector injector = Guice.createInjector(new ServiceModule(),