diff --git a/arclight-forge-1.16/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/arclight-forge-1.16/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
deleted file mode 100644
index 9a144c8a..00000000
--- a/arclight-forge-1.16/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
+++ /dev/null
@@ -1 +0,0 @@
-io.izzel.arclight.impl.ArclightLocator_1_16
\ No newline at end of file
diff --git a/arclight-forge-1.16/.gitignore b/arclight-forge/.gitignore
similarity index 100%
rename from arclight-forge-1.16/.gitignore
rename to arclight-forge/.gitignore
diff --git a/arclight-forge-1.16/build.gradle b/arclight-forge/build.gradle
similarity index 98%
rename from arclight-forge-1.16/build.gradle
rename to arclight-forge/build.gradle
index d1d1518a..92557f1a 100644
--- a/arclight-forge-1.16/build.gradle
+++ b/arclight-forge/build.gradle
@@ -29,6 +29,8 @@ arclight {
     packageName = 'spigot'
 }
 
+archivesBaseName = archivesBaseName + '-' + minecraftVersion
+
 sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8'
 
 sourceSets {
@@ -119,7 +121,7 @@ processResources {
 }
 
 jar {
-    manifest.attributes 'MixinConnector': 'io.izzel.arclight.impl.ArclightConnector_1_16'
+    manifest.attributes 'MixinConnector': 'io.izzel.arclight.impl.ArclightConnector_Forge'
     manifest.attributes 'Main-Class': 'io.izzel.arclight.server.Launcher'
     manifest.attributes 'Implementation-Title': 'Arclight'
     manifest.attributes 'Implementation-Version': "arclight-$minecraftVersion-${project.version}-${getGitHash()}"
@@ -150,7 +152,7 @@ processMapping {
 }
 
 mixin {
-    add sourceSets.main, 'mixins.arclight.impl.refmap.1_16.json'
+    add sourceSets.main, 'mixins.arclight.impl.forge.refmap.json'
 }
 
 compileJava {
diff --git a/arclight-forge-1.16/src/applaunch/java/io/izzel/arclight/server/Launcher.java b/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java
similarity index 95%
rename from arclight-forge-1.16/src/applaunch/java/io/izzel/arclight/server/Launcher.java
rename to arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java
index cb9d35c6..c7b38c53 100644
--- a/arclight-forge-1.16/src/applaunch/java/io/izzel/arclight/server/Launcher.java
+++ b/arclight-forge/src/applaunch/java/io/izzel/arclight/server/Launcher.java
@@ -13,6 +13,6 @@ public class Launcher {
             System.exit(-1);
             return;
         }
-        Main_1_16.main(args);
+        Main_Forge.main(args);
     }
 }
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightConnector_1_16.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java
similarity index 60%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightConnector_1_16.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java
index 877d6e8c..a474421c 100644
--- a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightConnector_1_16.java
+++ b/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightConnector_Forge.java
@@ -5,17 +5,17 @@ import io.izzel.arclight.i18n.ArclightConfig;
 import org.spongepowered.asm.mixin.Mixins;
 
 @SuppressWarnings("unused")
-public class ArclightConnector_1_16 extends ArclightConnector {
+public class ArclightConnector_Forge extends ArclightConnector {
 
     @Override
     public void connect() {
         super.connect();
-        Mixins.addConfiguration("mixins.arclight.impl.optimization.1_16.json");
+        Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.json");
         if (ArclightConfig.spec().getOptimization().isRemoveStream()) {
-            Mixins.addConfiguration("mixins.arclight.impl.optimization.stream.1_16.json");
+            Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.stream.json");
         }
         if (ArclightConfig.spec().getOptimization().isDisableDFU()) {
-            Mixins.addConfiguration("mixins.arclight.impl.optimization.dfu.1_16.json");
+            Mixins.addConfiguration("mixins.arclight.impl.forge.optimization.dfu.json");
         }
         LOGGER.info("mixin-load.optimization");
     }
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightLocator_1_16.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightLocator_Forge.java
similarity index 90%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightLocator_1_16.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightLocator_Forge.java
index 4066de43..c171f9d6 100644
--- a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/ArclightLocator_1_16.java
+++ b/arclight-forge/src/main/java/io/izzel/arclight/impl/ArclightLocator_Forge.java
@@ -7,7 +7,7 @@ import net.minecraftforge.forgespi.locating.IModFile;
 import java.io.File;
 import java.net.URISyntaxException;
 
-public class ArclightLocator_1_16 extends ArclightLocator {
+public class ArclightLocator_Forge extends ArclightLocator {
 
     @Override
     protected IModFile loadJars() {
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/bridge/EntityBridge_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/NoopReadWriteLock.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/common/optimization/OptimizedIndirectMerger.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/CraftMagicNumbersMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixerUpperMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/DataFixesManagerMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/EntityType_BuilderMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/EntityType_BuilderMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/EntityType_BuilderMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/EntityType_BuilderMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/MinecraftServerMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/TileEntityTypeMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/TileEntityTypeMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/TileEntityTypeMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/dfu/TileEntityTypeMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/ClassInheritanceMultiMapMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/EntityDataManagerMixin_Optimize.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/VoxelShapesMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ActivationRangeMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/EntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/ServerWorldMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AbstractArrowEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AgeableEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/AreaEffectCloudEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/FireworkRocketEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/ItemEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/LivingEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/activationrange/entity/VillagerEntityMixin_ActivationRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/general/trackingrange/ChunkManagerMixin_TrackingRange.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/CommandNodeMixin_Optimization.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/CommandNodeMixin_Optimization.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/CommandNodeMixin_Optimization.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/CommandNodeMixin_Optimization.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/GoalSelectorMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java b/arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java
similarity index 100%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java
rename to arclight-forge/src/main/java/io/izzel/arclight/impl/mixin/optimization/stream/ITaskQueue_PriorityMixin.java
diff --git a/arclight-forge-1.16/src/main/java/io/izzel/arclight/server/Main_1_16.java b/arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java
similarity index 95%
rename from arclight-forge-1.16/src/main/java/io/izzel/arclight/server/Main_1_16.java
rename to arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java
index f65222c2..158ba6d2 100644
--- a/arclight-forge-1.16/src/main/java/io/izzel/arclight/server/Main_1_16.java
+++ b/arclight-forge/src/main/java/io/izzel/arclight/server/Main_Forge.java
@@ -4,7 +4,7 @@ import io.izzel.arclight.api.ArclightVersion;
 import io.izzel.arclight.common.ArclightMain;
 import io.izzel.arclight.forgeinstaller.ForgeInstaller;
 
-public class Main_1_16 {
+public class Main_Forge {
 
     public static void main(String[] args) throws Throwable {
         new ArclightMain() {
diff --git a/arclight-forge-1.16/src/main/resources/META-INF/mods.toml b/arclight-forge/src/main/resources/META-INF/mods.toml
similarity index 100%
rename from arclight-forge-1.16/src/main/resources/META-INF/mods.toml
rename to arclight-forge/src/main/resources/META-INF/mods.toml
diff --git a/arclight-forge/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator b/arclight-forge/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
new file mode 100644
index 00000000..eab34566
--- /dev/null
+++ b/arclight-forge/src/main/resources/META-INF/services/net.minecraftforge.forgespi.locating.IModLocator
@@ -0,0 +1 @@
+io.izzel.arclight.impl.ArclightLocator_Forge
\ No newline at end of file
diff --git a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.dfu.1_16.json b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json
similarity index 85%
rename from arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.dfu.1_16.json
rename to arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json
index 934db557..a2020389 100644
--- a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.dfu.1_16.json
+++ b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.dfu.json
@@ -2,7 +2,7 @@
   "minVersion": "0.8",
   "package": "io.izzel.arclight.impl.mixin.optimization.dfu",
   "target": "@env(DEFAULT)",
-  "refmap": "mixins.arclight.impl.refmap.1_16.json",
+  "refmap": "mixins.arclight.impl.forge.refmap.json",
   "mixins": [
     "CraftMagicNumbersMixin",
     "DataFixerUpperMixin",
diff --git a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.1_16.json b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json
similarity index 94%
rename from arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.1_16.json
rename to arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json
index d0dba3c2..2b23479d 100644
--- a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.1_16.json
+++ b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.json
@@ -2,7 +2,7 @@
   "minVersion": "0.8",
   "package": "io.izzel.arclight.impl.mixin.optimization.general",
   "target": "@env(DEFAULT)",
-  "refmap": "mixins.arclight.impl.refmap.1_16.json",
+  "refmap": "mixins.arclight.impl.forge.refmap.json",
   "mixins": [
     "ClassInheritanceMultiMapMixin",
     "EntityDataManagerMixin_Optimize",
diff --git a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.stream.1_16.json b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json
similarity index 81%
rename from arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.stream.1_16.json
rename to arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json
index c35cbaf4..d0b6c4a2 100644
--- a/arclight-forge-1.16/src/main/resources/mixins.arclight.impl.optimization.stream.1_16.json
+++ b/arclight-forge/src/main/resources/mixins.arclight.impl.forge.optimization.stream.json
@@ -2,7 +2,7 @@
   "minVersion": "0.8",
   "package": "io.izzel.arclight.impl.mixin.optimization.stream",
   "target": "@env(DEFAULT)",
-  "refmap": "mixins.arclight.impl.refmap.1_16.json",
+  "refmap": "mixins.arclight.impl.forge.refmap.json",
   "mixins": [
     "CommandNodeMixin_Optimization",
     "GoalSelectorMixin",
diff --git a/arclight-forge-1.16/src/main/resources/pack.mcmeta b/arclight-forge/src/main/resources/pack.mcmeta
similarity index 100%
rename from arclight-forge-1.16/src/main/resources/pack.mcmeta
rename to arclight-forge/src/main/resources/pack.mcmeta
diff --git a/settings.gradle b/settings.gradle
index 061a132c..8f32f993 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 rootProject.name = 'arclight'
 include 'arclight-common'
 include 'forge-installer'
-include 'arclight-forge-1.16'
+include 'arclight-forge'
 include 'i18n-config'