diff --git a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
index 1dc1ad30..55bf4d36 100644
--- a/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
+++ b/VelocityCore/src/de/steamwar/velocitycore/ServerStarter.java
@@ -106,7 +106,7 @@ public class ServerStarter {
     public ServerStarter event(EventFight eventFight) {
         arena(ArenaMode.getByInternal(eventFight.getSpielmodus()), eventFight.getMap());
         node = VelocityCore.local;
-        worldDir = EVENT_PATH;
+        worldDir = EVENT_PATH + "/" + serverToWorldName(Event.byId(eventFight.getEventID()).getEventName()) + "/" + eventFight.getStartTime().toLocalDateTime().format(DateTimeFormatter.ISO_LOCAL_DATE);
         worldCleanup = () -> {
         };
         arguments.put("fightID", String.valueOf(eventFight.getFightID()));
@@ -351,7 +351,7 @@ public class ServerStarter {
     }
 
     public static String serverToWorldName(String serverName) {
-        return serverName.replace(' ', '_').replace("[", "").replace("]", "");
+        return serverName.replace(' ', '_').replace("[", "").replace("]", "").replace(".", "");
     }
 
     public static void copyWorld(Node node, String template, String target) {