diff --git a/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java b/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
index 74693dbf..4d49210f 100644
--- a/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
+++ b/src/com/sekwah/advancedportals/core/AdvancedPortalsCore.java
@@ -10,8 +10,8 @@ import com.sekwah.advancedportals.core.api.registry.WarpEffectRegistry;
 import com.sekwah.advancedportals.core.commands.CommandWithSubCommands;
 import com.sekwah.advancedportals.core.commands.subcommands.desti.CreateDestiSubCommand;
 import com.sekwah.advancedportals.core.commands.subcommands.portal.*;
-import com.sekwah.advancedportals.core.util.Config;
-import com.sekwah.advancedportals.core.util.DataStorage;
+import com.sekwah.advancedportals.core.config.Config;
+import com.sekwah.advancedportals.core.data.DataStorage;
 import com.sekwah.advancedportals.core.util.InfoLogger;
 import com.sekwah.advancedportals.core.util.Lang;
 import com.sekwah.advancedportals.coreconnector.ConnectorDataCollector;
diff --git a/src/com/sekwah/advancedportals/core/util/Config.java b/src/com/sekwah/advancedportals/core/config/Config.java
similarity index 95%
rename from src/com/sekwah/advancedportals/core/util/Config.java
rename to src/com/sekwah/advancedportals/core/config/Config.java
index dc1f41c3..74cdef94 100644
--- a/src/com/sekwah/advancedportals/core/util/Config.java
+++ b/src/com/sekwah/advancedportals/core/config/Config.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.core.util;
+package com.sekwah.advancedportals.core.config;
 
 /**
  * To store the data for config
diff --git a/src/com/sekwah/advancedportals/core/util/DataStorage.java b/src/com/sekwah/advancedportals/core/data/DataStorage.java
similarity index 99%
rename from src/com/sekwah/advancedportals/core/util/DataStorage.java
rename to src/com/sekwah/advancedportals/core/data/DataStorage.java
index 77044449..80eb5dae 100644
--- a/src/com/sekwah/advancedportals/core/util/DataStorage.java
+++ b/src/com/sekwah/advancedportals/core/data/DataStorage.java
@@ -1,4 +1,4 @@
-package com.sekwah.advancedportals.core.util;
+package com.sekwah.advancedportals.core.data;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
diff --git a/src/com/sekwah/advancedportals/core/util/InfoLogger.java b/src/com/sekwah/advancedportals/core/util/InfoLogger.java
index 2f703492..9740d7c8 100644
--- a/src/com/sekwah/advancedportals/core/util/InfoLogger.java
+++ b/src/com/sekwah/advancedportals/core/util/InfoLogger.java
@@ -4,13 +4,13 @@ public abstract class InfoLogger {
 
     /**
      * Problematic messages
-     * @param s
+     * @param s warning message
      */
     public abstract void logWarning(String s);
 
     /**
      * General information logging
-     * @param s
+     * @param s info message
      */
     public abstract void log(String s);
 }