diff --git a/.gitignore b/.gitignore
index ca4057b..00741cb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,2 @@
 .DS_Store
-.idea/
-Slapper/.DS_Store
-Slapper/src/.DS_Store
-Slapper/src/slapper/.DS_Store
-Slapper/src/slapper/events/.DS_Store
-Slapper/src/slapper/entities/.DS_Store
-Slapper/src/slapper/entities/other/.DS_Store
\ No newline at end of file
+.idea/
\ No newline at end of file
diff --git a/Slapper/plugin.yml b/plugin.yml
similarity index 100%
rename from Slapper/plugin.yml
rename to plugin.yml
diff --git a/Slapper/src/slapper/Main.php b/src/slapper/Main.php
similarity index 100%
rename from Slapper/src/slapper/Main.php
rename to src/slapper/Main.php
diff --git a/Slapper/src/slapper/entities/SlapperBat.php b/src/slapper/entities/SlapperBat.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperBat.php
rename to src/slapper/entities/SlapperBat.php
diff --git a/Slapper/src/slapper/entities/SlapperBlaze.php b/src/slapper/entities/SlapperBlaze.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperBlaze.php
rename to src/slapper/entities/SlapperBlaze.php
diff --git a/Slapper/src/slapper/entities/SlapperCaveSpider.php b/src/slapper/entities/SlapperCaveSpider.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperCaveSpider.php
rename to src/slapper/entities/SlapperCaveSpider.php
diff --git a/Slapper/src/slapper/entities/SlapperChicken.php b/src/slapper/entities/SlapperChicken.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperChicken.php
rename to src/slapper/entities/SlapperChicken.php
diff --git a/Slapper/src/slapper/entities/SlapperCow.php b/src/slapper/entities/SlapperCow.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperCow.php
rename to src/slapper/entities/SlapperCow.php
diff --git a/Slapper/src/slapper/entities/SlapperCreeper.php b/src/slapper/entities/SlapperCreeper.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperCreeper.php
rename to src/slapper/entities/SlapperCreeper.php
diff --git a/Slapper/src/slapper/entities/SlapperDonkey.php b/src/slapper/entities/SlapperDonkey.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperDonkey.php
rename to src/slapper/entities/SlapperDonkey.php
diff --git a/Slapper/src/slapper/entities/SlapperEnderman.php b/src/slapper/entities/SlapperEnderman.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperEnderman.php
rename to src/slapper/entities/SlapperEnderman.php
diff --git a/Slapper/src/slapper/entities/SlapperEntity.php b/src/slapper/entities/SlapperEntity.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperEntity.php
rename to src/slapper/entities/SlapperEntity.php
diff --git a/Slapper/src/slapper/entities/SlapperGhast.php b/src/slapper/entities/SlapperGhast.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperGhast.php
rename to src/slapper/entities/SlapperGhast.php
diff --git a/Slapper/src/slapper/entities/SlapperHorse.php b/src/slapper/entities/SlapperHorse.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperHorse.php
rename to src/slapper/entities/SlapperHorse.php
diff --git a/Slapper/src/slapper/entities/SlapperHuman.php b/src/slapper/entities/SlapperHuman.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperHuman.php
rename to src/slapper/entities/SlapperHuman.php
diff --git a/Slapper/src/slapper/entities/SlapperHusk.php b/src/slapper/entities/SlapperHusk.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperHusk.php
rename to src/slapper/entities/SlapperHusk.php
diff --git a/Slapper/src/slapper/entities/SlapperIronGolem.php b/src/slapper/entities/SlapperIronGolem.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperIronGolem.php
rename to src/slapper/entities/SlapperIronGolem.php
diff --git a/Slapper/src/slapper/entities/SlapperLavaSlime.php b/src/slapper/entities/SlapperLavaSlime.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperLavaSlime.php
rename to src/slapper/entities/SlapperLavaSlime.php
diff --git a/Slapper/src/slapper/entities/SlapperMule.php b/src/slapper/entities/SlapperMule.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperMule.php
rename to src/slapper/entities/SlapperMule.php
diff --git a/Slapper/src/slapper/entities/SlapperMushroomCow.php b/src/slapper/entities/SlapperMushroomCow.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperMushroomCow.php
rename to src/slapper/entities/SlapperMushroomCow.php
diff --git a/Slapper/src/slapper/entities/SlapperOcelot.php b/src/slapper/entities/SlapperOcelot.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperOcelot.php
rename to src/slapper/entities/SlapperOcelot.php
diff --git a/Slapper/src/slapper/entities/SlapperPig.php b/src/slapper/entities/SlapperPig.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperPig.php
rename to src/slapper/entities/SlapperPig.php
diff --git a/Slapper/src/slapper/entities/SlapperPigZombie.php b/src/slapper/entities/SlapperPigZombie.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperPigZombie.php
rename to src/slapper/entities/SlapperPigZombie.php
diff --git a/Slapper/src/slapper/entities/SlapperRabbit.php b/src/slapper/entities/SlapperRabbit.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperRabbit.php
rename to src/slapper/entities/SlapperRabbit.php
diff --git a/Slapper/src/slapper/entities/SlapperSheep.php b/src/slapper/entities/SlapperSheep.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSheep.php
rename to src/slapper/entities/SlapperSheep.php
diff --git a/Slapper/src/slapper/entities/SlapperSilverfish.php b/src/slapper/entities/SlapperSilverfish.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSilverfish.php
rename to src/slapper/entities/SlapperSilverfish.php
diff --git a/Slapper/src/slapper/entities/SlapperSkeleton.php b/src/slapper/entities/SlapperSkeleton.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSkeleton.php
rename to src/slapper/entities/SlapperSkeleton.php
diff --git a/Slapper/src/slapper/entities/SlapperSkeletonHorse.php b/src/slapper/entities/SlapperSkeletonHorse.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSkeletonHorse.php
rename to src/slapper/entities/SlapperSkeletonHorse.php
diff --git a/Slapper/src/slapper/entities/SlapperSlime.php b/src/slapper/entities/SlapperSlime.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSlime.php
rename to src/slapper/entities/SlapperSlime.php
diff --git a/Slapper/src/slapper/entities/SlapperSnowman.php b/src/slapper/entities/SlapperSnowman.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSnowman.php
rename to src/slapper/entities/SlapperSnowman.php
diff --git a/Slapper/src/slapper/entities/SlapperSpider.php b/src/slapper/entities/SlapperSpider.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSpider.php
rename to src/slapper/entities/SlapperSpider.php
diff --git a/Slapper/src/slapper/entities/SlapperSquid.php b/src/slapper/entities/SlapperSquid.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperSquid.php
rename to src/slapper/entities/SlapperSquid.php
diff --git a/Slapper/src/slapper/entities/SlapperStray.php b/src/slapper/entities/SlapperStray.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperStray.php
rename to src/slapper/entities/SlapperStray.php
diff --git a/Slapper/src/slapper/entities/SlapperVillager.php b/src/slapper/entities/SlapperVillager.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperVillager.php
rename to src/slapper/entities/SlapperVillager.php
diff --git a/Slapper/src/slapper/entities/SlapperWitch.php b/src/slapper/entities/SlapperWitch.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperWitch.php
rename to src/slapper/entities/SlapperWitch.php
diff --git a/Slapper/src/slapper/entities/SlapperWitherSkeleton.php b/src/slapper/entities/SlapperWitherSkeleton.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperWitherSkeleton.php
rename to src/slapper/entities/SlapperWitherSkeleton.php
diff --git a/Slapper/src/slapper/entities/SlapperWolf.php b/src/slapper/entities/SlapperWolf.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperWolf.php
rename to src/slapper/entities/SlapperWolf.php
diff --git a/Slapper/src/slapper/entities/SlapperZombie.php b/src/slapper/entities/SlapperZombie.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperZombie.php
rename to src/slapper/entities/SlapperZombie.php
diff --git a/Slapper/src/slapper/entities/SlapperZombieHorse.php b/src/slapper/entities/SlapperZombieHorse.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperZombieHorse.php
rename to src/slapper/entities/SlapperZombieHorse.php
diff --git a/Slapper/src/slapper/entities/SlapperZombieVillager.php b/src/slapper/entities/SlapperZombieVillager.php
similarity index 100%
rename from Slapper/src/slapper/entities/SlapperZombieVillager.php
rename to src/slapper/entities/SlapperZombieVillager.php
diff --git a/Slapper/src/slapper/entities/other/SlapperBoat.php b/src/slapper/entities/other/SlapperBoat.php
similarity index 100%
rename from Slapper/src/slapper/entities/other/SlapperBoat.php
rename to src/slapper/entities/other/SlapperBoat.php
diff --git a/Slapper/src/slapper/entities/other/SlapperFallingSand.php b/src/slapper/entities/other/SlapperFallingSand.php
similarity index 100%
rename from Slapper/src/slapper/entities/other/SlapperFallingSand.php
rename to src/slapper/entities/other/SlapperFallingSand.php
diff --git a/Slapper/src/slapper/entities/other/SlapperMinecart.php b/src/slapper/entities/other/SlapperMinecart.php
similarity index 100%
rename from Slapper/src/slapper/entities/other/SlapperMinecart.php
rename to src/slapper/entities/other/SlapperMinecart.php
diff --git a/Slapper/src/slapper/entities/other/SlapperPrimedTNT.php b/src/slapper/entities/other/SlapperPrimedTNT.php
similarity index 100%
rename from Slapper/src/slapper/entities/other/SlapperPrimedTNT.php
rename to src/slapper/entities/other/SlapperPrimedTNT.php
diff --git a/Slapper/src/slapper/events/SlapperCreationEvent.php b/src/slapper/events/SlapperCreationEvent.php
similarity index 100%
rename from Slapper/src/slapper/events/SlapperCreationEvent.php
rename to src/slapper/events/SlapperCreationEvent.php
diff --git a/Slapper/src/slapper/events/SlapperDeletionEvent.php b/src/slapper/events/SlapperDeletionEvent.php
similarity index 100%
rename from Slapper/src/slapper/events/SlapperDeletionEvent.php
rename to src/slapper/events/SlapperDeletionEvent.php
diff --git a/Slapper/src/slapper/events/SlapperHitEvent.php b/src/slapper/events/SlapperHitEvent.php
similarity index 100%
rename from Slapper/src/slapper/events/SlapperHitEvent.php
rename to src/slapper/events/SlapperHitEvent.php