diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
index ddf5070824..61f6827fcb 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/xml/AdminData.java
@@ -30,7 +30,7 @@ import org.w3c.dom.Node;
 
 import org.l2jmobius.Config;
 import org.l2jmobius.commons.util.IXmlReader;
-import org.l2jmobius.gameserver.datatables.AccessLevel;
+import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.StatsSet;
 import org.l2jmobius.gameserver.model.actor.instance.PlayerInstance;
 import org.l2jmobius.gameserver.network.SystemMessageId;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/AccessLevel.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java
similarity index 88%
rename from L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/AccessLevel.java
rename to L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java
index e35028958a..5d51b45e25 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/datatables/AccessLevel.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/AccessLevel.java
@@ -14,58 +14,29 @@
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.l2jmobius.gameserver.datatables;
+package org.l2jmobius.gameserver.model;
 
 /**
- * @author FBIagent<br>
+ * @author FBIagent
  */
 public class AccessLevel
 {
-	/**
-	 * The logger<br>
-	 */
-	// private final static Log LOGGER = LogFactory.getLog(AccessLevel.class);
-	/**
-	 * The access level<br>
-	 */
 	private int _accessLevel = 0;
-	/**
-	 * The access level name<br>
-	 */
 	private String _name = null;
-	/**
-	 * The name color for the access level<br>
-	 */
 	private int _nameColor = 0;
-	/**
-	 * The title color for the access level<br>
-	 */
 	private int _titleColor = 0;
-	/**
-	 * Flag to determine if the access level has gm access<br>
-	 */
 	private boolean _isGm = false;
-	/** Flag for peace zone attack */
 	private boolean _allowPeaceAttack = false;
-	/** Flag for fixed res */
 	private boolean _allowFixedRes = false;
-	/** Flag for transactions */
 	private boolean _allowTransaction = false;
-	/** Flag for AltG commands */
 	private boolean _allowAltG = false;
-	/** Flag to give damage */
 	private boolean _giveDamage = false;
-	/** Flag to take aggro */
 	private boolean _takeAggro = false;
-	/** Flag to gain exp in party */
 	private boolean _gainExp = false;
-	
-	// L2EMU_ ADD - Rayan
 	private boolean _useNameColor = true;
 	private boolean _useTitleColor = false;
 	private boolean _canDisableGmStatus = false;
 	
-	// L2EMU_ ADD
 	/**
 	 * Initializes members<br>
 	 * <br>
@@ -99,12 +70,9 @@ public class AccessLevel
 		_giveDamage = giveDamage;
 		_takeAggro = takeAggro;
 		_gainExp = gainExp;
-		
-		// L2EMU_ ADD - Rayan
 		_useNameColor = useNameColor;
 		_useTitleColor = useTitleColor;
 		_canDisableGmStatus = canDisableGmStatus;
-		// L2EMU_ ADD
 	}
 	
 	/**
@@ -225,7 +193,6 @@ public class AccessLevel
 		return _gainExp;
 	}
 	
-	// L2EMU_ADD - Rayan
 	public boolean useNameColor()
 	{
 		return _useNameColor;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
index 425f7baad2..429880e3a2 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/model/actor/instance/PlayerInstance.java
@@ -49,7 +49,6 @@ import org.l2jmobius.gameserver.cache.HtmCache;
 import org.l2jmobius.gameserver.cache.WarehouseCacheManager;
 import org.l2jmobius.gameserver.communitybbs.BB.Forum;
 import org.l2jmobius.gameserver.communitybbs.Manager.ForumsBBSManager;
-import org.l2jmobius.gameserver.datatables.AccessLevel;
 import org.l2jmobius.gameserver.datatables.HeroSkillTable;
 import org.l2jmobius.gameserver.datatables.NobleSkillTable;
 import org.l2jmobius.gameserver.datatables.SkillTable;
@@ -83,6 +82,7 @@ import org.l2jmobius.gameserver.instancemanager.PlayerCountManager;
 import org.l2jmobius.gameserver.instancemanager.QuestManager;
 import org.l2jmobius.gameserver.instancemanager.SiegeManager;
 import org.l2jmobius.gameserver.instancemanager.TownManager;
+import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.BlockList;
 import org.l2jmobius.gameserver.model.Effect;
 import org.l2jmobius.gameserver.model.FishData;
diff --git a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
index a5d14abcf6..af34623357 100644
--- a/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
+++ b/L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/Die.java
@@ -16,10 +16,10 @@
  */
 package org.l2jmobius.gameserver.network.serverpackets;
 
-import org.l2jmobius.gameserver.datatables.AccessLevel;
 import org.l2jmobius.gameserver.datatables.xml.AdminData;
 import org.l2jmobius.gameserver.instancemanager.CastleManager;
 import org.l2jmobius.gameserver.instancemanager.FortManager;
+import org.l2jmobius.gameserver.model.AccessLevel;
 import org.l2jmobius.gameserver.model.SiegeClan;
 import org.l2jmobius.gameserver.model.actor.Attackable;
 import org.l2jmobius.gameserver.model.actor.Creature;