diff --git a/data/plugins/bootstrap.rb b/data/plugins/bootstrap.rb
index 6d759fa2..134e006b 100644
--- a/data/plugins/bootstrap.rb
+++ b/data/plugins/bootstrap.rb
@@ -20,7 +20,7 @@ java_import 'org.apollo.game.model.World'
 java_import 'org.apollo.game.model.entity.Player'
 java_import 'org.apollo.game.model.event.EventListener'
 java_import 'org.apollo.game.model.event.PlayerEvent'
-java_import 'org.apollo.game.model.setting.PrivilegeLevel'
+java_import 'org.apollo.game.model.entity.setting.PrivilegeLevel'
 java_import 'org.apollo.game.scheduling.ScheduledTask'
 java_import 'org.apollo.util.plugin.PluginContext'
 
diff --git a/data/plugins/chat/privacy/privacy.rb b/data/plugins/chat/privacy/privacy.rb
index 4de03b8b..8200fce7 100644
--- a/data/plugins/chat/privacy/privacy.rb
+++ b/data/plugins/chat/privacy/privacy.rb
@@ -1,6 +1,6 @@
 require 'java'
 
-java_import 'org.apollo.game.model.setting.PrivacyState'
+java_import 'org.apollo.game.model.entity.setting.PrivacyState'
 java_import 'org.apollo.game.message.impl.SendFriendMessage'
 
 on :message, :privacy_option do |ctx, player, message|
diff --git a/data/plugins/chat/private-messaging/friend.rb b/data/plugins/chat/private-messaging/friend.rb
index 6d1085e6..9433659a 100644
--- a/data/plugins/chat/private-messaging/friend.rb
+++ b/data/plugins/chat/private-messaging/friend.rb
@@ -4,8 +4,8 @@ java_import 'org.apollo.game.message.impl.FriendServerStatusMessage'
 java_import 'org.apollo.game.message.impl.IgnoreListMessage'
 java_import 'org.apollo.game.message.impl.SendFriendMessage'
 java_import 'org.apollo.game.model.World'
-java_import 'org.apollo.game.model.setting.ServerStatus'
-java_import 'org.apollo.game.model.setting.PrivacyState'
+java_import 'org.apollo.game.model.entity.setting.ServerStatus'
+java_import 'org.apollo.game.model.entity.setting.PrivacyState'
 java_import 'org.apollo.game.model.entity.Player'
 
 
diff --git a/data/plugins/chat/private-messaging/messaging.rb b/data/plugins/chat/private-messaging/messaging.rb
index 1d91b94d..17aa7d77 100644
--- a/data/plugins/chat/private-messaging/messaging.rb
+++ b/data/plugins/chat/private-messaging/messaging.rb
@@ -2,7 +2,7 @@ require 'java'
 
 java_import 'org.apollo.game.message.impl.ForwardPrivateChatMessage'
 java_import 'org.apollo.game.model.World'
-java_import 'org.apollo.game.model.setting.PrivacyState'
+java_import 'org.apollo.game.model.entity.setting.PrivacyState'
 
 on :message, :private_chat do |ctx, player, message|
   friend = $world.get_player(message.username)
@@ -11,9 +11,9 @@ end
 
 # Checks if the sender is permitted to interact with the friend they have added:
 def interaction_permitted(sender, friend)
-  if friend == nil || friend.has_ignored(sender.username)
+  if friend.nil? || friend.has_ignored(sender.username)
     return false
   end
   
-  return friend.friends_with(sender.username) ? friend.friend_privacy != PrivacyState::OFF : friend.friend_privacy == PrivacyState::ON
+  return friend.friends_with(sender.username) ? (friend.friend_privacy != PrivacyState::OFF) : (friend.friend_privacy == PrivacyState::ON)
 end
\ No newline at end of file
diff --git a/src/org/apollo/game/command/CommandListener.java b/src/org/apollo/game/command/CommandListener.java
index 57eeffe6..97202fa1 100644
--- a/src/org/apollo/game/command/CommandListener.java
+++ b/src/org/apollo/game/command/CommandListener.java
@@ -1,7 +1,7 @@
 package org.apollo.game.command;
 
 import org.apollo.game.model.entity.Player;
-import org.apollo.game.model.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
 
 /**
  * An interface which should be implemented to listen to {@link Command}s.
diff --git a/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java b/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java
index e0980b66..d09a5669 100644
--- a/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java
+++ b/src/org/apollo/game/message/handler/impl/PlayerDesignVerificationHandler.java
@@ -5,7 +5,7 @@ import org.apollo.game.message.handler.MessageHandlerContext;
 import org.apollo.game.message.impl.PlayerDesignMessage;
 import org.apollo.game.model.Appearance;
 import org.apollo.game.model.entity.Player;
-import org.apollo.game.model.setting.Gender;
+import org.apollo.game.model.entity.setting.Gender;
 
 /**
  * A {@link MessageHandler} that verifies {@link PlayerDesignMessage}s.
diff --git a/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java b/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java
index 10b7249f..b31d5397 100644
--- a/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java
+++ b/src/org/apollo/game/message/impl/ForwardPrivateChatMessage.java
@@ -1,7 +1,7 @@
 package org.apollo.game.message.impl;
 
 import org.apollo.game.message.Message;
-import org.apollo.game.model.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
 
 /**
  * A {@link Message} sent to the client that forwards a private chat.
diff --git a/src/org/apollo/game/message/impl/FriendServerStatusMessage.java b/src/org/apollo/game/message/impl/FriendServerStatusMessage.java
index 6ed66bc9..4960b853 100644
--- a/src/org/apollo/game/message/impl/FriendServerStatusMessage.java
+++ b/src/org/apollo/game/message/impl/FriendServerStatusMessage.java
@@ -1,7 +1,7 @@
 package org.apollo.game.message.impl;
 
 import org.apollo.game.message.Message;
-import org.apollo.game.model.setting.ServerStatus;
+import org.apollo.game.model.entity.setting.ServerStatus;
 
 /**
  * A {@link Message} sent to the client to update the friend server status.
diff --git a/src/org/apollo/game/message/impl/PrivacyOptionMessage.java b/src/org/apollo/game/message/impl/PrivacyOptionMessage.java
index f53bde1f..c84f8812 100644
--- a/src/org/apollo/game/message/impl/PrivacyOptionMessage.java
+++ b/src/org/apollo/game/message/impl/PrivacyOptionMessage.java
@@ -1,7 +1,7 @@
 package org.apollo.game.message.impl;
 
 import org.apollo.game.message.Message;
-import org.apollo.game.model.setting.PrivacyState;
+import org.apollo.game.model.entity.setting.PrivacyState;
 
 /**
  * A {@link Message} sent both by and to the client to update the public chat, private (friend) chat, and trade chat
diff --git a/src/org/apollo/game/model/Appearance.java b/src/org/apollo/game/model/Appearance.java
index 9a15b0ec..4ece0496 100644
--- a/src/org/apollo/game/model/Appearance.java
+++ b/src/org/apollo/game/model/Appearance.java
@@ -1,6 +1,6 @@
 package org.apollo.game.model;
 
-import org.apollo.game.model.setting.Gender;
+import org.apollo.game.model.entity.setting.Gender;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/org/apollo/game/model/entity/Player.java b/src/org/apollo/game/model/entity/Player.java
index 578dfecd..8b02a12b 100644
--- a/src/org/apollo/game/model/entity/Player.java
+++ b/src/org/apollo/game/model/entity/Player.java
@@ -19,6 +19,9 @@ import org.apollo.game.model.Appearance;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.World;
 import org.apollo.game.model.area.Sector;
+import org.apollo.game.model.entity.setting.PrivacyState;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.ScreenBrightness;
 import org.apollo.game.model.event.impl.LoginEvent;
 import org.apollo.game.model.event.impl.LogoutEvent;
 import org.apollo.game.model.inter.InterfaceConstants;
@@ -33,9 +36,6 @@ import org.apollo.game.model.inv.Inventory.StackMode;
 import org.apollo.game.model.inv.InventoryConstants;
 import org.apollo.game.model.inv.InventoryListener;
 import org.apollo.game.model.inv.SynchronizationInventoryListener;
-import org.apollo.game.model.setting.PrivacyState;
-import org.apollo.game.model.setting.PrivilegeLevel;
-import org.apollo.game.model.setting.ScreenBrightness;
 import org.apollo.game.model.skill.LevelUpSkillListener;
 import org.apollo.game.model.skill.SynchronizationSkillListener;
 import org.apollo.game.sync.block.SynchronizationBlock;
diff --git a/src/org/apollo/game/model/setting/Gender.java b/src/org/apollo/game/model/entity/setting/Gender.java
similarity index 91%
rename from src/org/apollo/game/model/setting/Gender.java
rename to src/org/apollo/game/model/entity/setting/Gender.java
index 1e95bae1..9cd43668 100644
--- a/src/org/apollo/game/model/setting/Gender.java
+++ b/src/org/apollo/game/model/entity/setting/Gender.java
@@ -1,4 +1,4 @@
-package org.apollo.game.model.setting;
+package org.apollo.game.model.entity.setting;
 
 /**
  * An enumeration containing the two genders (male and female). This enumeration relies on the ordering of the elements
diff --git a/src/org/apollo/game/model/setting/PrivacyState.java b/src/org/apollo/game/model/entity/setting/PrivacyState.java
similarity index 98%
rename from src/org/apollo/game/model/setting/PrivacyState.java
rename to src/org/apollo/game/model/entity/setting/PrivacyState.java
index 0a62b1fc..76fbec8d 100644
--- a/src/org/apollo/game/model/setting/PrivacyState.java
+++ b/src/org/apollo/game/model/entity/setting/PrivacyState.java
@@ -1,4 +1,4 @@
-package org.apollo.game.model.setting;
+package org.apollo.game.model.entity.setting;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/org/apollo/game/model/setting/PrivilegeLevel.java b/src/org/apollo/game/model/entity/setting/PrivilegeLevel.java
similarity index 96%
rename from src/org/apollo/game/model/setting/PrivilegeLevel.java
rename to src/org/apollo/game/model/entity/setting/PrivilegeLevel.java
index e5738f7c..fbdaf7c6 100644
--- a/src/org/apollo/game/model/setting/PrivilegeLevel.java
+++ b/src/org/apollo/game/model/entity/setting/PrivilegeLevel.java
@@ -1,4 +1,4 @@
-package org.apollo.game.model.setting;
+package org.apollo.game.model.entity.setting;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/org/apollo/game/model/setting/ScreenBrightness.java b/src/org/apollo/game/model/entity/setting/ScreenBrightness.java
similarity index 96%
rename from src/org/apollo/game/model/setting/ScreenBrightness.java
rename to src/org/apollo/game/model/entity/setting/ScreenBrightness.java
index 9ae6cd9c..4a190a44 100644
--- a/src/org/apollo/game/model/setting/ScreenBrightness.java
+++ b/src/org/apollo/game/model/entity/setting/ScreenBrightness.java
@@ -1,4 +1,4 @@
-package org.apollo.game.model.setting;
+package org.apollo.game.model.entity.setting;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/org/apollo/game/model/setting/ServerStatus.java b/src/org/apollo/game/model/entity/setting/ServerStatus.java
similarity index 95%
rename from src/org/apollo/game/model/setting/ServerStatus.java
rename to src/org/apollo/game/model/entity/setting/ServerStatus.java
index 05bc3d8e..651d4b88 100644
--- a/src/org/apollo/game/model/setting/ServerStatus.java
+++ b/src/org/apollo/game/model/entity/setting/ServerStatus.java
@@ -1,4 +1,4 @@
-package org.apollo.game.model.setting;
+package org.apollo.game.model.entity.setting;
 
 import com.google.common.base.Preconditions;
 
diff --git a/src/org/apollo/game/model/setting/package-info.java b/src/org/apollo/game/model/entity/setting/package-info.java
similarity index 60%
rename from src/org/apollo/game/model/setting/package-info.java
rename to src/org/apollo/game/model/entity/setting/package-info.java
index 5c8ed99e..db35d20a 100644
--- a/src/org/apollo/game/model/setting/package-info.java
+++ b/src/org/apollo/game/model/entity/setting/package-info.java
@@ -1,4 +1,4 @@
 /**
  * Contains player setting or customisation-related classes.
  */
-package org.apollo.game.model.setting;
\ No newline at end of file
+package org.apollo.game.model.entity.setting;
\ No newline at end of file
diff --git a/src/org/apollo/game/sync/block/ChatBlock.java b/src/org/apollo/game/sync/block/ChatBlock.java
index de3eb001..14bbba81 100644
--- a/src/org/apollo/game/sync/block/ChatBlock.java
+++ b/src/org/apollo/game/sync/block/ChatBlock.java
@@ -1,7 +1,7 @@
 package org.apollo.game.sync.block;
 
 import org.apollo.game.message.impl.ChatMessage;
-import org.apollo.game.model.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
 
 /**
  * The chat {@link SynchronizationBlock}. Only players can utilise this block.
diff --git a/src/org/apollo/io/player/impl/BinaryPlayerLoader.java b/src/org/apollo/io/player/impl/BinaryPlayerLoader.java
index ada3d857..00d2fe89 100644
--- a/src/org/apollo/io/player/impl/BinaryPlayerLoader.java
+++ b/src/org/apollo/io/player/impl/BinaryPlayerLoader.java
@@ -20,11 +20,11 @@ import org.apollo.game.model.entity.attr.AttributeType;
 import org.apollo.game.model.entity.attr.BooleanAttribute;
 import org.apollo.game.model.entity.attr.NumericalAttribute;
 import org.apollo.game.model.entity.attr.StringAttribute;
+import org.apollo.game.model.entity.setting.Gender;
+import org.apollo.game.model.entity.setting.PrivacyState;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.ScreenBrightness;
 import org.apollo.game.model.inv.Inventory;
-import org.apollo.game.model.setting.Gender;
-import org.apollo.game.model.setting.PrivacyState;
-import org.apollo.game.model.setting.PrivilegeLevel;
-import org.apollo.game.model.setting.ScreenBrightness;
 import org.apollo.io.player.PlayerLoader;
 import org.apollo.io.player.PlayerLoaderResponse;
 import org.apollo.net.codec.login.LoginConstants;
diff --git a/src/org/apollo/io/player/impl/DummyPlayerLoader.java b/src/org/apollo/io/player/impl/DummyPlayerLoader.java
index 0cc48ed4..95cd971d 100644
--- a/src/org/apollo/io/player/impl/DummyPlayerLoader.java
+++ b/src/org/apollo/io/player/impl/DummyPlayerLoader.java
@@ -2,7 +2,7 @@ package org.apollo.io.player.impl;
 
 import org.apollo.game.model.Position;
 import org.apollo.game.model.entity.Player;
-import org.apollo.game.model.setting.PrivilegeLevel;
+import org.apollo.game.model.entity.setting.PrivilegeLevel;
 import org.apollo.io.player.PlayerLoader;
 import org.apollo.io.player.PlayerLoaderResponse;
 import org.apollo.net.codec.login.LoginConstants;
diff --git a/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java b/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java
index 9aaaaf51..52d684ef 100644
--- a/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java
+++ b/src/org/apollo/net/release/r317/PlayerDesignMessageDecoder.java
@@ -2,7 +2,7 @@ package org.apollo.net.release.r317;
 
 import org.apollo.game.message.impl.PlayerDesignMessage;
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.setting.Gender;
+import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketReader;
diff --git a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java
index 5908d2e9..a1a55d14 100644
--- a/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java
+++ b/src/org/apollo/net/release/r317/PlayerSynchronizationMessageEncoder.java
@@ -9,8 +9,8 @@ import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.entity.EquipmentConstants;
+import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.game.model.inv.Inventory;
-import org.apollo.game.model.setting.Gender;
 import org.apollo.game.sync.block.AnimationBlock;
 import org.apollo.game.sync.block.AppearanceBlock;
 import org.apollo.game.sync.block.ChatBlock;
diff --git a/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java b/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java
index 0572398e..61593731 100644
--- a/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java
+++ b/src/org/apollo/net/release/r377/PlayerDesignMessageDecoder.java
@@ -2,7 +2,7 @@ package org.apollo.net.release.r377;
 
 import org.apollo.game.message.impl.PlayerDesignMessage;
 import org.apollo.game.model.Appearance;
-import org.apollo.game.model.setting.Gender;
+import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.net.codec.game.DataType;
 import org.apollo.net.codec.game.GamePacket;
 import org.apollo.net.codec.game.GamePacketReader;
diff --git a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java b/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java
index cc68abd8..341a1b17 100644
--- a/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java
+++ b/src/org/apollo/net/release/r377/PlayerSynchronizationMessageEncoder.java
@@ -9,8 +9,8 @@ import org.apollo.game.model.Item;
 import org.apollo.game.model.Position;
 import org.apollo.game.model.def.EquipmentDefinition;
 import org.apollo.game.model.entity.EquipmentConstants;
+import org.apollo.game.model.entity.setting.Gender;
 import org.apollo.game.model.inv.Inventory;
-import org.apollo.game.model.setting.Gender;
 import org.apollo.game.sync.block.AnimationBlock;
 import org.apollo.game.sync.block.AppearanceBlock;
 import org.apollo.game.sync.block.ChatBlock;