diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java
index 3cb779416..e01dda125 100644
--- a/src/main/java/com/volmit/iris/Iris.java
+++ b/src/main/java/com/volmit/iris/Iris.java
@@ -684,7 +684,7 @@ public class Iris extends VolmitPlugin implements Listener {
                 .name(worldName)
                 .seed(1337)
                 .environment(dim.getEnvironment())
-                .worldFolder(new File(worldName))
+                .worldFolder(new File(Bukkit.getWorldContainer(), worldName))
                 .minHeight(dim.getMinHeight())
                 .maxHeight(dim.getMaxHeight())
                 .build();
diff --git a/src/main/java/com/volmit/iris/core/ServerConfigurator.java b/src/main/java/com/volmit/iris/core/ServerConfigurator.java
index 02c6985f3..58a05d43c 100644
--- a/src/main/java/com/volmit/iris/core/ServerConfigurator.java
+++ b/src/main/java/com/volmit/iris/core/ServerConfigurator.java
@@ -84,7 +84,7 @@ public class ServerConfigurator {
 
     private static List<File> getDatapacksFolder() {
         if (!IrisSettings.get().getGeneral().forceMainWorld.isEmpty()) {
-            return new KList<File>().qadd(new File(IrisSettings.get().getGeneral().forceMainWorld + "/datapacks"));
+            return new KList<File>().qadd(new File(Bukkit.getWorldContainer(), IrisSettings.get().getGeneral().forceMainWorld + "/datapacks"));
         }
         KList<File> worlds = new KList<>();
         Bukkit.getServer().getWorlds().forEach(w -> worlds.add(new File(w.getWorldFolder(), "datapacks")));
diff --git a/src/main/java/com/volmit/iris/core/commands/CommandIris.java b/src/main/java/com/volmit/iris/core/commands/CommandIris.java
index 20f1755ae..209ea9f25 100644
--- a/src/main/java/com/volmit/iris/core/commands/CommandIris.java
+++ b/src/main/java/com/volmit/iris/core/commands/CommandIris.java
@@ -73,7 +73,7 @@ public class CommandIris implements DecreeExecutor {
             return;
         }
 
-        if (new File(name).exists()) {
+        if (new File(Bukkit.getWorldContainer(), name).exists()) {
             sender().sendMessage(C.RED + "That folder already exists!");
             return;
         }
diff --git a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
index 799df0151..372a63a74 100644
--- a/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
+++ b/src/main/java/com/volmit/iris/core/tools/IrisCreator.java
@@ -51,7 +51,7 @@ import java.util.function.Supplier;
 @Data
 @Accessors(fluent = true, chain = true)
 public class IrisCreator {
-    private static final File BUKKIT_YML = new File(Bukkit.getServer().getWorldContainer(), "bukkit.yml");
+    private static final File BUKKIT_YML = new File("bukkit.yml");
     /**
      * Specify an area to pregenerate during creation
      */
@@ -115,7 +115,7 @@ public class IrisCreator {
             sender = Iris.getSender();
 
         if (!studio()) {
-            Iris.service(StudioSVC.class).installIntoWorld(sender, d.getLoadKey(), new File(name()));
+            Iris.service(StudioSVC.class).installIntoWorld(sender, d.getLoadKey(), new File(Bukkit.getWorldContainer(), name()));
         }
 
         PlatformChunkGenerator access = null;
diff --git a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
index 386eb9b2d..14d9a732f 100644
--- a/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
+++ b/src/main/java/com/volmit/iris/core/tools/IrisWorldCreator.java
@@ -22,6 +22,7 @@ import com.volmit.iris.core.loader.IrisData;
 import com.volmit.iris.engine.object.IrisDimension;
 import com.volmit.iris.engine.object.IrisWorld;
 import com.volmit.iris.engine.platform.BukkitChunkGenerator;
+import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.WorldCreator;
 import org.bukkit.generator.ChunkGenerator;
@@ -71,7 +72,7 @@ public class IrisWorldCreator {
                 .minHeight(dim.getMinHeight())
                 .maxHeight(dim.getMaxHeight())
                 .seed(seed)
-                .worldFolder(new File(name))
+                .worldFolder(new File(Bukkit.getWorldContainer(), name))
                 .environment(findEnvironment())
                 .build();
         ChunkGenerator g = new BukkitChunkGenerator(w, studio, studio
diff --git a/src/main/java/com/volmit/iris/engine/object/IrisWorld.java b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java
index 43a5a54da..19c8d348d 100644
--- a/src/main/java/com/volmit/iris/engine/object/IrisWorld.java
+++ b/src/main/java/com/volmit/iris/engine/object/IrisWorld.java
@@ -108,7 +108,7 @@ public class IrisWorld {
 
     public void bind(WorldInfo worldInfo) {
         name(worldInfo.getName())
-                .worldFolder(new File(worldInfo.getName()))
+                .worldFolder(new File(Bukkit.getWorldContainer(), worldInfo.getName()))
                 .minHeight(worldInfo.getMinHeight())
                 .maxHeight(worldInfo.getMaxHeight())
                 .environment(worldInfo.getEnvironment());