diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..24acabf
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+*.iml
+.idea
+out
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 26d3352..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
diff --git a/.idea/artifacts/MeinKraft_jar.xml b/.idea/artifacts/MeinKraft_jar.xml
deleted file mode 100644
index 3fade28..0000000
--- a/.idea/artifacts/MeinKraft_jar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<component name="ArtifactManager">
-  <artifact type="jar" name="MeinKraft:jar">
-    <output-path>$PROJECT_DIR$/out/artifacts/MeinKraft_jar</output-path>
-    <root id="archive" name="MeinKraft.jar">
-      <element id="module-output" name="MeinKraft" />
-      <element id="extracted-dir" path="$USER_HOME$/Documents/buildtools/Spigot/Spigot-API/target/spigot-api-1.16.3-R0.1-SNAPSHOT-shaded.jar" path-in-jar="/" />
-    </root>
-  </artifact>
-</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index d5d79e0..0000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/out" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 93f21aa..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/MeinKraft.iml" filepath="$PROJECT_DIR$/MeinKraft.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml
deleted file mode 100644
index e96534f..0000000
--- a/.idea/uiDesigner.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Palette2">
-    <group name="Swing">
-      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
-      </item>
-      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
-        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
-        <initial-values>
-          <property name="text" value="Button" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="RadioButton" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="CheckBox" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
-        <initial-values>
-          <property name="text" value="Label" />
-        </initial-values>
-      </item>
-      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
-          <preferred-size width="150" height="-1" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
-          <preferred-size width="150" height="50" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
-          <preferred-size width="200" height="200" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
-      </item>
-      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
-      </item>
-      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
-          <preferred-size width="-1" height="20" />
-        </default-constraints>
-      </item>
-      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
-        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
-      </item>
-      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
-        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
-      </item>
-    </group>
-  </component>
-</project>
\ No newline at end of file
diff --git a/MeinKraft.iml b/MeinKraft.iml
deleted file mode 100644
index 0be42a0..0000000
--- a/MeinKraft.iml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
-    <exclude-output />
-    <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/Documents/buildtools/Spigot/Spigot-API/target/spigot-api-1.16.3-R0.1-SNAPSHOT-shaded.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES />
-      </library>
-    </orderEntry>
-    <orderEntry type="module-library">
-      <library>
-        <CLASSES>
-          <root url="jar://$USER_HOME$/Documents/buildtools/Spigot/Spigot-Server/target/spigot-1.16.3-R0.1-SNAPSHOT.jar!/" />
-        </CLASSES>
-        <JAVADOC />
-        <SOURCES>
-          <root url="jar://$USER_HOME$/Documents/buildtools/Spigot/Spigot-Server/target/spigot-1.16.3-R0.1-SNAPSHOT.jar!/" />
-        </SOURCES>
-      </library>
-    </orderEntry>
-  </component>
-</module>
\ No newline at end of file
diff --git a/out/artifacts/MeinKraft_jar/MeinKraft.jar b/out/artifacts/MeinKraft_jar/MeinKraft.jar
deleted file mode 100644
index a1fc6ab..0000000
Binary files a/out/artifacts/MeinKraft_jar/MeinKraft.jar and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/Main.class b/out/production/MeinKraft/de/leafbla/meinkraft/Main.class
deleted file mode 100644
index 2193168..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/Main.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener$1.class b/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener$1.class
deleted file mode 100644
index 5b7eb04..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener$1.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener.class b/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener.class
deleted file mode 100644
index fdbb703..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/NinjaListener.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/ThiefListener.class b/out/production/MeinKraft/de/leafbla/meinkraft/ThiefListener.class
deleted file mode 100644
index d1d6593..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/ThiefListener.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/PlayerRole.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/PlayerRole.class
deleted file mode 100644
index c32ef26..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/PlayerRole.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/Role.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/Role.class
deleted file mode 100644
index 9e99bfa..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/Role.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleCommand.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleCommand.class
deleted file mode 100644
index b5a40d8..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleCommand.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleListener.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleListener.class
deleted file mode 100644
index 3c8862b..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleListener.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleManager.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleManager.class
deleted file mode 100644
index 9d7b9b8..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/RoleManager.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$1.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$1.class
deleted file mode 100644
index 9461a4b..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$1.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$2.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$2.class
deleted file mode 100644
index 72034c6..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener$2.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener.class
deleted file mode 100644
index d345960..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/bomber/BomberListener.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterListener.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterListener.class
deleted file mode 100644
index be90e3d..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterListener.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1$1.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1$1.class
deleted file mode 100644
index ce03e98..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1$1.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1.class
deleted file mode 100644
index 383361a..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1$1.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1.class
deleted file mode 100644
index 279c4db..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole$1.class and /dev/null differ
diff --git a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole.class b/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole.class
deleted file mode 100644
index 72d73e7..0000000
Binary files a/out/production/MeinKraft/de/leafbla/meinkraft/roleplay/fighter/FighterRole.class and /dev/null differ
diff --git a/out/production/MeinKraft/plugin.yml b/out/production/MeinKraft/plugin.yml
deleted file mode 100644
index d320c54..0000000
--- a/out/production/MeinKraft/plugin.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-name: MeinKraft
-version: 0.1
-author: thamma
-main: de.leafbla.meinkraft.Main
-website: leafbla.de
-api-version: 1.16
-commands:
-  role:
-    description: This is a demo command.
-    usage: /role {[player] [class]} {list}
\ No newline at end of file
diff --git a/src/de/leafbla/meinkraft/Main.java b/src/de/leafbla/meinkraft/Main.java
index 7b9e476..b472db8 100644
--- a/src/de/leafbla/meinkraft/Main.java
+++ b/src/de/leafbla/meinkraft/Main.java
@@ -4,6 +4,8 @@ import de.leafbla.meinkraft.roleplay.RoleCommand;
 import de.leafbla.meinkraft.roleplay.RoleManager;
 import de.leafbla.meinkraft.roleplay.bomber.BomberListener;
 import de.leafbla.meinkraft.roleplay.fighter.FighterListener;
+import de.leafbla.meinkraft.roleplay.ninja.NinjaListener;
+import de.leafbla.meinkraft.roleplay.thief.ThiefListener;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.util.logging.Level;
@@ -26,8 +28,7 @@ public class Main extends JavaPlugin {
         getServer().getPluginManager().registerEvents(new NinjaListener(this), this);
         getServer().getPluginManager().registerEvents(new BomberListener(this), this);
         getServer().getPluginManager().registerEvents(new FighterListener(this), this);
-
-        // This will throw a NullPointerException if you don't have the command defined in your plugin.yml file!
+        
         this.getCommand("role").setExecutor(new RoleCommand(this.roleManager));
     }
 }
diff --git a/src/de/leafbla/meinkraft/NinjaListener.java b/src/de/leafbla/meinkraft/roleplay/ninja/NinjaListener.java
similarity index 98%
rename from src/de/leafbla/meinkraft/NinjaListener.java
rename to src/de/leafbla/meinkraft/roleplay/ninja/NinjaListener.java
index 94132b9..38843ee 100644
--- a/src/de/leafbla/meinkraft/NinjaListener.java
+++ b/src/de/leafbla/meinkraft/roleplay/ninja/NinjaListener.java
@@ -1,5 +1,6 @@
-package de.leafbla.meinkraft;
+package de.leafbla.meinkraft.roleplay.ninja;
 
+import de.leafbla.meinkraft.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.NamespacedKey;
diff --git a/src/de/leafbla/meinkraft/ThiefListener.java b/src/de/leafbla/meinkraft/roleplay/thief/ThiefListener.java
similarity index 96%
rename from src/de/leafbla/meinkraft/ThiefListener.java
rename to src/de/leafbla/meinkraft/roleplay/thief/ThiefListener.java
index f7bff14..7a4cd5e 100644
--- a/src/de/leafbla/meinkraft/ThiefListener.java
+++ b/src/de/leafbla/meinkraft/roleplay/thief/ThiefListener.java
@@ -1,5 +1,6 @@
-package de.leafbla.meinkraft;
+package de.leafbla.meinkraft.roleplay.thief;
 
+import de.leafbla.meinkraft.Main;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.Entity;