Renaming and reorganizing

src/main/java/venture/Aust1n46/chat/controllers/CommandController.java

@@ -17,44 +17,44 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import venture.Aust1n46.chat.initators.commands.Broadcast;
+import venture.Aust1n46.chat.controllers.commands.Broadcast;
-import venture.Aust1n46.chat.initators.commands.BungeeToggle;
+import venture.Aust1n46.chat.controllers.commands.BungeeToggle;
-import venture.Aust1n46.chat.initators.commands.Channel;
+import venture.Aust1n46.chat.controllers.commands.Channel;
-import venture.Aust1n46.chat.initators.commands.ChannelAlias;
+import venture.Aust1n46.chat.controllers.commands.ChannelAlias;
-import venture.Aust1n46.chat.initators.commands.Channelinfo;
+import venture.Aust1n46.chat.controllers.commands.Channelinfo;
-import venture.Aust1n46.chat.initators.commands.Chatinfo;
+import venture.Aust1n46.chat.controllers.commands.Chatinfo;
-import venture.Aust1n46.chat.initators.commands.Chatreload;
+import venture.Aust1n46.chat.controllers.commands.Chatreload;
-import venture.Aust1n46.chat.initators.commands.Chlist;
+import venture.Aust1n46.chat.controllers.commands.Chlist;
-import venture.Aust1n46.chat.initators.commands.Chwho;
+import venture.Aust1n46.chat.controllers.commands.Chwho;
-import venture.Aust1n46.chat.initators.commands.Clearchat;
+import venture.Aust1n46.chat.controllers.commands.Clearchat;
-import venture.Aust1n46.chat.initators.commands.Commandblock;
+import venture.Aust1n46.chat.controllers.commands.Commandblock;
-import venture.Aust1n46.chat.initators.commands.Commandspy;
+import venture.Aust1n46.chat.controllers.commands.Commandspy;
-import venture.Aust1n46.chat.initators.commands.Edit;
+import venture.Aust1n46.chat.controllers.commands.Edit;
-import venture.Aust1n46.chat.initators.commands.Filter;
+import venture.Aust1n46.chat.controllers.commands.Filter;
-import venture.Aust1n46.chat.initators.commands.Force;
+import venture.Aust1n46.chat.controllers.commands.Force;
-import venture.Aust1n46.chat.initators.commands.Forceall;
+import venture.Aust1n46.chat.controllers.commands.Forceall;
-import venture.Aust1n46.chat.initators.commands.Ignore;
+import venture.Aust1n46.chat.controllers.commands.Ignore;
-import venture.Aust1n46.chat.initators.commands.Kickchannel;
+import venture.Aust1n46.chat.controllers.commands.Kickchannel;
-import venture.Aust1n46.chat.initators.commands.Kickchannelall;
+import venture.Aust1n46.chat.controllers.commands.Kickchannelall;
-import venture.Aust1n46.chat.initators.commands.Leave;
+import venture.Aust1n46.chat.controllers.commands.Leave;
-import venture.Aust1n46.chat.initators.commands.Listen;
+import venture.Aust1n46.chat.controllers.commands.Listen;
-import venture.Aust1n46.chat.initators.commands.Me;
+import venture.Aust1n46.chat.controllers.commands.Me;
-import venture.Aust1n46.chat.initators.commands.Message;
+import venture.Aust1n46.chat.controllers.commands.Message;
-import venture.Aust1n46.chat.initators.commands.MessageToggle;
+import venture.Aust1n46.chat.controllers.commands.MessageToggle;
-import venture.Aust1n46.chat.initators.commands.Mute;
+import venture.Aust1n46.chat.controllers.commands.Mute;
-import venture.Aust1n46.chat.initators.commands.Muteall;
+import venture.Aust1n46.chat.controllers.commands.Muteall;
-import venture.Aust1n46.chat.initators.commands.Notifications;
+import venture.Aust1n46.chat.controllers.commands.Notifications;
-import venture.Aust1n46.chat.initators.commands.Party;
+import venture.Aust1n46.chat.controllers.commands.Party;
-import venture.Aust1n46.chat.initators.commands.RangedSpy;
+import venture.Aust1n46.chat.controllers.commands.RangedSpy;
-import venture.Aust1n46.chat.initators.commands.Removemessage;
+import venture.Aust1n46.chat.controllers.commands.Removemessage;
-import venture.Aust1n46.chat.initators.commands.Reply;
+import venture.Aust1n46.chat.controllers.commands.Reply;
-import venture.Aust1n46.chat.initators.commands.Setchannel;
+import venture.Aust1n46.chat.controllers.commands.Setchannel;
-import venture.Aust1n46.chat.initators.commands.Setchannelall;
+import venture.Aust1n46.chat.controllers.commands.Setchannelall;
-import venture.Aust1n46.chat.initators.commands.Spy;
+import venture.Aust1n46.chat.controllers.commands.Spy;
-import venture.Aust1n46.chat.initators.commands.Unmute;
+import venture.Aust1n46.chat.controllers.commands.Unmute;
-import venture.Aust1n46.chat.initators.commands.Unmuteall;
+import venture.Aust1n46.chat.controllers.commands.Unmuteall;
-import venture.Aust1n46.chat.initators.commands.VentureChatGui;
+import venture.Aust1n46.chat.controllers.commands.VentureChatGui;
-import venture.Aust1n46.chat.initators.commands.Venturechat;
+import venture.Aust1n46.chat.controllers.commands.Venturechat;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.service.ConfigService;

src/main/java/venture/Aust1n46/chat/controllers/PluginMessageController.java

@@ -20,15 +20,15 @@ import com.google.inject.Singleton;
 
 import me.clip.placeholderapi.PlaceholderAPI;
 import venture.Aust1n46.chat.api.events.VentureChatEvent;
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.ChatChannel;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
 import venture.Aust1n46.chat.service.VentureChatDatabaseService;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 @Singleton
@@ -40,9 +40,9 @@ public class PluginMessageController {
 	@Inject
 	private VentureChatDatabaseService databaseService;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 
@@ -92,6 +92,7 @@ public class PluginMessageController {
 				plugin.getServer().getScheduler().runTaskLaterAsynchronously(plugin, new Runnable() {
 					@Override
 					public void run() {
+						System.out.println(mcp.isHasPlayed());
 						if (!mcp.isOnline() || mcp.isHasPlayed()) {
 							return;
 						}
@@ -320,6 +321,7 @@ public class PluginMessageController {
 				if (p == null || p.isHasPlayed()) {
 					return;
 				}
+				System.out.println(p.isHasPlayed());
 				for (Object ch : p.getListening().toArray()) {
 					String c = ch.toString();
 					ChatChannel cha = configService.getChannel(c);

src/main/java/venture/Aust1n46/chat/controllers/ProxyController.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.controllers.proxy;
+package venture.Aust1n46.chat.controllers;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
@@ -9,20 +9,20 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.inject.Inject;
 
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.SynchronizedVentureChatPlayer;
 import venture.Aust1n46.chat.model.TemporaryDataInstance;
 import venture.Aust1n46.chat.model.VentureChatProxyServer;
 import venture.Aust1n46.chat.model.VentureChatProxySource;
-import venture.Aust1n46.chat.service.proxy.VentureChatProxyPlayerApiService;
+import venture.Aust1n46.chat.service.ProxyPlayerApiService;
 
-public class VentureChatProxyController {
+public class ProxyController {
 	public static String PLUGIN_MESSAGING_CHANNEL_NAMESPACE = "venturechat";
 	public static String PLUGIN_MESSAGING_CHANNEL_NAME = "data";
 	public static String PLUGIN_MESSAGING_CHANNEL_STRING = "venturechat:data";
 	
 	@Inject
-	private VentureChatProxyPlayerApiService playerApiService;
+	private ProxyPlayerApiService playerApiService;
 	
 	public void onPluginMessage(byte[] data, String serverName, VentureChatProxySource source) {
 		ByteArrayInputStream instream = new ByteArrayInputStream(data);

src/main/java/venture/Aust1n46/chat/controllers/ProxyFlatFileController.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.controllers.proxy;
+package venture.Aust1n46.chat.controllers;
 
 import java.io.File;
 import java.io.IOException;
@@ -16,22 +16,22 @@ import com.google.inject.Inject;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.SynchronizedVentureChatPlayer;
 import venture.Aust1n46.chat.model.VentureChatProxySource;
-import venture.Aust1n46.chat.service.proxy.ProxyUuidService;
+import venture.Aust1n46.chat.service.ProxyPlayerApiService;
-import venture.Aust1n46.chat.service.proxy.VentureChatProxyPlayerApiService;
+import venture.Aust1n46.chat.service.ProxyUuidService;
 
 /**
  * Class for reading and writing proxy player data.
  *
  * @author Aust1n46
  */
-public class VentureChatProxyFlatFileController {
+public class ProxyFlatFileController {
 	@Inject
     private ProxyUuidService uuidService;
 	@Inject
-	private VentureChatProxyPlayerApiService playerApiService;
+	private ProxyPlayerApiService playerApiService;
 	
     public void loadLegacyBungeePlayerData(File dataFolder, VentureChatProxySource source) {
         File sync = new File(dataFolder, "BungeePlayers.yml");

src/main/java/venture/Aust1n46/chat/controllers/SpigotFlatFileController.java

@@ -20,13 +20,13 @@ import org.bukkit.configuration.file.YamlConfiguration;
 import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatChannel;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.UUIDService;
+import venture.Aust1n46.chat.service.UuidService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 /**
@@ -35,13 +35,13 @@ import venture.Aust1n46.chat.utilities.FormatUtils;
  * @author Aust1n46
  */
 @Singleton
-public class VentureChatSpigotFlatFileController {
+public class SpigotFlatFileController {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private UUIDService uuidService;
+	private UuidService uuidService;
 	@Inject
-	private VentureChatPlayerApiService ventureChatApi;
+	private PlayerApiService ventureChatApi;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Broadcast.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -9,14 +9,14 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Broadcast extends UniversalCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 
 	@Inject
 	public Broadcast(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/BungeeToggle.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -8,13 +8,13 @@ import venture.Aust1n46.chat.controllers.PluginMessageController;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class BungeeToggle extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public BungeeToggle(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Channel.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -12,14 +12,14 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 @Singleton
 public class Channel extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/ChannelAlias.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -10,11 +10,11 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class ChannelAlias extends PlayerCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	@Inject

src/main/java/venture/Aust1n46/chat/controllers/commands/Channelinfo.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

src/main/java/venture/Aust1n46/chat/controllers/commands/Chatinfo.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -7,14 +7,15 @@ import org.bukkit.entity.Player;
 import com.google.inject.Inject;
 
 import venture.Aust1n46.chat.model.ChatChannel;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Chatinfo extends UniversalCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Chatreload.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.util.UUID;
 
@@ -7,23 +7,23 @@ import org.bukkit.entity.Player;
 
 import com.google.inject.Inject;
 
-import venture.Aust1n46.chat.controllers.VentureChatSpigotFlatFileController;
+import venture.Aust1n46.chat.controllers.SpigotFlatFileController;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.JsonFormat;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Chatreload extends UniversalCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatSpigotFlatFileController spigotFlatFileController;
+	private SpigotFlatFileController spigotFlatFileController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Chlist.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Chwho.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import static venture.Aust1n46.chat.utilities.FormatUtils.LINE_LENGTH;
 
@@ -23,7 +23,7 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Chwho extends UniversalCommand {
 	@Inject
@@ -31,7 +31,7 @@ public class Chwho extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	

src/main/java/venture/Aust1n46/chat/controllers/commands/Clearchat.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -8,11 +8,11 @@ import venture.Aust1n46.chat.localization.InternalMessage;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.model.UniversalCommand;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Clearchat extends UniversalCommand {
 	@Inject
-    private VentureChatPlayerApiService ventureChatApi;
+    private PlayerApiService ventureChatApi;
 	
 	@Inject
 	public Clearchat(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Commandblock.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.util.List;
 
@@ -10,13 +10,13 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.model.UniversalCommand;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Commandblock extends UniversalCommand {
 	@Inject
     private VentureChat plugin;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	
 	@Inject
 	public Commandblock(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Commandspy.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Commandspy extends PlayerCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Commandspy(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Edit.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -18,17 +18,17 @@ import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.ChatMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Edit extends UniversalCommand {
     @Inject
     private VentureChat plugin;
     @Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
     @Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
     
     private PacketContainer emptyLinePacketContainer;
     private WrappedChatComponent messageDeletedComponentPlayer;

src/main/java/venture/Aust1n46/chat/controllers/commands/Filter.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Filter extends PlayerCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Filter(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Force.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Force extends UniversalCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Force(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Forceall.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Forceall extends UniversalCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Forceall(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Ignore.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -19,7 +19,7 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Ignore extends PlayerCommand {
 	@Inject
@@ -27,7 +27,7 @@ public class Ignore extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Ignore(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Kickchannel.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -11,13 +11,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Kickchannel extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Kickchannelall.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
@@ -11,13 +11,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Kickchannelall extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Leave.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
@@ -11,13 +11,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Leave extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Listen.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -10,13 +10,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Listen extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Me.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
@@ -7,15 +7,15 @@ import com.google.inject.Inject;
 
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Me extends UniversalCommand {
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Me(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Message.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -18,19 +18,19 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Message extends PlayerCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Message(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/MessageToggle.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -8,13 +8,13 @@ import venture.Aust1n46.chat.controllers.PluginMessageController;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class MessageToggle extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public MessageToggle(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Mute.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -20,7 +20,7 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Mute extends UniversalCommand {
@@ -29,7 +29,7 @@ public class Mute extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Muteall.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -10,14 +10,14 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Muteall extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Notifications.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Notifications extends PlayerCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Notifications(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Party.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import static venture.Aust1n46.chat.utilities.FormatUtils.LINE_LENGTH;
 
@@ -10,17 +10,17 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Party extends PlayerCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Party(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/RangedSpy.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -7,11 +7,11 @@ import com.google.inject.Inject;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class RangedSpy extends PlayerCommand {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public RangedSpy(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Removemessage.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -23,19 +23,19 @@ import venture.Aust1n46.chat.model.ChatMessage;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Removemessage extends UniversalCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Reply.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -13,19 +13,19 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class Reply extends PlayerCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Reply(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Setchannel.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -10,13 +10,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Setchannel extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Setchannelall.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -10,13 +10,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Setchannelall extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Spy.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.entity.Player;
 
@@ -8,13 +8,13 @@ import venture.Aust1n46.chat.controllers.PluginMessageController;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Spy extends PlayerCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@Inject
 	public Spy(String name) {

src/main/java/venture/Aust1n46/chat/controllers/commands/Unmute.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
@@ -19,13 +19,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Unmute extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/Unmuteall.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 
@@ -10,13 +10,13 @@ import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.UniversalCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class Unmuteall extends UniversalCommand {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/controllers/commands/VentureChatGui.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -21,7 +21,7 @@ import venture.Aust1n46.chat.model.GuiSlot;
 import venture.Aust1n46.chat.model.PlayerCommand;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 import venture.Aust1n46.chat.xcut.VersionService;
 
@@ -29,7 +29,7 @@ public class VentureChatGui extends PlayerCommand {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	@Inject

src/main/java/venture/Aust1n46/chat/controllers/commands/Venturechat.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.controllers.commands;
 
 import org.bukkit.command.CommandSender;
 

src/main/java/venture/Aust1n46/chat/initiators/application/VentureChat.java

@@ -15,10 +15,11 @@ import com.google.inject.Inject;
 import com.google.inject.Injector;
 import com.google.inject.Singleton;
 
+import lombok.Getter;
 import net.milkbowl.vault.permission.Permission;
 import venture.Aust1n46.chat.controllers.CommandController;
 import venture.Aust1n46.chat.controllers.PluginMessageController;
-import venture.Aust1n46.chat.controllers.VentureChatSpigotFlatFileController;
+import venture.Aust1n46.chat.controllers.SpigotFlatFileController;
 import venture.Aust1n46.chat.guice.VentureChatPluginModule;
 import venture.Aust1n46.chat.initiators.listeners.ChatListener;
 import venture.Aust1n46.chat.initiators.listeners.LoginListener;
@@ -28,7 +29,7 @@ import venture.Aust1n46.chat.initiators.listeners.SignListener;
 import venture.Aust1n46.chat.initiators.schedulers.UnmuteScheduler;
 import venture.Aust1n46.chat.localization.Localization;
 import venture.Aust1n46.chat.placeholderapi.VentureChatPlaceholders;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 import venture.Aust1n46.chat.xcut.VersionService;
 
@@ -52,20 +53,26 @@ public class VentureChat extends JavaPlugin implements PluginMessageListener {
 	@Inject
 	private VentureChatPlaceholders ventureChatPlaceholders;
 	@Inject
-	private VentureChatSpigotFlatFileController spigotFlatFileService;
+	private SpigotFlatFileController spigotFlatFileService;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
 	private VersionService versionService;
 
-	private Permission permission = null;
+	@Getter
+	private Permission vaultPermission;
+	private Injector injector;
+	
+	public void injectDependencies(Object o) {
+		injector.injectMembers(o);
+	}
 
 	@Override
 	public void onEnable() {
 		final VentureChatPluginModule pluginModule = new VentureChatPluginModule(this);
-		final Injector injector = Guice.createInjector(pluginModule);
+		injector = Guice.createInjector(pluginModule);
 		injector.injectMembers(this);
 		injector.injectMembers(new CommandController());
 		injector.injectMembers(new UnmuteScheduler());
@@ -168,13 +175,9 @@ public class VentureChat extends JavaPlugin implements PluginMessageListener {
 	private boolean setupPermissions() {
 		RegisteredServiceProvider<Permission> permissionProvider = getServer().getServicesManager().getRegistration(net.milkbowl.vault.permission.Permission.class);
 		if (permissionProvider != null) {
-			permission = permissionProvider.getProvider();
+			vaultPermission = permissionProvider.getProvider();
 		}
-		return (permission != null);
+		return (vaultPermission != null);
-	}
-
-	public Permission getVaultPermission() {
-		return permission;
 	}
 
 	@Override

src/main/java/venture/Aust1n46/chat/initiators/application/VentureChatBungee.java

@@ -26,12 +26,12 @@ import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
 import net.md_5.bungee.event.EventHandler;
-import venture.Aust1n46.chat.controllers.proxy.VentureChatProxyController;
+import venture.Aust1n46.chat.controllers.ProxyController;
-import venture.Aust1n46.chat.controllers.proxy.VentureChatProxyFlatFileController;
+import venture.Aust1n46.chat.controllers.ProxyFlatFileController;
 import venture.Aust1n46.chat.guice.VentureChatBungeePluginModule;
 import venture.Aust1n46.chat.model.VentureChatProxyServer;
 import venture.Aust1n46.chat.model.VentureChatProxySource;
-import venture.Aust1n46.chat.service.proxy.ProxyUuidService;
+import venture.Aust1n46.chat.service.ProxyUuidService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 /**
@@ -46,9 +46,9 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 	@Inject
 	private ProxyUuidService uuidService;
 	@Inject
-	private VentureChatProxyFlatFileController proxyFlatFileController;
+	private ProxyFlatFileController proxyFlatFileController;
 	@Inject
-	private VentureChatProxyController proxy;
+	private ProxyController proxy;
 
 	@Override
 	public void onEnable() {
@@ -73,7 +73,7 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 		proxyFlatFileController.loadLegacyBungeePlayerData(bungeePlayerDataDirectory, this);
 		proxyFlatFileController.loadProxyPlayerData(bungeePlayerDataDirectory, this);
 
-		this.getProxy().registerChannel(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_STRING);
+		this.getProxy().registerChannel(ProxyController.PLUGIN_MESSAGING_CHANNEL_STRING);
 		this.getProxy().getPluginManager().registerListener(this, this);
 	}
 
@@ -109,7 +109,7 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 
 			for (String send : getProxy().getServers().keySet()) {
 				if (getProxy().getServers().get(send).getPlayers().size() > 0) {
-					getProxy().getServers().get(send).sendData(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_STRING, outstream.toByteArray());
+					getProxy().getServers().get(send).sendData(ProxyController.PLUGIN_MESSAGING_CHANNEL_STRING, outstream.toByteArray());
 				}
 			}
 		} catch (Exception e) {
@@ -119,7 +119,7 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 
 	@EventHandler
 	public void onPluginMessage(PluginMessageEvent event) {
-		if (!event.getTag().equals(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_STRING) && !event.getTag().contains("viaversion:")) {
+		if (!event.getTag().equals(ProxyController.PLUGIN_MESSAGING_CHANNEL_STRING) && !event.getTag().contains("viaversion:")) {
 			return;
 		}
 		if (!(event.getSender() instanceof Server)) {
@@ -131,7 +131,7 @@ public class VentureChatBungee extends Plugin implements Listener, VentureChatPr
 
 	@Override
 	public void sendPluginMessage(String serverName, byte[] data) {
-		getProxy().getServers().get(serverName).sendData(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_STRING, data);
+		getProxy().getServers().get(serverName).sendData(ProxyController.PLUGIN_MESSAGING_CHANNEL_STRING, data);
 	}
 
 	@Override

src/main/java/venture/Aust1n46/chat/initiators/application/VentureChatVelocity.java

@@ -32,8 +32,8 @@ import com.velocitypowered.api.proxy.server.RegisteredServer;
 import net.md_5.bungee.config.Configuration;
 import net.md_5.bungee.config.ConfigurationProvider;
 import net.md_5.bungee.config.YamlConfiguration;
-import venture.Aust1n46.chat.controllers.proxy.VentureChatProxyController;
+import venture.Aust1n46.chat.controllers.ProxyController;
-import venture.Aust1n46.chat.controllers.proxy.VentureChatProxyFlatFileController;
+import venture.Aust1n46.chat.controllers.ProxyFlatFileController;
 import venture.Aust1n46.chat.model.VentureChatProxyServer;
 import venture.Aust1n46.chat.model.VentureChatProxySource;
 import venture.Aust1n46.chat.utilities.FormatUtils;
@@ -45,14 +45,14 @@ import venture.Aust1n46.chat.utilities.FormatUtils;
  */
 public class VentureChatVelocity implements VentureChatProxySource {
 	private final ProxyServer proxyServer;
-	private final ChannelIdentifier channelIdentifier = MinecraftChannelIdentifier.create(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_NAMESPACE,
+	private final ChannelIdentifier channelIdentifier = MinecraftChannelIdentifier.create(ProxyController.PLUGIN_MESSAGING_CHANNEL_NAMESPACE,
-			VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_NAME);
+			ProxyController.PLUGIN_MESSAGING_CHANNEL_NAME);
 	private final Logger logger;
 
 	@Inject
-	private VentureChatProxyFlatFileController proxyFlatFileController;
+	private ProxyFlatFileController proxyFlatFileController;
 	@Inject
-	private VentureChatProxyController proxy;
+	private ProxyController proxy;
 
 	@Inject
 	@DataDirectory
@@ -136,7 +136,7 @@ public class VentureChatVelocity implements VentureChatProxySource {
 	@Subscribe
 	public void onPluginMessage(PluginMessageEvent event) {
 		String channelIdentifierId = event.getIdentifier().getId();
-		if (!channelIdentifierId.equals(VentureChatProxyController.PLUGIN_MESSAGING_CHANNEL_STRING) && !channelIdentifierId.contains("viaversion:")) {
+		if (!channelIdentifierId.equals(ProxyController.PLUGIN_MESSAGING_CHANNEL_STRING) && !channelIdentifierId.contains("viaversion:")) {
 			return;
 		}
 		if (!(event.getSource() instanceof ServerConnection)) {

src/main/java/venture/Aust1n46/chat/initiators/listeners/ChatListener.java

@@ -24,15 +24,15 @@ import me.clip.placeholderapi.PlaceholderAPI;
 import net.essentialsx.api.v2.services.discord.DiscordService;
 import venture.Aust1n46.chat.api.events.VentureChatEvent;
 import venture.Aust1n46.chat.controllers.PluginMessageController;
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.ChatChannel;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
 import venture.Aust1n46.chat.service.VentureChatDatabaseService;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 @SuppressWarnings("deprecation")
@@ -42,13 +42,13 @@ public class ChatListener implements Listener {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
 	private VentureChatDatabaseService databaseService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/initiators/listeners/LoginListener.java

@@ -13,14 +13,14 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import venture.Aust1n46.chat.controllers.PluginMessageController;
-import venture.Aust1n46.chat.controllers.VentureChatSpigotFlatFileController;
+import venture.Aust1n46.chat.controllers.SpigotFlatFileController;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.JsonFormat;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.UUIDService;
+import venture.Aust1n46.chat.service.UuidService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 import venture.Aust1n46.chat.xcut.Logger;
 
@@ -34,13 +34,13 @@ public class LoginListener implements Listener {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private UUIDService uuidService;
+	private UuidService uuidService;
 	@Inject
-	private VentureChatSpigotFlatFileController spigotFlatFileController;
+	private SpigotFlatFileController spigotFlatFileController;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	@Inject

src/main/java/venture/Aust1n46/chat/initiators/listeners/PacketListenerLegacyChat.java

@@ -12,16 +12,16 @@ import com.google.inject.Singleton;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatMessage;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.xcut.VersionService;
 
 @Singleton
 public class PacketListenerLegacyChat extends PacketAdapter {
 	@Inject
-	private VentureChatFormatService formatter;
+	private FormatService formatter;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private VersionService versionService;
 

src/main/java/venture/Aust1n46/chat/initiators/listeners/PreProcessCommandListener.java

@@ -31,8 +31,8 @@ import venture.Aust1n46.chat.model.GuiSlot;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
 import venture.Aust1n46.chat.service.VentureChatDatabaseService;
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 import venture.Aust1n46.chat.xcut.VersionService;
 
@@ -41,13 +41,13 @@ public class PreProcessCommandListener implements CommandExecutor, Listener {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatFormatService formatService;
+	private FormatService formatService;
 	@Inject
 	private VentureChatDatabaseService databaseService;
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	@Inject

src/main/java/venture/Aust1n46/chat/initiators/listeners/SignListener.java

@@ -9,13 +9,13 @@ import com.google.inject.Inject;
 import com.google.inject.Singleton;
 
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 @Singleton
 public class SignListener implements Listener {
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	@SuppressWarnings("deprecation")
 	@EventHandler(priority = EventPriority.HIGH)

src/main/java/venture/Aust1n46/chat/initiators/schedulers/UnmuteScheduler.java

@@ -8,13 +8,13 @@ import org.bukkit.scheduler.BukkitScheduler;
 import com.google.inject.Inject;
 
 import venture.Aust1n46.chat.controllers.PluginMessageController;
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.localization.LocalizedMessage;
 import venture.Aust1n46.chat.model.ChatChannel;
+import venture.Aust1n46.chat.model.MuteContainer;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 public class UnmuteScheduler {
@@ -23,7 +23,7 @@ public class UnmuteScheduler {
 	@Inject
 	private PluginMessageController pluginMessageController;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 

src/main/java/venture/Aust1n46/chat/model/ChatChannel.java

@@ -2,7 +2,7 @@ package venture.Aust1n46.chat.model;
 
 import org.bukkit.ChatColor;
 
-import venture.Aust1n46.chat.service.VentureChatFormatService;
+import venture.Aust1n46.chat.service.FormatService;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 /**
@@ -184,7 +184,7 @@ public class ChatChannel {
 	/**
 	 * Get the formatted color of the chat channel.
 	 * 
-	 * @return {@link String}. Returns {@link VentureChatFormatService#DEFAULT_COLOR_CODE} if the
+	 * @return {@link String}. Returns {@link FormatService#DEFAULT_COLOR_CODE} if the
 	 *         color is invalid.
 	 */
 	public String getColor() {
@@ -209,7 +209,7 @@ public class ChatChannel {
 	/**
 	 * Get the formatted chat color of the chat channel.
 	 * 
-	 * @return {@link String}. Returns {@link VentureChatFormatService#DEFAULT_COLOR_CODE} if the chat
+	 * @return {@link String}. Returns {@link FormatService#DEFAULT_COLOR_CODE} if the chat
 	 *         color is invalid.
 	 */
 	public String getChatColor() {

src/main/java/venture/Aust1n46/chat/model/MuteContainer.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.initators.commands;
+package venture.Aust1n46.chat.model;
 
 public class MuteContainer {
     private String channel;

src/main/java/venture/Aust1n46/chat/model/SynchronizedVentureChatPlayer.java

@@ -8,8 +8,6 @@ import java.util.List;
 import java.util.Set;
 import java.util.UUID;
 
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
-
 public class SynchronizedVentureChatPlayer {
     private UUID uuid;
     private Set<String> listening;

src/main/java/venture/Aust1n46/chat/model/VentureChatPlayer.java

@@ -13,7 +13,6 @@ import org.bukkit.entity.Player;
 import lombok.AccessLevel;
 import lombok.Data;
 import lombok.Setter;
-import venture.Aust1n46.chat.initators.commands.MuteContainer;
 
 /**
  * Wrapper for {@link Player}

src/main/java/venture/Aust1n46/chat/placeholderapi/VentureChatPlaceholders.java

@@ -10,7 +10,7 @@ import me.clip.placeholderapi.expansion.PlaceholderExpansion;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 
 public class VentureChatPlaceholders extends PlaceholderExpansion {
 	private static final String AUTHOR = "Aust1n46";
@@ -19,7 +19,7 @@ public class VentureChatPlaceholders extends PlaceholderExpansion {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 
 	private String version;
 

src/main/java/venture/Aust1n46/chat/service/FormatService.java

@@ -40,7 +40,7 @@ import venture.Aust1n46.chat.xcut.VersionService;
  * Class containing chat formatting methods.
  */
 @Singleton
-public class VentureChatFormatService {
+public class FormatService {
 	public static final int LEGACY_COLOR_CODE_LENGTH = 2;
 	public static final int HEX_COLOR_CODE_LENGTH = 14;
 	private static final Pattern PLACEHOLDERAPI_PLACEHOLDER_PATTERN = Pattern.compile("\\{([^\\{\\}]+)\\}");
@@ -50,7 +50,7 @@ public class VentureChatFormatService {
 	@Inject
 	private VentureChat plugin;
 	@Inject
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Inject
 	private ConfigService configService;
 	@Inject

src/main/java/venture/Aust1n46/chat/service/PlayerApiService.java

@@ -19,7 +19,7 @@ import venture.Aust1n46.chat.model.VentureChatPlayer;
  * @author Aust1n46
  */
 @Singleton
-public class VentureChatPlayerApiService {
+public class PlayerApiService {
 	private final HashMap<UUID, VentureChatPlayer> playerMap = new HashMap<>();
 	private final HashMap<String, UUID> namesMap = new HashMap<>();
 	private final HashMap<UUID, VentureChatPlayer> onlinePlayerMap = new HashMap<>();

src/main/java/venture/Aust1n46/chat/service/ProxyPlayerApiService.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.service.proxy;
+package venture.Aust1n46.chat.service;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -9,7 +9,7 @@ import com.google.inject.Singleton;
 import venture.Aust1n46.chat.model.SynchronizedVentureChatPlayer;
 
 @Singleton
-public class VentureChatProxyPlayerApiService {
+public class ProxyPlayerApiService {
 	private final HashMap<UUID, SynchronizedVentureChatPlayer> proxyPlayerMap = new HashMap<>();
 
 	public void addSynchronizedMineverseChatPlayerToMap(SynchronizedVentureChatPlayer smcp) {

src/main/java/venture/Aust1n46/chat/service/ProxyUuidService.java

@@ -1,4 +1,4 @@
-package venture.Aust1n46.chat.service.proxy;
+package venture.Aust1n46.chat.service;
 
 import java.util.UUID;
 

src/main/java/venture/Aust1n46/chat/service/UuidService.java

@@ -9,7 +9,7 @@ import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.utilities.FormatUtils;
 
 @Singleton
-public class UUIDService {
+public class UuidService {
 	@Inject
 	private VentureChat plugin;
 

src/test/java/venture/Aust1n46/chat/initiators/listeners/LoginListenerTest.java

@@ -13,13 +13,13 @@ import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import venture.Aust1n46.chat.controllers.PluginMessageController;
-import venture.Aust1n46.chat.controllers.VentureChatSpigotFlatFileController;
+import venture.Aust1n46.chat.controllers.SpigotFlatFileController;
 import venture.Aust1n46.chat.initiators.application.VentureChat;
 import venture.Aust1n46.chat.model.ChatChannel;
 import venture.Aust1n46.chat.model.VentureChatPlayer;
 import venture.Aust1n46.chat.service.ConfigService;
-import venture.Aust1n46.chat.service.UUIDService;
+import venture.Aust1n46.chat.service.UuidService;
-import venture.Aust1n46.chat.service.VentureChatPlayerApiService;
+import venture.Aust1n46.chat.service.PlayerApiService;
 import venture.Aust1n46.chat.xcut.Logger;
 
 @ExtendWith(MockitoExtension.class)
@@ -27,13 +27,13 @@ public class LoginListenerTest {
 	@Mock
 	private VentureChat plugin;
 	@Mock
-	private UUIDService uuidService;
+	private UuidService uuidService;
 	@Mock
-	private VentureChatSpigotFlatFileController spigotFlatFileController;
+	private SpigotFlatFileController spigotFlatFileController;
 	@Mock
 	private PluginMessageController pluginMessageController;
 	@Mock
-	private VentureChatPlayerApiService playerApiService;
+	private PlayerApiService playerApiService;
 	@Mock
 	private ConfigService configService;
 	@Mock