diff --git a/.gitignore b/.gitignore
index e475be5..00e70fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,12 +16,9 @@ out
 # gradle
 build
 .gradle
-logs
 
 # other
 eclipse
 run
-.vscode
 
-# Files from Forge MDK
-forge*changelog.txt
+logs/
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7fbaea..1f04c70 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # Changelog
 
-Updated build script
\ No newline at end of file
+Update to 1.20.4 and neo
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+
diff --git a/build.gradle b/build.gradle
index 8410a69..386a076 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,133 +1,108 @@
 plugins {
-	id "dev.architectury.loom" version "0.12.0-SNAPSHOT"
-	id 'maven-publish'
-	id "me.modmuss50.mod-publish-plugin" version "0.3.0"
+    id "architectury-plugin" version "3.4-SNAPSHOT"
+    id "dev.architectury.loom" version "1.4-SNAPSHOT" apply false
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
-sourceCompatibility = targetCompatibility = JavaVersion.VERSION_17
-
-def ENV = System.getenv()
-version = "${mod_version}-build.${ENV.GITHUB_RUN_NUMBER ?: 9999}"
-archivesBaseName = project.archives_base_name
-group = project.maven_group
-
-loom {
-	silentMojangMappingsLicense()
-
-	forge {
-		mixinConfigs = [
-				'structureexpansion.mixins.json'
-		]
-
-		dataGen {
-			mod project.mod_id
-		}
-
-		launches {
-			data {
-				arg "--existing", file("src/main/resources").absolutePath
-			}
-		}
-	}
+architectury {
+    minecraft = rootProject.minecraft_version
 }
 
-repositories {
+subprojects {
+    apply plugin: "dev.architectury.loom"
+    apply plugin: "maven-publish"
+
+    loom {
+        silentMojangMappingsLicense()
+    }
+
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        mappings loom.officialMojangMappings()
+    }
+
+    publishing {
+        repositories {
+            if (providers.environmentVariable("NANITE_TOKEN").isPresent()) {
+                maven {
+                    url "https://maven.nanite.dev/releases"
+                    credentials {
+                        username = "nanite"
+                        password = providers.environmentVariable("NANITE_TOKEN").get()
+                    }
+                }
+            }
+        }
+    }
 }
 
-dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings loom.officialMojangMappings()
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
 
-	forge "net.minecraftforge:forge:${project.minecraft_version}-${project.forge_version}"
-}
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
 
-processResources {
-	inputs.property "version", project.version
+    repositories {
+    }
 
-	filesMatching("META-INF/mods.toml") {
-		expand "version": project.version
-	}
-}
-
-compileJava {
-	options.encoding = "UTF-8"
-	options.release = 17
-}
-
-java {
-	withSourcesJar()
-}
-
-jar {
-	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}" }
-	}
-
-	manifest {
-		attributes([
-				"Specification-Title"     : project.mod_id,
-				"Specification-Vendor"    : project.mod_author,
-				"Specification-Version"   : "1",
-				"Implementation-Title"    : project.name,
-				"Implementation-Version"  : version,
-				"Implementation-Vendor"   : project.mod_author,
-				"Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-		])
-	}
-}
+    tasks.withType(JavaCompile) {
+        options.encoding = "UTF-8"
+        options.release = 17
+    }
 
-publishing {
-	publications {
-		mavenForge(MavenPublication) {
-			artifactId = rootProject.archives_base_name + "-" + project.name
-			from components.java
-		}
-	}
-
-	repositories {
-		if (providers.environmentVariable("NANITE_TOKEN").orNull) {
-			maven {
-				url "${maven_url}/releases"
-				credentials {
-					username = "nanite"
-					password = providers.environmentVariable("NANITE_TOKEN").get()
-				}
-			}
-		}
-	}
+    java {
+        withSourcesJar()
+    }
 }
 
 publishMods {
-	dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
-	changelog = file("./CHANGELOG.md").text
-	version = "${mod_version}"
-	type = STABLE
-
-	def forgeOptions = publishOptions {
-		file = project.provider { project.tasks.remapJar }.flatMap { it.archiveFile }
-		displayName = "${project.name} Forge ${mod_version}+mc${minecraft_version}"
-		modLoaders.add("forge")
-	}
-
-	def curseForgeOptions = curseforgeOptions {
-		accessToken = providers.environmentVariable("CURSE_TOKEN")
-		projectId = "${curseforge_id}"
-		minecraftVersions.add("${minecraft_version}")
-	}
-
-	def modrinthOptions = modrinthOptions {
-		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-		projectId = "${modrinth_id}"
-		minecraftVersions.add("${minecraft_version}")
-	}
-
-	curseforge("curseforgeForge") {
-		from(curseForgeOptions, forgeOptions)
-	}
-
-	if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
-		modrinth("modrinthForge") {
-			from(modrinthOptions, forgeOptions)
-		}
-	}
+    dryRun = providers.environmentVariable("CURSE_TOKEN").getOrNull() == null
+    changelog = file("./CHANGELOG.md").text
+    version = "${mod_version}"
+    type = STABLE
+
+    def forgeOptions = publishOptions {
+        file = project.provider { project(":forge").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "[FORGE][${minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("forge")
+    }
+
+    def neoForge = publishOptions {
+        file = project.provider { project(":neoforge").tasks.remapJar }.flatMap { it.archiveFile }
+        displayName = "[NEOFORGE][${minecraft_version}] ${project.name} ${mod_version}"
+        modLoaders.add("neoforge")
+    }
+
+    def curseForgeOptions = curseforgeOptions {
+        accessToken = providers.environmentVariable("CURSE_TOKEN")
+        projectId = "${curseforge_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    def modrinthOptions = modrinthOptions {
+        accessToken = providers.environmentVariable("MODRINTH_TOKEN")
+        projectId = "${modrinth_id}"
+        minecraftVersions.add("${minecraft_version}")
+    }
+
+    curseforge("curseforgeForge") {
+        from(curseForgeOptions, forgeOptions)
+    }
+
+    curseforge("curseforgeNeoForge") {
+        from(curseForgeOptions, neoForge)
+    }
+
+    if (providers.environmentVariable("MODRINTH_TOKEN").getOrNull() != null) {
+        modrinth("modrinthForge") {
+            from(modrinthOptions, forgeOptions)
+        }
+
+        modrinth("modrinthNeoforge") {
+            from(modrinthOptions, neoForge)
+        }
+    }
 }
\ No newline at end of file
diff --git a/common/build.gradle b/common/build.gradle
new file mode 100644
index 0000000..a302de6
--- /dev/null
+++ b/common/build.gradle
@@ -0,0 +1,26 @@
+architectury {
+    common(rootProject.enabled_platforms.split(","))
+}
+
+loom {
+    accessWidenerPath = file("src/main/resources/structureexpansion.accesswidener")
+}
+
+// sourceSets.main.resources.srcDirs += file("src/generated/resources")
+
+dependencies {
+    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
+    // Do NOT use other classes from fabric loader
+    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
+    // Remove the next line if you don't want to depend on the API
+    modApi "dev.architectury:architectury:${rootProject.architectury_version}"
+}
+
+publishing {
+    publications {
+        mavenCommon(MavenPublication) {
+            artifactId = "${rootProject.archivesBaseName}-${project.name}"
+            from components.java
+        }
+    }
+}
\ No newline at end of file
diff --git a/common/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java b/common/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java
new file mode 100644
index 0000000..13aada0
--- /dev/null
+++ b/common/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java
@@ -0,0 +1,23 @@
+package com.sunekaer.mods.structureexpansion;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.sunekaer.mods.structureexpansion.commands.CommandClean;
+import dev.architectury.event.events.common.CommandRegistrationEvent;
+import net.minecraft.commands.CommandBuildContext;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.Commands;
+
+public class StructureExpansion {
+    public static final int NEW_LIMIT = 200;
+    public static final int NEW_LIMIT_POS = NEW_LIMIT - 1;
+    public static final int NEW_LIMIT_NEG = -NEW_LIMIT_POS;
+
+
+    public static void init() {
+        CommandRegistrationEvent.EVENT.register(StructureExpansion::registerCommands);
+    }
+
+    public static void registerCommands(CommandDispatcher<CommandSourceStack> dispatcher, CommandBuildContext context, Commands.CommandSelection selection) {
+        dispatcher.register(Commands.literal("structure").then(CommandClean.register()));
+    }
+}
diff --git a/src/main/java/com/sunekaer/mods/structureexpansion/commands/CommandClean.java b/common/src/main/java/com/sunekaer/mods/structureexpansion/commands/CommandClean.java
similarity index 100%
rename from src/main/java/com/sunekaer/mods/structureexpansion/commands/CommandClean.java
rename to common/src/main/java/com/sunekaer/mods/structureexpansion/commands/CommandClean.java
diff --git a/src/main/java/com/sunekaer/mods/structureexpansion/mixin/ServerboundSetStructureBlockPacketMixin.java b/common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/ServerboundSetStructureBlockPacketMixin.java
similarity index 100%
rename from src/main/java/com/sunekaer/mods/structureexpansion/mixin/ServerboundSetStructureBlockPacketMixin.java
rename to common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/ServerboundSetStructureBlockPacketMixin.java
diff --git a/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockEntityMixin.java b/common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockEntityMixin.java
similarity index 100%
rename from src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockEntityMixin.java
rename to common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockEntityMixin.java
diff --git a/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java b/common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java
similarity index 83%
rename from src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java
rename to common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java
index 9bd16c2..e2d03ef 100644
--- a/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java
+++ b/common/src/main/java/com/sunekaer/mods/structureexpansion/mixin/StructureBlockRendererMixin.java
@@ -7,6 +7,10 @@
 
 @Mixin(StructureBlockRenderer.class)
 public abstract class StructureBlockRendererMixin {
+	/**
+	 * @author Sunekaer
+	 * @reason Extend the view distance of Structure Block.
+	 */
 	@Overwrite
 	public int getViewDistance() {
 		return StructureExpansion.NEW_LIMIT;
diff --git a/common/src/main/resources/architectury.common.json b/common/src/main/resources/architectury.common.json
new file mode 100644
index 0000000..baf6dfc
--- /dev/null
+++ b/common/src/main/resources/architectury.common.json
@@ -0,0 +1,3 @@
+{
+  "accessWidener": "structureexpansion.accesswidener"
+}
\ No newline at end of file
diff --git a/src/main/resources/structureexpansion.mixins.json b/common/src/main/resources/structureexpansion-common.mixins.json
similarity index 100%
rename from src/main/resources/structureexpansion.mixins.json
rename to common/src/main/resources/structureexpansion-common.mixins.json
diff --git a/common/src/main/resources/structureexpansion.accesswidener b/common/src/main/resources/structureexpansion.accesswidener
new file mode 100644
index 0000000..4987cd2
--- /dev/null
+++ b/common/src/main/resources/structureexpansion.accesswidener
@@ -0,0 +1,2 @@
+accessWidener   v2  named
+accessible field net/minecraft/world/level/levelgen/structure/templatesystem/StructureTemplate palettes Ljava/util/List;
\ No newline at end of file
diff --git a/forge/build.gradle b/forge/build.gradle
new file mode 100644
index 0000000..cb3181a
--- /dev/null
+++ b/forge/build.gradle
@@ -0,0 +1,101 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+architectury {
+    platformSetupLoomIde()
+    forge()
+}
+
+repositories {
+    maven {
+        url "https://maven.minecraftforge.net/releases"
+    }
+}
+
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+
+    runs {
+
+    }
+
+    forge {
+        convertAccessWideners = true
+        extraAccessWideners.add loom.accessWidenerPath.get().asFile.name
+
+        mixinConfig "structureexpansion-common.mixins.json"
+
+    }
+}
+
+configurations {
+    common
+    shadowCommon
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+}
+
+dependencies {
+    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
+    modApi "dev.architectury:architectury-forge:${rootProject.architectury_version}"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
+}
+
+processResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "fabric.mod.json"
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    setArchiveClassifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    setArchiveClassifier null
+    setArchivesBaseName("${rootProject.archivesBaseName}-${project.name}")
+}
+
+jar {
+    setArchiveClassifier "dev"
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+sourceSets.each {
+    def dir = layout.buildDirectory.dir("sourcesSets/$it.name")
+    it.output.resourcesDir = dir
+    it.java.destinationDirectory = dir
+}
+
+publishing {
+    publications {
+        mavenForge(MavenPublication) {
+            artifactId = "${rootProject.archivesBaseName}-${project.name}"
+            from components.java
+        }
+    }
+}
\ No newline at end of file
diff --git a/forge/gradle.properties b/forge/gradle.properties
new file mode 100644
index 0000000..32f842a
--- /dev/null
+++ b/forge/gradle.properties
@@ -0,0 +1 @@
+loom.platform=forge
\ No newline at end of file
diff --git a/forge/src/main/java/com/sunekaer/mods/structureexpansion/forge/StructureExpansionForge.java b/forge/src/main/java/com/sunekaer/mods/structureexpansion/forge/StructureExpansionForge.java
new file mode 100644
index 0000000..470370c
--- /dev/null
+++ b/forge/src/main/java/com/sunekaer/mods/structureexpansion/forge/StructureExpansionForge.java
@@ -0,0 +1,11 @@
+package com.sunekaer.mods.structureexpansion.forge;
+
+import com.sunekaer.mods.structureexpansion.StructureExpansion;
+import net.minecraftforge.fml.common.Mod;
+
+@Mod("structureexpansion")
+public class StructureExpansionForge {
+	public StructureExpansionForge() {
+		StructureExpansion.init();
+	}
+}
diff --git a/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml
similarity index 100%
rename from src/main/resources/META-INF/mods.toml
rename to forge/src/main/resources/META-INF/mods.toml
diff --git a/src/main/resources/logo.png b/forge/src/main/resources/logo.png
similarity index 100%
rename from src/main/resources/logo.png
rename to forge/src/main/resources/logo.png
diff --git a/src/main/resources/pack.mcmeta b/forge/src/main/resources/pack.mcmeta
similarity index 100%
rename from src/main/resources/pack.mcmeta
rename to forge/src/main/resources/pack.mcmeta
diff --git a/gradle.properties b/gradle.properties
index 7e76f13..75a2aef 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,32 @@
 org.gradle.jvmargs=-Xmx8G
-loom.platform=forge
-mod_id=structure-expansion
+org.gradle.daemon=false
+
+enabled_platforms=neoforge,forge
+
+mod_version=84.0.0
+
+# Dependencies
+minecraft_version=1.20.4
+
+# ForgeGradle
+forge_gradle_version=6.0.18
+# NeoForgeGradle
+neoforge_gradle_version=7.0.80
+# Mod loaders
+# NeoForge
+neoforge_version=20.4.80-beta
+# Forge
+forge_version=49.0.14
+
+fabric_loader_version=0.15.3
+fabric_api_version=0.91.2+1.20.4
+
+# Architectury
+architectury_version=11.0.10
+
 archives_base_name=structure-expansion
 maven_group=com.sunekaer.mods
-minecraft_version=1.20.1
-mod_version=2.0.1
-mod_author=Sunekaer
-forge_version=47.0.4
 
 # Publishing
 curseforge_id=398430
-modrinth_id=IKJL3zrR
-maven_url=https://maven.nanite.dev/
\ No newline at end of file
+modrinth_id=IKJL3zrR
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7a3265e..ccebba7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index fbb4097..744c64d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
\ No newline at end of file
diff --git a/neoforge/build.gradle b/neoforge/build.gradle
new file mode 100644
index 0000000..5c78617
--- /dev/null
+++ b/neoforge/build.gradle
@@ -0,0 +1,85 @@
+plugins {
+    id "com.github.johnrengelman.shadow" version "7.1.2"
+}
+
+architectury {
+    platformSetupLoomIde()
+    neoForge()
+}
+
+repositories {
+    maven {
+        url "https://maven.saps.dev/mirror"
+    }
+}
+
+loom {
+    accessWidenerPath = project(":common").loom.accessWidenerPath
+
+    // neoForge {}
+}
+
+configurations {
+    common
+    shadowCommon // Don't use shadow from the shadow plugin because we don't want IDEA to index this.
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentNeoForge.extendsFrom common
+}
+
+dependencies {
+    neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
+    modApi "dev.architectury:architectury-neoforge:${rootProject.architectury_version}"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowCommon(project(path: ":common", configuration: "transformProductionNeoForge")) { transitive = false }
+}
+
+processResources {
+    duplicatesStrategy(DuplicatesStrategy.EXCLUDE)
+    inputs.property "version", project.version
+
+    filesMatching("META-INF/mods.toml") {
+        expand "version": project.version
+    }
+}
+
+shadowJar {
+    exclude "fabric.mod.json"
+    exclude "architectury.common.json"
+
+    configurations = [project.configurations.shadowCommon]
+    setArchiveClassifier "dev-shadow"
+}
+
+remapJar {
+    input.set shadowJar.archiveFile
+    dependsOn shadowJar
+    archiveBaseName.set "${rootProject.archives_base_name}-${project.name}"
+    setArchiveClassifier(null)
+}
+
+jar {
+    setArchiveClassifier("dev")
+}
+
+sourcesJar {
+    def commonSources = project(":common").sourcesJar
+    dependsOn commonSources
+    from commonSources.archiveFile.map { zipTree(it) }
+}
+
+components.java {
+    withVariantsFromConfiguration(project.configurations.shadowRuntimeElements) {
+        skip()
+    }
+}
+
+publishing {
+    publications {
+        mavenNeoForge(MavenPublication) {
+            artifactId = "${rootProject.archivesBaseName}-${project.name}"
+            from components.java
+        }
+    }
+}
\ No newline at end of file
diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties
new file mode 100644
index 0000000..2914393
--- /dev/null
+++ b/neoforge/gradle.properties
@@ -0,0 +1 @@
+loom.platform=neoforge
\ No newline at end of file
diff --git a/neoforge/src/main/java/com/sunekaer/mods/structureexpansion/neo/StructureExpansionNeo.java b/neoforge/src/main/java/com/sunekaer/mods/structureexpansion/neo/StructureExpansionNeo.java
new file mode 100644
index 0000000..af9399f
--- /dev/null
+++ b/neoforge/src/main/java/com/sunekaer/mods/structureexpansion/neo/StructureExpansionNeo.java
@@ -0,0 +1,11 @@
+package com.sunekaer.mods.structureexpansion.neo;
+
+import com.sunekaer.mods.structureexpansion.StructureExpansion;
+import net.neoforged.fml.common.Mod;
+
+@Mod("structureexpansion")
+public class StructureExpansionNeo {
+	public StructureExpansionNeo() {
+		StructureExpansion.init();
+	}
+}
diff --git a/neoforge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml
new file mode 100644
index 0000000..77580dd
--- /dev/null
+++ b/neoforge/src/main/resources/META-INF/mods.toml
@@ -0,0 +1,31 @@
+modLoader = "javafml"
+loaderVersion = "[1,)"
+issueTrackerURL = "https://github.com/nanite/Structure-Expansion/issues"
+license = "MIT License"
+
+[[mods]]
+modId = "structureexpansion"
+version = "${version}"
+displayName = "Structure Expansion"
+displayURL = "https://www.curseforge.com/minecraft/mc-mods/structure-expansion"
+logoFile = "logo.png"
+authors = "Sunekaer, LatvianModder"
+description = '''
+Small mod that Increases the size limit of the vanilla structure blocks
+
+Increases the size limit of the structure block from 48x48x48 to 127x127x127
+'''
+
+[[dependencies.structureexpansion]]
+modId = "neoforge"
+required = true
+versionRange = "[20.4,)"
+ordering="NONE"
+side="BOTH"
+
+[[dependencies.structureexpansion]]
+modId="minecraft"
+required=true
+versionRange="[1.20.4,)"
+ordering="NONE"
+side="BOTH"
diff --git a/neoforge/src/main/resources/logo.png b/neoforge/src/main/resources/logo.png
new file mode 100644
index 0000000..aecb6c9
Binary files /dev/null and b/neoforge/src/main/resources/logo.png differ
diff --git a/neoforge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta
new file mode 100644
index 0000000..7cf4126
--- /dev/null
+++ b/neoforge/src/main/resources/pack.mcmeta
@@ -0,0 +1,6 @@
+{
+    "pack": {
+        "description": "Structure Expansion resources",
+        "pack_format": 7
+    }
+}
diff --git a/settings.gradle b/settings.gradle
index 8a091d2..c9a974b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,14 @@
 pluginManagement {
-	repositories {
-		maven { url "https://maven.fabricmc.net/" }
-		maven { url "https://maven.architectury.dev/" }
-		maven { url "https://files.minecraftforge.net/maven/" }
-		gradlePluginPortal()
-	}
+    repositories {
+        maven { url "https://maven.neoforged.net/releases" }
+        maven { url "https://maven.creeperhost.net/" }
+        maven { url "https://maven.fabricmc.net/" }
+        maven { url "https://maven.architectury.dev/" }
+        maven { url "https://maven.minecraftforge.net/" }
+        gradlePluginPortal()
+    }
 }
 
-rootProject.name = 'Structure-Expansion'
\ No newline at end of file
+include "common", "forge", "neoforge",
+
+rootProject.name = 'StructureExpansion'
\ No newline at end of file
diff --git a/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java b/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java
deleted file mode 100644
index a8f52dd..0000000
--- a/src/main/java/com/sunekaer/mods/structureexpansion/StructureExpansion.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.sunekaer.mods.structureexpansion;
-
-import com.sunekaer.mods.structureexpansion.commands.CommandClean;
-import net.minecraft.commands.Commands;
-import net.minecraftforge.event.RegisterCommandsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-@Mod("structureexpansion")
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
-public class StructureExpansion {
-	public static final int NEW_LIMIT = 200;
-	public static final int NEW_LIMIT_POS = NEW_LIMIT - 1;
-	public static final int NEW_LIMIT_NEG = -NEW_LIMIT_POS;
-
-	@SubscribeEvent
-	public static void registerCommands(RegisterCommandsEvent event) {
-		event.getDispatcher().register(Commands.literal("structure").then(CommandClean.register()));
-	}
-}
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
deleted file mode 100644
index 93e2157..0000000
--- a/src/main/resources/META-INF/accesstransformer.cfg
+++ /dev/null
@@ -1 +0,0 @@
-public net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplate f_74482_ # palettes
\ No newline at end of file