diff --git a/src/main/java/com/redstoner/annotations/AutoRegisterListener.java b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java
index 65d0585..eb1c7c0 100644
--- a/src/main/java/com/redstoner/annotations/AutoRegisterListener.java
+++ b/src/main/java/com/redstoner/annotations/AutoRegisterListener.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/redstoner/annotations/Commands.java b/src/main/java/com/redstoner/annotations/Commands.java
index 15284c3..6e57c6c 100644
--- a/src/main/java/com/redstoner/annotations/Commands.java
+++ b/src/main/java/com/redstoner/annotations/Commands.java
@@ -1,12 +1,12 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
+
+import com.redstoner.misc.CommandHolder;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import main.java.com.redstoner.misc.CommandHolder;
-
 @Target(ElementType.TYPE)
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Commands
diff --git a/src/main/java/com/redstoner/annotations/Depends.java b/src/main/java/com/redstoner/annotations/Depends.java
index e4d3742..063a1f6 100644
--- a/src/main/java/com/redstoner/annotations/Depends.java
+++ b/src/main/java/com/redstoner/annotations/Depends.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/redstoner/annotations/SoftDepends.java b/src/main/java/com/redstoner/annotations/SoftDepends.java
index 50d444d..06c6b0f 100644
--- a/src/main/java/com/redstoner/annotations/SoftDepends.java
+++ b/src/main/java/com/redstoner/annotations/SoftDepends.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/src/main/java/com/redstoner/annotations/Version.java b/src/main/java/com/redstoner/annotations/Version.java
index c276881..e700292 100644
--- a/src/main/java/com/redstoner/annotations/Version.java
+++ b/src/main/java/com/redstoner/annotations/Version.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.annotations;
+package com.redstoner.annotations;
 
 import java.lang.annotation.Documented;
 import java.lang.annotation.ElementType;
diff --git a/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java
index eab470f..df33bff 100644
--- a/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java
+++ b/src/main/java/com/redstoner/exceptions/NonSaveableConfigException.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.exceptions;
+package com.redstoner.exceptions;
 
 public class NonSaveableConfigException extends Exception {
     private static final long serialVersionUID = -7271481973389455510L;
diff --git a/src/main/java/com/redstoner/faucet/Faucet.java b/src/main/java/com/redstoner/faucet/Faucet.java
index c1de4aa..6c37f15 100644
--- a/src/main/java/com/redstoner/faucet/Faucet.java
+++ b/src/main/java/com/redstoner/faucet/Faucet.java
@@ -1,15 +1,13 @@
-package main.java.com.redstoner.faucet;
-
-import java.util.HashMap;
-
-import main.java.com.redstoner.annotations.Version;
-import org.bukkit.plugin.java.JavaPlugin;
+package com.redstoner.faucet;
 
 import com.nemez.cmdmgr.Command;
-import main.java.com.redstoner.misc.mysql.MysqlHandler;
-import main.java.com.redstoner.modules.Module;
-
+import com.redstoner.annotations.Version;
+import com.redstoner.misc.mysql.MysqlHandler;
+import com.redstoner.modules.Module;
 import net.nemez.chatapi.ChatAPI;
+import org.bukkit.plugin.java.JavaPlugin;
+
+import java.util.HashMap;
 
 /** Main class. Duh.
  * 
diff --git a/src/main/java/com/redstoner/misc/BroadcastFilter.java b/src/main/java/com/redstoner/misc/BroadcastFilter.java
index 124077e..b5b887c 100644
--- a/src/main/java/com/redstoner/misc/BroadcastFilter.java
+++ b/src/main/java/com/redstoner/misc/BroadcastFilter.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 import org.bukkit.command.CommandSender;
 
diff --git a/src/main/java/com/redstoner/misc/CommandHolder.java b/src/main/java/com/redstoner/misc/CommandHolder.java
index 95ba814..4b3511f 100644
--- a/src/main/java/com/redstoner/misc/CommandHolder.java
+++ b/src/main/java/com/redstoner/misc/CommandHolder.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 /** @author Pepich */
 public enum CommandHolder
diff --git a/src/main/java/com/redstoner/misc/JsonManager.java b/src/main/java/com/redstoner/misc/JsonManager.java
index e350505..3152465 100644
--- a/src/main/java/com/redstoner/misc/JsonManager.java
+++ b/src/main/java/com/redstoner/misc/JsonManager.java
@@ -1,15 +1,15 @@
-package main.java.com.redstoner.misc;
-
-import java.io.File;
-import java.io.FileReader;
-import java.io.FileWriter;
-import java.io.IOException;
+package com.redstoner.misc;
 
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+
 /** This class provides simple JSON handling, like storing and loading from and to files.
  * 
  * @author Pepich */
diff --git a/src/main/java/com/redstoner/misc/Utils.java b/src/main/java/com/redstoner/misc/Utils.java
index 496eea5..352dbce 100644
--- a/src/main/java/com/redstoner/misc/Utils.java
+++ b/src/main/java/com/redstoner/misc/Utils.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc;
+package com.redstoner.misc;
 
 import java.text.SimpleDateFormat;
 import java.util.Arrays;
diff --git a/src/main/java/com/redstoner/misc/mysql/Config.java b/src/main/java/com/redstoner/misc/mysql/Config.java
index c4a28fa..c081aa1 100644
--- a/src/main/java/com/redstoner/misc/mysql/Config.java
+++ b/src/main/java/com/redstoner/misc/mysql/Config.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
 
 import java.io.File;
 import java.io.FileReader;
@@ -11,13 +11,13 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
-import main.java.com.redstoner.faucet.Faucet;
+import com.redstoner.faucet.Faucet;
 import org.json.simple.JSONArray;
 import org.json.simple.JSONObject;
 import org.json.simple.parser.JSONParser;
 import org.json.simple.parser.ParseException;
 
-import main.java.com.redstoner.exceptions.NonSaveableConfigException;
+import com.redstoner.exceptions.NonSaveableConfigException;
 
 public class Config
 {
diff --git a/src/main/java/com/redstoner/misc/mysql/JSONManager.java b/src/main/java/com/redstoner/misc/mysql/JSONManager.java
index 1e95bed..fb9b010 100644
--- a/src/main/java/com/redstoner/misc/mysql/JSONManager.java
+++ b/src/main/java/com/redstoner/misc/mysql/JSONManager.java
@@ -1,4 +1,10 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
+
+import com.redstoner.faucet.Faucet;
+import org.json.simple.JSONArray;
+import org.json.simple.JSONObject;
+import org.json.simple.parser.JSONParser;
+import org.json.simple.parser.ParseException;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -13,12 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import main.java.com.redstoner.faucet.Faucet;
-import org.json.simple.JSONArray;
-import org.json.simple.JSONObject;
-import org.json.simple.parser.JSONParser;
-import org.json.simple.parser.ParseException;
-
 public class JSONManager
 {
 	public static Map<Serializable, Serializable> getConfiguration(String fileName)
diff --git a/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java
index 8a19e51..c21b88e 100644
--- a/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java
+++ b/src/main/java/com/redstoner/misc/mysql/MysqlHandler.java
@@ -1,4 +1,10 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
+
+import com.redstoner.faucet.Faucet;
+import com.redstoner.misc.mysql.elements.MysqlDatabase;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.json.simple.parser.ParseException;
 
 import java.io.File;
 import java.io.IOException;
@@ -13,13 +19,6 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import main.java.com.redstoner.faucet.Faucet;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.json.simple.parser.ParseException;
-
-import main.java.com.redstoner.misc.mysql.elements.MysqlDatabase;
-
 public class MysqlHandler
 {
 	public static MysqlHandler INSTANCE;
diff --git a/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java
index 2fed425..f89a08a 100644
--- a/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java
+++ b/src/main/java/com/redstoner/misc/mysql/MysqlQueryHandler.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql;
+package com.redstoner.misc.mysql;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java
index e9b1c13..45cb33c 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/ConstraintOperator.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 public enum ConstraintOperator {
 	LESS_THAN, GREATER_THAN, EQUAL, NOT_EQUAL, LESS_THAN_OR_EQUAL, GREATER_THAN_OR_EQUAL;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java
index 0a5ea92..d651344 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlConstraint.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 public class MysqlConstraint {
 	private String fieldName, value;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java
index d9a1225..91c0fe4 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlDatabase.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
@@ -7,7 +7,7 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import main.java.com.redstoner.misc.mysql.MysqlQueryHandler;
+import com.redstoner.misc.mysql.MysqlQueryHandler;
 
 public class MysqlDatabase {
 	private Connection connection;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java
index 03311bb..61cba2e 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlField.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class MysqlField {
 	private String name;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java
index 494c54b..6db0769 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlResult.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
diff --git a/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java
index cb7517f..e2567d0 100644
--- a/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java
+++ b/src/main/java/com/redstoner/misc/mysql/elements/MysqlTable.java
@@ -1,4 +1,6 @@
-package main.java.com.redstoner.misc.mysql.elements;
+package com.redstoner.misc.mysql.elements;
+
+import com.redstoner.misc.mysql.MysqlQueryHandler;
 
 import java.sql.DatabaseMetaData;
 import java.sql.ResultSet;
@@ -6,8 +8,6 @@ import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import main.java.com.redstoner.misc.mysql.MysqlQueryHandler;
-
 public class MysqlTable
 {
 	private MysqlDatabase database;
diff --git a/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java
index 52583f0..6c2504e 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/MysqlType.java
@@ -1,29 +1,29 @@
-package main.java.com.redstoner.misc.mysql.types;
+package com.redstoner.misc.mysql.types;
 
-import main.java.com.redstoner.misc.mysql.types.date.Date;
-import main.java.com.redstoner.misc.mysql.types.date.DateTime;
-import main.java.com.redstoner.misc.mysql.types.date.Time;
-import main.java.com.redstoner.misc.mysql.types.date.TimeStamp;
-import main.java.com.redstoner.misc.mysql.types.date.Year;
-import main.java.com.redstoner.misc.mysql.types.number.Double;
-import main.java.com.redstoner.misc.mysql.types.number.Float;
-import main.java.com.redstoner.misc.mysql.types.number.Int;
-import main.java.com.redstoner.misc.mysql.types.number.MediumInt;
-import main.java.com.redstoner.misc.mysql.types.number.SmallInt;
-import main.java.com.redstoner.misc.mysql.types.text.Blob;
-import main.java.com.redstoner.misc.mysql.types.text.Char;
-import main.java.com.redstoner.misc.mysql.types.text.Enum;
-import main.java.com.redstoner.misc.mysql.types.text.LongBlob;
-import main.java.com.redstoner.misc.mysql.types.text.LongText;
-import main.java.com.redstoner.misc.mysql.types.text.MediumBlob;
-import main.java.com.redstoner.misc.mysql.types.text.MediumText;
-import main.java.com.redstoner.misc.mysql.types.text.Set;
-import main.java.com.redstoner.misc.mysql.types.text.TinyText;
-import main.java.com.redstoner.misc.mysql.types.text.VarChar;
-import main.java.com.redstoner.misc.mysql.types.number.BigInt;
-import main.java.com.redstoner.misc.mysql.types.number.Decimal;
-import main.java.com.redstoner.misc.mysql.types.number.TinyInt;
-import main.java.com.redstoner.misc.mysql.types.text.Text;
+import com.redstoner.misc.mysql.types.date.Date;
+import com.redstoner.misc.mysql.types.date.DateTime;
+import com.redstoner.misc.mysql.types.date.Time;
+import com.redstoner.misc.mysql.types.date.TimeStamp;
+import com.redstoner.misc.mysql.types.date.Year;
+import com.redstoner.misc.mysql.types.number.Double;
+import com.redstoner.misc.mysql.types.number.Float;
+import com.redstoner.misc.mysql.types.number.Int;
+import com.redstoner.misc.mysql.types.number.MediumInt;
+import com.redstoner.misc.mysql.types.number.SmallInt;
+import com.redstoner.misc.mysql.types.text.Blob;
+import com.redstoner.misc.mysql.types.text.Char;
+import com.redstoner.misc.mysql.types.text.Enum;
+import com.redstoner.misc.mysql.types.text.LongBlob;
+import com.redstoner.misc.mysql.types.text.LongText;
+import com.redstoner.misc.mysql.types.text.MediumBlob;
+import com.redstoner.misc.mysql.types.text.MediumText;
+import com.redstoner.misc.mysql.types.text.Set;
+import com.redstoner.misc.mysql.types.text.TinyText;
+import com.redstoner.misc.mysql.types.text.VarChar;
+import com.redstoner.misc.mysql.types.number.BigInt;
+import com.redstoner.misc.mysql.types.number.Decimal;
+import com.redstoner.misc.mysql.types.number.TinyInt;
+import com.redstoner.misc.mysql.types.text.Text;
 
 public abstract class MysqlType
 {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Date.java b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java
index 03361d6..9943333 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/date/Date.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Date.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Date extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java
index c8eeae8..b4d9623 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/DateTime.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class DateTime extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Time.java b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java
index 49393c8..4ead72c 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/date/Time.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Time.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Time extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java
index d703e48..56205af 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/TimeStamp.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class TimeStamp extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/date/Year.java b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java
index a64df68..4c2ce1a 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/date/Year.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/date/Year.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.date;
+package com.redstoner.misc.mysql.types.date;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Year extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java
index 32dcca0..71086fd 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/BigInt.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class BigInt extends Int {
 	public BigInt(int maxSize) {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java
index 5a5f3de..97d960e 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Decimal.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Decimal extends MysqlType
 {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Double.java b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java
index 74ba83d..b4b1dda 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/Double.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Double.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Double extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Float.java b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java
index 76acb40..ea3047e 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/Float.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Float.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Float extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/Int.java b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java
index 386d701..4256f7b 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/Int.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/Int.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Int extends MysqlType {
 	private int maxSize;
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java
index a771733..fbcb0f4 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/MediumInt.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class MediumInt extends Int {
 	public MediumInt(int maxSize) {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java
index e2c4e59..01bf97d 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/SmallInt.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class SmallInt extends Int {
 	public SmallInt(int maxSize) {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java
index e54b149..63ad700 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/number/TinyInt.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.number;
+package com.redstoner.misc.mysql.types.number;
 
 public class TinyInt extends Int {
 	public TinyInt(int maxSize) {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java
index e539373..d56ee45 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Blob.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Blob extends MysqlType {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Char.java b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java
index fcb83a2..ece068c 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/Char.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Char.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Char extends MysqlType {
 	private int size;
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java
index 2fae275..e68476d 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Enum.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Enum extends MysqlType {
 	private String[] possibleValues;
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java
index 1a2c575..802caed 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongBlob.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class LongBlob extends Blob {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java
index 95788ef..5149ed2 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/LongText.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class LongText extends Text {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java
index dba57e2..6ae25a7 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumBlob.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class MediumBlob extends Blob {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java
index baae22f..a0f6525 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/MediumText.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class MediumText extends Text {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Set.java b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java
index c3ff287..4e12ce6 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/Set.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Set.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Set extends MysqlType {
 	private String[] possibleValues;
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/Text.java b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java
index adcc951..efb8568 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/Text.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/Text.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class Text extends MysqlType
 {
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java
index 4f11d81..e78160c 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/TinyText.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
 public class TinyText extends Text {
 	@Override
diff --git a/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java
index 1daf42e..cb28ad1 100644
--- a/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java
+++ b/src/main/java/com/redstoner/misc/mysql/types/text/VarChar.java
@@ -1,6 +1,6 @@
-package main.java.com.redstoner.misc.mysql.types.text;
+package com.redstoner.misc.mysql.types.text;
 
-import main.java.com.redstoner.misc.mysql.types.MysqlType;
+import com.redstoner.misc.mysql.types.MysqlType;
 
 public class VarChar extends MysqlType {
 	private int maxSize;
diff --git a/src/main/java/com/redstoner/modules/Module.java b/src/main/java/com/redstoner/modules/Module.java
index 39bdc61..2a0dcb0 100644
--- a/src/main/java/com/redstoner/modules/Module.java
+++ b/src/main/java/com/redstoner/modules/Module.java
@@ -1,7 +1,7 @@
-package main.java.com.redstoner.modules;
+package com.redstoner.modules;
 
-import main.java.com.redstoner.annotations.Version;
-import main.java.com.redstoner.faucet.Faucet;
+import com.redstoner.annotations.Version;
+import com.redstoner.faucet.Faucet;
 
 /** Interface for the Module class. Modules must always have an empty constructor to be invoked by the ModuleLoader.
  * 
diff --git a/src/main/java/com/redstoner/modules/ModuleLogger.java b/src/main/java/com/redstoner/modules/ModuleLogger.java
index 0a627b7..c32f441 100644
--- a/src/main/java/com/redstoner/modules/ModuleLogger.java
+++ b/src/main/java/com/redstoner/modules/ModuleLogger.java
@@ -1,4 +1,4 @@
-package main.java.com.redstoner.modules;
+package com.redstoner.modules;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;