diff --git a/Plugin Cubot/pom.xml b/Plugin Cubot/pom.xml
index 0596f2a..ad14040 100644
--- a/Plugin Cubot/pom.xml	
+++ b/Plugin Cubot/pom.xml	
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.simon987.plugincubot</groupId>
-    <artifactId>Plugin Cubot</artifactId>
+    <artifactId>plugin-cubot</artifactId>
     <version>1.2a</version>
 
     <build>
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>net.simon987.server</groupId>
-            <artifactId>Server</artifactId>
+            <artifactId>server</artifactId>
             <version>1.2a</version>
         </dependency>
 
diff --git a/Plugin Cubot/plugin.properties b/Plugin Cubot/src/main/resources/plugin.properties
similarity index 100%
rename from Plugin Cubot/plugin.properties
rename to Plugin Cubot/src/main/resources/plugin.properties
diff --git a/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java b/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java
deleted file mode 100644
index 98b60fb..0000000
--- a/Plugin Cubot/src/net/simon987/cubotplugin/CubotAction.java	
+++ /dev/null
@@ -1,10 +0,0 @@
-package net.simon987.cubotplugin;
-
-public enum CubotAction {
-    IDLE,
-    DIGGING,
-    WALKING,
-    WITHDRAWING,
-    DEPOSITING
-
-}
diff --git a/Plugin Misc HW/pom.xml b/Plugin Misc HW/pom.xml
index b120ce5..ff78dff 100644
--- a/Plugin Misc HW/pom.xml	
+++ b/Plugin Misc HW/pom.xml	
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.simon987.pluginmischw</groupId>
-    <artifactId>Plugin Misc HW</artifactId>
+    <artifactId>plugin-misc-hw</artifactId>
     <version>1.2a</version>
 
     <build>
@@ -24,7 +24,7 @@
     <dependencies>
         <dependency>
             <groupId>net.simon987.server</groupId>
-            <artifactId>Server</artifactId>
+            <artifactId>server</artifactId>
             <version>1.2a</version>
         </dependency>
 
diff --git a/Plugin Misc HW/plugin.properties b/Plugin Misc HW/src/main/resources/plugin.properties
similarity index 100%
rename from Plugin Misc HW/plugin.properties
rename to Plugin Misc HW/src/main/resources/plugin.properties
diff --git a/Plugin NPC/pom.xml b/Plugin NPC/pom.xml
index 857ea6f..c97766a 100644
--- a/Plugin NPC/pom.xml	
+++ b/Plugin NPC/pom.xml	
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.simon987.pluginnpc</groupId>
-    <artifactId>Plugin NPC</artifactId>
+    <artifactId>plugin-npc</artifactId>
     <version>1.2a</version>
     <build>
         <plugins>
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>net.simon987.server</groupId>
-            <artifactId>Server</artifactId>
+            <artifactId>server</artifactId>
             <version>1.2a</version>
         </dependency>
     </dependencies>
diff --git a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java b/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java
index 801d24b..c3c94fb 100644
--- a/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java	
+++ b/Plugin NPC/src/main/java/net/simon987/npcplugin/NpcPlugin.java	
@@ -20,7 +20,7 @@ public class NpcPlugin extends ServerPlugin implements GameObjectDeserializer {
 
     @Override
     public GameObject deserializeObject(JSONObject object) {
-        ;
+
         int objType = (int) (long) object.get("type");
 
         if (objType == HarvesterNPC.ID) {
diff --git a/Plugin Plant/pom.xml b/Plugin Plant/pom.xml
index cae6177..9570125 100644
--- a/Plugin Plant/pom.xml	
+++ b/Plugin Plant/pom.xml	
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.simon987.pluginplant</groupId>
-    <artifactId>Plugin Plant</artifactId>
+    <artifactId>plugin-plant</artifactId>
     <version>1.2a</version>
     <build>
         <plugins>
@@ -29,7 +29,7 @@
 
         <dependency>
             <groupId>net.simon987.server</groupId>
-            <artifactId>Server</artifactId>
+            <artifactId>server</artifactId>
             <version>1.2a</version>
         </dependency>
     </dependencies>
diff --git a/Plugin Plant/plugin.properties b/Plugin Plant/src/main/resources/plugin.properties
similarity index 100%
rename from Plugin Plant/plugin.properties
rename to Plugin Plant/src/main/resources/plugin.properties
diff --git a/Server/pom.xml b/Server/pom.xml
index 5698a08..e6d70d0 100644
--- a/Server/pom.xml
+++ b/Server/pom.xml
@@ -5,7 +5,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>net.simon987.server</groupId>
-    <artifactId>Server</artifactId>
+    <artifactId>server</artifactId>
     <version>1.2a</version>
 
     <build>