diff --git a/src/de/steamwar/lobby/listener/ParticleListener.java b/src/de/steamwar/lobby/listener/ParticleListener.java
index ea3b5f0..3236610 100644
--- a/src/de/steamwar/lobby/listener/ParticleListener.java
+++ b/src/de/steamwar/lobby/listener/ParticleListener.java
@@ -22,7 +22,7 @@ package de.steamwar.lobby.listener;
 import de.steamwar.lobby.LobbySystem;
 import de.steamwar.lobby.particle.BaseParticle;
 import de.steamwar.lobby.particle.ParticleData;
-import de.steamwar.lobby.particle.ParticleEnum;
+import de.steamwar.lobby.particle.particles.ParticleEnum;
 import de.steamwar.lobby.particle.ParticleInventory;
 import de.steamwar.lobby.util.LobbyPlayer;
 import org.bukkit.Bukkit;
diff --git a/src/de/steamwar/lobby/particle/ParticleInventory.java b/src/de/steamwar/lobby/particle/ParticleInventory.java
index fa13171..2db6cc1 100644
--- a/src/de/steamwar/lobby/particle/ParticleInventory.java
+++ b/src/de/steamwar/lobby/particle/ParticleInventory.java
@@ -23,6 +23,7 @@ import de.steamwar.inventory.SWInventory;
 import de.steamwar.inventory.SWItem;
 import de.steamwar.inventory.SWListInv;
 import de.steamwar.lobby.LobbySystem;
+import de.steamwar.lobby.particle.particles.*;
 import de.steamwar.lobby.util.LobbyPlayer;
 import de.steamwar.sql.Event;
 import de.steamwar.sql.SteamwarUser;
@@ -30,7 +31,6 @@ import de.steamwar.sql.TeamTeilnahme;
 import de.steamwar.sql.UserGroup;
 import org.bukkit.Material;
 import org.bukkit.entity.Player;
-import sun.util.resources.ext.CalendarData_da;
 
 import java.util.ArrayList;
 import java.util.HashSet;
diff --git a/src/de/steamwar/lobby/particle/EventParticleParticipation.java b/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
similarity index 90%
rename from src/de/steamwar/lobby/particle/EventParticleParticipation.java
rename to src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
index bf6ae48..e3ff5ce 100644
--- a/src/de/steamwar/lobby/particle/EventParticleParticipation.java
+++ b/src/de/steamwar/lobby/particle/particles/EventParticleParticipation.java
@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
 
+import de.steamwar.lobby.particle.BaseParticle;
+import de.steamwar.lobby.particle.ParticleItem;
+import de.steamwar.lobby.particle.SimpleParticle;
 import de.steamwar.lobby.particle.decorator.CircleParticle;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/de/steamwar/lobby/particle/EventParticlePlacement.java b/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
similarity index 92%
rename from src/de/steamwar/lobby/particle/EventParticlePlacement.java
rename to src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
index 5480151..8d5139b 100644
--- a/src/de/steamwar/lobby/particle/EventParticlePlacement.java
+++ b/src/de/steamwar/lobby/particle/particles/EventParticlePlacement.java
@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
 
+import de.steamwar.lobby.particle.BaseParticle;
+import de.steamwar.lobby.particle.ParticleItem;
+import de.steamwar.lobby.particle.SimpleParticle;
 import de.steamwar.lobby.particle.decorator.CircleParticle;
 import de.steamwar.lobby.particle.decorator.CloudParticle;
 import de.steamwar.lobby.particle.mutator.LocationParticleMutator;
diff --git a/src/de/steamwar/lobby/particle/ParticleEnum.java b/src/de/steamwar/lobby/particle/particles/ParticleEnum.java
similarity index 89%
rename from src/de/steamwar/lobby/particle/ParticleEnum.java
rename to src/de/steamwar/lobby/particle/particles/ParticleEnum.java
index 1fb2174..db97369 100644
--- a/src/de/steamwar/lobby/particle/ParticleEnum.java
+++ b/src/de/steamwar/lobby/particle/particles/ParticleEnum.java
@@ -17,7 +17,9 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
+
+import de.steamwar.lobby.particle.BaseParticle;
 
 public interface ParticleEnum {
     BaseParticle getParticle();
diff --git a/src/de/steamwar/lobby/particle/PlayerParticle.java b/src/de/steamwar/lobby/particle/particles/PlayerParticle.java
similarity index 92%
rename from src/de/steamwar/lobby/particle/PlayerParticle.java
rename to src/de/steamwar/lobby/particle/particles/PlayerParticle.java
index d15cc54..9bbbe1f 100644
--- a/src/de/steamwar/lobby/particle/PlayerParticle.java
+++ b/src/de/steamwar/lobby/particle/particles/PlayerParticle.java
@@ -17,8 +17,12 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
 
+import de.steamwar.lobby.particle.BaseParticle;
+import de.steamwar.lobby.particle.DustSimpleParticle;
+import de.steamwar.lobby.particle.ParticleItem;
+import de.steamwar.lobby.particle.SimpleParticle;
 import de.steamwar.lobby.particle.mutator.LocationParticleMutator;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/de/steamwar/lobby/particle/ServerTeamParticle.java b/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
similarity index 96%
rename from src/de/steamwar/lobby/particle/ServerTeamParticle.java
rename to src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
index e9b8c43..ce0d6c0 100644
--- a/src/de/steamwar/lobby/particle/ServerTeamParticle.java
+++ b/src/de/steamwar/lobby/particle/particles/ServerTeamParticle.java
@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
 
+import de.steamwar.lobby.particle.BaseParticle;
+import de.steamwar.lobby.particle.ParticleItem;
+import de.steamwar.lobby.particle.SimpleParticle;
 import de.steamwar.lobby.particle.decorator.CircleParticle;
 import de.steamwar.lobby.particle.decorator.CloudParticle;
 import de.steamwar.lobby.particle.mutator.LocationParticleMutator;
diff --git a/src/de/steamwar/lobby/particle/TeamParticle.java b/src/de/steamwar/lobby/particle/particles/TeamParticle.java
similarity index 93%
rename from src/de/steamwar/lobby/particle/TeamParticle.java
rename to src/de/steamwar/lobby/particle/particles/TeamParticle.java
index 22da761..9efc748 100644
--- a/src/de/steamwar/lobby/particle/TeamParticle.java
+++ b/src/de/steamwar/lobby/particle/particles/TeamParticle.java
@@ -17,8 +17,11 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package de.steamwar.lobby.particle;
+package de.steamwar.lobby.particle.particles;
 
+import de.steamwar.lobby.particle.BaseParticle;
+import de.steamwar.lobby.particle.ParticleItem;
+import de.steamwar.lobby.particle.SimpleParticle;
 import de.steamwar.lobby.particle.decorator.CircleParticle;
 import de.steamwar.lobby.particle.decorator.NonFloorParticle;
 import de.steamwar.lobby.particle.mutator.LocationParticleMutator;
diff --git a/src/de/steamwar/lobby/util/LobbyPlayer.java b/src/de/steamwar/lobby/util/LobbyPlayer.java
index 3d9d8aa..031cade 100644
--- a/src/de/steamwar/lobby/util/LobbyPlayer.java
+++ b/src/de/steamwar/lobby/util/LobbyPlayer.java
@@ -19,8 +19,7 @@
 
 package de.steamwar.lobby.util;
 
-import de.steamwar.lobby.particle.BaseParticle;
-import de.steamwar.lobby.particle.ParticleEnum;
+import de.steamwar.lobby.particle.particles.ParticleEnum;
 import org.bukkit.entity.Player;
 
 import java.util.HashMap;