diff --git a/.github/scripts/test-no-error-reports.sh b/.github/scripts/test-no-error-reports.sh
new file mode 100644
index 0000000..e387660
--- /dev/null
+++ b/.github/scripts/test-no-error-reports.sh
@@ -0,0 +1,27 @@
+if [[ -d "run/crash-reports" ]]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+fi
+
+if grep --quiet "Fatal errors were detected" server.log; then
+  echo "Fatal errors detected:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet "The state engine was in incorrect state ERRORED and forced into state SERVER_STOPPED" server.log; then
+  echo "Server force stopped:"
+  cat server.log
+  exit 1
+fi
+
+if grep --quiet 'Done .+ For help, type "help" or "?"' server.log; then
+  echo "Server didn't finish startup:"
+  cat server.log
+  exit 1
+fi
+
+echo "No crash reports detected"
+exit 0
+
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..08df9fe
--- /dev/null
+++ b/.github/workflows/build-and-test.yml
@@ -0,0 +1,45 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Build and test
+
+on:
+  pull_request:
+    branches: [ master, main ]
+  push:
+    branches: [ master, main ]
+
+jobs:
+  build-and-test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with: 
+        fetch-depth: 0
+    
+    - name: Set up JDK 8
+      uses: actions/setup-java@v2
+      with:
+        java-version: '8'
+        distribution: 'adopt'
+        cache: gradle
+        
+    - name: Grant execute permission for gradlew
+      run: chmod +x gradlew
+
+    - name: Setup the workspace
+      run: ./gradlew setupCIWorkspace
+
+    - name: Build the mod
+      run: ./gradlew build
+
+    - name: Run server for 1.5 minutes
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 90 ./gradlew runServer | tee --append server.log || true
+
+    - name: Test no errors reported during server run
+      run: |
+        chmod +x .github/scripts/test-no-error-reports.sh
+        .github/scripts/test-no-error-reports.sh
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
new file mode 100644
index 0000000..96d37f7
--- /dev/null
+++ b/.github/workflows/release-tags.yml
@@ -0,0 +1,61 @@
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-gradle
+
+name: Release tagged build
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set release version
+        run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV
+
+      - name: Set up JDK 8
+        uses: actions/setup-java@v2
+        with:
+          java-version: '8'
+          distribution: 'adopt'
+          cache: gradle
+
+      - name: Grant execute permission for gradlew
+        run: chmod +x gradlew
+
+      - name: Setup the workspace
+        run: ./gradlew setupCIWorkspace
+
+      - name: Build the mod
+        run: ./gradlew build
+
+      - name: Release under current tag
+        uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          automatic_release_tag: "${{ env.RELEASE_VERSION }}"
+          prerelease: false
+          title: "${{ env.RELEASE_VERSION }}"
+          files: build/libs/*.jar
+
+      - name: Set repository owner and name
+        run: |
+          echo "REPOSITORY_OWNER=${GITHUB_REPOSITORY%/*}" >> $GITHUB_ENV
+          echo "REPOSITORY_NAME=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+      - name: Publish package
+        run: ./gradlew publish
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          ARTIFACT_GROUP_ID: com.github.${{ env.REPOSITORY_OWNER }}
+          ARTIFACT_ID: "${{ env.REPOSITORY_NAME }}"
+          ARTIFACT_VERSION: "${{ env.RELEASE_VERSION }}"
+          REPOSITORY_NAME: "${{ env.REPOSITORY_NAME }}"
+          REPOSITORY_OWNER: "${{ env.REPOSITORY_OWNER }}"
+    
diff --git a/.gitignore b/.gitignore
index 0639f7c..75c41f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,13 +1,31 @@
-/bin
-/out
-/build
-/run
-/deps/run
-/.idea
-/eclipse
-/.gradle
-/*.iml
-/*.ipr
-/.idea/libraries/Gradle__*
+.gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
+.classpath
+.project
+/bin/
+/config/
+/crash-reports/
+/logs/
+options.txt
+/saves/
+usernamecache.json
+banned-ips.json
+banned-players.json
+eula.txt
+ops.json
+server.properties
+servers.dat
+usercache.json
+whitelist.json
+/out/
+*.iml
+*.ipr
+*.iws
+src/main/resources/mixins.*.json
 *.bat
-ae2stuff-rv3.iws
+*.DS_Store
+!gradlew.bat
diff --git a/build.gradle b/build.gradle
index 308ba29..e0288ec 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,169 +1,562 @@
+//version: 29197fa3cf1ea6ef5c07884a613171d01c026d1d
+/*
+DO NOT CHANGE THIS FILE!
+
+Also, you may replace this file at any time if there is an update available.
+Please check https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/build.gradle for updates.
+ */
+
+
+import com.github.jengelman.gradle.plugins.shadow.tasks.ConfigureShadowRelocation
+import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
+
+import java.util.concurrent.TimeUnit
+
 buildscript {
-    configurations.all {
-        resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
-    }
     repositories {
-        mavenCentral()
         maven {
             name = "forge"
-            url = "http://files.minecraftforge.net/maven"
+            url = "https://maven.minecraftforge.net"
         }
         maven {
             name = "sonatype"
             url = "https://oss.sonatype.org/content/repositories/snapshots/"
         }
         maven {
+            name = "Scala CI dependencies"
+            url = "https://repo1.maven.org/maven2/"
+        }
+        maven {
+            name = "jitpack"
             url = "https://jitpack.io"
-	    }
+        }
     }
     dependencies {
-        classpath 'com.github.GTNH2:ForgeGradle:FG_1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
     }
 }
 
-apply plugin: 'scala'
+plugins {
+    id 'idea'
+    id 'scala'
+    id("org.ajoberstar.grgit") version("3.1.1")
+    id("com.github.johnrengelman.shadow") version("4.0.4")
+    id("com.palantir.git-version") version("0.12.3")
+    id("maven-publish")
+}
+
 apply plugin: 'forge'
 
-tasks.withType(ScalaCompile) {
-    scalaCompileOptions.additionalParameters = ["-deprecation:false"]
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
 }
 
-file "build.properties" withReader {
-    def prop = new Properties()
-    prop.load(it)
-    ext.config = new ConfigSlurper().parse prop
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
 }
 
-if (project.hasProperty('forgeOverride')) {
-    config.forge.version = forgeOverride
+if(JavaVersion.current() != JavaVersion.VERSION_1_8) {
+    throw new GradleException("This project requires Java 8, but it's running on " + JavaVersion.current())
+}
+
+checkPropertyExists("modName")
+checkPropertyExists("modId")
+checkPropertyExists("modGroup")
+checkPropertyExists("autoUpdateBuildScript")
+checkPropertyExists("minecraftVersion")
+checkPropertyExists("forgeVersion")
+checkPropertyExists("replaceGradleTokenInFile")
+checkPropertyExists("gradleTokenModId")
+checkPropertyExists("gradleTokenModName")
+checkPropertyExists("gradleTokenVersion")
+checkPropertyExists("gradleTokenGroupName")
+checkPropertyExists("apiPackage")
+checkPropertyExists("accessTransformersFile")
+checkPropertyExists("usesMixins")
+checkPropertyExists("mixinPlugin")
+checkPropertyExists("mixinsPackage")
+checkPropertyExists("coreModClass")
+checkPropertyExists("containsMixinsAndOrCoreModOnly")
+checkPropertyExists("usesShadowedDependencies")
+checkPropertyExists("developmentEnvironmentUserName")
+
+
+String javaSourceDir = "src/main/java/"
+String scalaSourceDir = "src/main/scala/"
+
+String targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+String targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/")
+if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+    throw new GradleException("Could not resolve \"modGroup\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
 }
 
-ext.simpleVersion = "${config.ae2stuff.version}"
+if(apiPackage) {
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"apiPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+}
+
+if(accessTransformersFile) {
+    String targetFile = "src/main/resources/META-INF/" + accessTransformersFile
+    if(getFile(targetFile).exists() == false) {
+        throw new GradleException("Could not resolve \"accessTransformersFile\"! Could not find " + targetFile)
+    }
+}
+
+if(usesMixins.toBoolean()) {
+    if(mixinsPackage.isEmpty() || mixinPlugin.isEmpty()) {
+        throw new GradleException("\"mixinPlugin\" requires \"mixinsPackage\" and \"mixinPlugin\" to be set!")
+    }
+
+    targetPackageJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    targetPackageScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinsPackage.toString().replaceAll("\\.", "/")
+    if((getFile(targetPackageJava).exists() || getFile(targetPackageScala).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinsPackage\"! Could not find " + targetPackageJava + " or " + targetPackageScala)
+    }
+
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + mixinPlugin.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"mixinPlugin\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+if(coreModClass) {
+    String targetFileJava = javaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    String targetFileScala = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".scala"
+    String targetFileScalaJava = scalaSourceDir + modGroup.toString().replaceAll("\\.", "/") + "/" + coreModClass.toString().replaceAll("\\.", "/") + ".java"
+    if((getFile(targetFileJava).exists() || getFile(targetFileScala).exists() || getFile(targetFileScalaJava).exists()) == false) {
+        throw new GradleException("Could not resolve \"coreModClass\"! Could not find " + targetFileJava + " or " + targetFileScala + " or " + targetFileScalaJava)
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor(0, TimeUnit.SECONDS)
+
+    // Make sure GregTech build won't time out
+    System.setProperty("org.gradle.internal.http.connectionTimeout", 120000 as String)
+    System.setProperty("org.gradle.internal.http.socketTimeout", 120000 as String)
+}
 
-version = simpleVersion + '-mc' + config.minecraft.version
+// Fix Jenkins' Git: chmod a file should not be detected as a change and append a '.dirty' to the version
+'git config core.fileMode false'.execute()
+// Pulls version from git tag
+try {
+    version = minecraftVersion + "-" + gitVersion()
+}
+catch (Exception e) {
+    throw new IllegalStateException("This mod must be version controlled by Git AND the repository must provide at least one tag!");
+}
 
-group = "net.bdew"
-archivesBaseName = "ae2stuff-rv3"
+group = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
 
 minecraft {
-    version = "${config.minecraft.version}-${config.forge.version}"
-    replace("BDLIB_VER", config.bdlib.version)
-    replace("AE2STUFF_VER", simpleVersion.toString())
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
+    runDir = "run"
+
+    if (replaceGradleTokenInFile) {
+        replaceIn replaceGradleTokenInFile
+        if(gradleTokenModId) {
+            replace gradleTokenModId, modId
+        }
+        if(gradleTokenModName) {
+            replace gradleTokenModName, modName
+        }
+        if(gradleTokenVersion) {
+            replace gradleTokenVersion, versionDetails().lastTag
+        }
+        if(gradleTokenGroupName) {
+            replace gradleTokenGroupName, modGroup
+        }
+    }
+}
+
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
+}
+
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)
 }
 
 repositories {
     maven {
-        name = "bdew"
-        url = "https://jenkins.bdew.net/maven"
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
     }
-    maven {
-        name = "chickenbones"
-        url = "http://chickenbones.net/maven/"
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
     }
-    maven {
-        name "waila"
-        url "http://mobiusstrip.eu/maven"
+}
+
+dependencies {
+    if(usesMixins.toBoolean()) {
+        annotationProcessor("org.ow2.asm:asm-debug-all:5.0.3")
+        annotationProcessor("com.google.guava:guava:24.1.1-jre")
+        annotationProcessor("com.google.code.gson:gson:2.8.6")
+        annotationProcessor("org.spongepowered:mixin:0.8-SNAPSHOT")
+        // using 0.8 to workaround a issue in 0.7 which fails mixin application
+        compile("org.spongepowered:mixin:0.7.11-SNAPSHOT") {
+            // Mixin includes a lot of dependencies that are too up-to-date
+            exclude module: "launchwrapper"
+            exclude module: "guava"
+            exclude module: "gson"
+            exclude module: "commons-io"
+            exclude module: "log4j-core"
+        }
+        compile("com.github.GTNewHorizons:SpongeMixins:1.3.3:dev")
     }
-    
-	ivy {
-        name = 'gtnh_download_source_stupid_underscore_typo'
-        artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]_[revision].[ext]")
+}
+
+apply from: 'dependencies.gradle'
+
+def mixingConfigRefMap = "mixins." + modId + ".refmap.json"
+def refMap = "${tasks.compileJava.temporaryDir}" + File.separator + mixingConfigRefMap
+def mixinSrg = "${tasks.reobf.temporaryDir}" + File.separator + "mixins.srg"
+
+task generateAssets {
+    if(usesMixins.toBoolean()) {
+        getFile("/src/main/resources/mixins." + modId + ".json").text = """{
+  "required": true,
+  "minVersion": "0.7.11",
+  "package": "${modGroup}.${mixinsPackage}",
+  "plugin": "${modGroup}.${mixinPlugin}",
+  "refmap": "${mixingConfigRefMap}",
+  "target": "@env(DEFAULT)",
+  "compatibilityLevel": "JAVA_8"
+}
+
+"""
+    }
+}
+
+task relocateShadowJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowJar
+    prefix = modGroup + ".shadow"
+}
+
+shadowJar {
+    manifest {
+        attributes(getManifestAttributes())
     }
 
-	ivy {
-        name = 'gtnh_download_source'
-        artifactPattern("http://downloads.gtnewhorizons.com/Mods_for_Jenkins/[module]-[revision].[ext]")
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    manifest {
+        attributes(getManifestAttributes())
     }
 
-    ivy {
-        name "BuildCraft"
-        artifactPattern "https://www.mod-buildcraft.com/releases/BuildCraft/[revision]/[module]-[revision]-[classifier].[ext]"
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
     }
 }
 
-dependencies {
-    compile "net.bdew:bdlib:${config.bdlib.version}-mc${config.minecraft.version}:dev"
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
 
-    compile "codechicken:NotEnoughItems:${config.minecraft.version}-${config.nei.version}:dev"
-    compile "codechicken:CodeChickenLib:${config.minecraft.version}-${config.ccl.version}:dev"
-    compile "codechicken:CodeChickenCore:${config.minecraft.version}-${config.ccc.version}:dev"
+afterEvaluate {
+    if(usesMixins.toBoolean()) {
+        tasks.compileJava {
+            options.compilerArgs += [
+                    "-AreobfSrgFile=${tasks.reobf.srg}",
+                    "-AoutSrgFile=${mixinSrg}",
+                    "-AoutRefMapFile=${refMap}",
+                    // Elan: from what I understand they are just some linter configs so you get some warning on how to properly code
+                    "-XDenableSunApiLintControl",
+                    "-XDignore.symbol.file"
+            ]
+        }
+    }
+}
 
-    compile "com.mod-buildcraft:buildcraft:${config.buildcraft.version}:dev"
-    compileOnly name: 'CoFHLib', version: config.cofhlib.version, ext: 'jar'
+runClient {
+    def arguments = []
 
-    compile module("mcp.mobius.waila:Waila:${config.waila.version}_${config.minecraft.version}") {
-        transitive = false // WAILA is depending on an invalid combination of CCC/NEI that doesn't run...
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
     }
 
-    compile module("appeng:appliedenergistics2:${config.ae2.version}:dev") {
-        transitive = false // AE2 Depends on a lot of crap, some of it not readily available anywhere that i know
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
     }
+
+    args(arguments)
 }
 
-import org.apache.tools.ant.filters.ReplaceTokens
+runServer {
+    def arguments = []
 
-sourceSets {
-    main {
-        scala {
-            srcDir 'src'
-        }
-        resources {
-            srcDir 'resources'
-        }
+    if (usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
     }
+
+    args(arguments)
 }
 
-processResources {
-    inputs.property "tokens", minecraft.replacements
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        filter(ReplaceTokens, tokens: minecraft.replacements)
+tasks.withType(JavaExec).configureEach {
+    javaLauncher.set(
+            javaToolchains.launcherFor {
+                languageVersion = projectJavaVersion
+            }
+    )
+}
+
+processResources
+        {
+            // this will ensure that this task is redone when the versions change.
+            inputs.property "version", project.version
+            inputs.property "mcversion", project.minecraft.version
+
+            // replace stuff in mcmod.info, nothing else
+            from(sourceSets.main.resources.srcDirs) {
+                include 'mcmod.info'
+
+                // replace version and mcversion
+                expand "minecraftVersion": project.minecraft.version,
+                        "modVersion": versionDetails().lastTag,
+                        "modId": modId,
+                        "modName": modName
+            }
+
+            if(usesMixins.toBoolean()) {
+                from refMap
+            }
+
+            // copy everything else, thats not the mcmod.info
+            from(sourceSets.main.resources.srcDirs) {
+                exclude 'mcmod.info'
+            }
+        }
+
+def getManifestAttributes() {
+    def manifestAttributes = [:]
+    if(containsMixinsAndOrCoreModOnly.toBoolean() == false && (usesMixins.toBoolean() || coreModClass)) {
+        manifestAttributes += ["FMLCorePluginContainsFMLMod": true]
+    }
+
+    if(accessTransformersFile) {
+        manifestAttributes += ["FMLAT" : accessTransformersFile.toString()]
     }
 
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+    if(coreModClass) {
+        manifestAttributes += ["FMLCorePlugin": modGroup + "." + coreModClass]
     }
+
+    if(usesMixins.toBoolean()) {
+        manifestAttributes += [
+                "TweakClass" : "org.spongepowered.asm.launch.MixinTweaker",
+                "MixinConfigs" : "mixins." + modId + ".json",
+                "ForceLoadAsMod" : containsMixinsAndOrCoreModOnly.toBoolean() == false
+        ]
+    }
+    return manifestAttributes
 }
 
-task sourceJar(type: Jar) {
-    classifier "sources"
+task sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
 }
 
-task deobfJar(type: Jar) {
+task shadowDevJar(type: ShadowJar) {
     from sourceSets.main.output
-    exclude "**/*.psd"
-    classifier "dev"
-    duplicatesStrategy "exclude"
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
 }
 
+task relocateShadowDevJar(type: ConfigureShadowRelocation) {
+    target = tasks.shadowDevJar
+    prefix = modGroup + ".shadow"
+}
 
-jar {
-    exclude "**/*.psd"
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
 }
 
-afterEvaluate { project ->
-    // Fudge the inputs of api/source jars so we get the version after replacements
-    tasks.getByPath(":sourceJar").from(tasks.getByPath(":sourceMainScala").outputs.files)
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
+    }
 }
 
-artifacts {
-    archives sourceJar
-    archives deobfJar
+task apiJar(type: Jar) {
+    from (sourceSets.main.allJava) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.output) {
+        include modGroup.toString().replaceAll("\\.", "/") + "/" + apiPackage.toString().replaceAll("\\.", "/") + '/**'
+    }
+
+    from (sourceSets.main.resources.srcDirs) {
+        include("LICENSE")
+    }
+
+    getArchiveClassifier().set('api')
 }
 
-apply plugin: 'maven-publish'
+artifacts {
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
 
+// publishing
 publishing {
     publications {
         maven(MavenPublication) {
-            artifact deobfJar
-            artifact sourceJar
+            artifact source: jar
+            artifact source: sourcesJar, classifier: "src"
+            artifact source: devJar, classifier: "dev"
+            if (apiPackage) {
+                artifact source: apiJar, classifier: "api"
+            }
+
+            groupId = System.getenv("ARTIFACT_GROUP_ID") ?: group
+            artifactId = System.getenv("ARTIFACT_ID") ?: project.name
+            version = System.getenv("ARTIFACT_VERSION") ?: project.version
         }
     }
+    
     repositories {
         maven {
-            url "file://var/www/maven"
+            String owner = System.getenv("REPOSITORY_OWNER") ?: "Unknown"
+            String repositoryName = System.getenv("REPOSITORY_NAME") ?: "Unknown"
+            String githubRepositoryUrl = "https://maven.pkg.github.com/$owner/$repositoryName"
+            name = "GitHubPackages"
+            url = githubRepositoryUrl
+            credentials {
+                username = System.getenv("GITHUB_ACTOR") ?: "NONE"
+                password = System.getenv("GITHUB_TOKEN") ?: "NONE"
+            }
         }
     }
 }
 
+// Updating
+task updateBuildScript {
+    doLast {
+        if (performBuildScriptUpdate(projectDir.toString())) return
+
+        print("Build script already up-to-date!")
+    }
+}
+
+if (isNewBuildScriptVersionAvailable(projectDir.toString())) {
+    if (autoUpdateBuildScript.toBoolean()) {
+        performBuildScriptUpdate(projectDir.toString())
+    } else {
+        println("Build script update available! Run 'gradle updateBuildScript'")
+    }
+}
+
+static URL availableBuildScriptUrl() {
+    new URL("https://raw.githubusercontent.com/SinTh0r4s/ExampleMod1.7.10/main/build.gradle")
+}
+
+boolean performBuildScriptUpdate(String projectDir) {
+    if (isNewBuildScriptVersionAvailable(projectDir)) {
+        def buildscriptFile = getFile("build.gradle")
+        availableBuildScriptUrl().withInputStream { i -> buildscriptFile.withOutputStream { it << i } }
+        print("Build script updated. Please REIMPORT the project or RESTART your IDE!")
+        return true
+    }
+    return false
+}
+
+boolean isNewBuildScriptVersionAvailable(String projectDir) {
+    Map parameters = ["connectTimeout": 2000, "readTimeout": 2000]
+
+    String currentBuildScript = getFile("build.gradle").getText()
+    String currentBuildScriptHash = getVersionHash(currentBuildScript)
+    String availableBuildScript = availableBuildScriptUrl().newInputStream(parameters).getText()
+    String availableBuildScriptHash = getVersionHash(availableBuildScript)
+
+    boolean isUpToDate = currentBuildScriptHash.empty || availableBuildScriptHash.empty || currentBuildScriptHash == availableBuildScriptHash
+    return !isUpToDate
+}
+
+static String getVersionHash(String buildScriptContent) {
+    String versionLine = buildScriptContent.find("^//version: [a-z0-9]*")
+    if(versionLine != null) {
+        return versionLine.split(": ").last()
+    }
+    return ""
+}
+
+configure(updateBuildScript) {
+    group = 'forgegradle'
+    description = 'Updates the build script to the latest version'
+}
+
+// Helper methods
+
+def checkPropertyExists(String propertyName) {
+    if (project.hasProperty(propertyName) == false) {
+        throw new GradleException("This project requires a property \"" + propertyName + "\"! Please add it your \"gradle.properties\". You can find all properties and their description here: https://github.com/SinTh0r4s/ExampleMod1.7.10/blob/main/gradle.properties")
+    }
+}
+
+def getFile(String relativePath) {
+    return new File(projectDir, relativePath)
+}
diff --git a/build.properties b/build.properties
deleted file mode 100644
index 2e54d4b..0000000
--- a/build.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-ae2stuff.version=0.5.1.12-GTNH
-curseforge.id=225194
-
-bdlib.version=1.9.4.109
-
-minecraft.version=1.7.10
-forge.version=10.13.4.1614-1.7.10
-
-ae2.version=rv3-beta-22
-
-nei.version=1.0.5.118
-ccl.version=1.1.3.140
-ccc.version=1.0.7.47
-waila.version=1.5.10
-
-buildcraft.version=7.1.14
-
-cofhlib.cf=2246/918
-cofhlib.version=[1.7.10]1.0.3-175-dev
\ No newline at end of file
diff --git a/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000..04dc939
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,23 @@
+// Add your dependencies here
+
+dependencies {
+    compile("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev")
+    compile("com.github.GTNewHorizons:bdlib:master-SNAPSHOT:dev")
+
+    compileOnly("com.github.GTNewHorizons:waila:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    compileOnly("com.github.GTNewHorizons:CodeChickenLib:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+
+    compileOnly("curse.maven:cofh-lib-220333:2388748") {
+        transitive = false
+    }
+    compileOnly("com.mod-buildcraft:buildcraft:7.1.23:dev") {
+        transitive = false
+    }
+}
diff --git a/gradle.properties b/gradle.properties
new file mode 100644
index 0000000..9d51ac1
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,64 @@
+modName = AE2 Stuff
+
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = ae2stuff
+
+modGroup = net.bdew.ae2stuff
+
+# WHY is there no version field?
+# The build script relies on git to provide a version via tags. It is super easy and will enable you to always know the
+# code base or your binary. Check out this tutorial: https://blog.mattclemente.com/2017/10/13/versioning-with-git-tags/
+
+# Will update your build.gradle automatically whenever an update is available
+autoUpdateBuildScript = false
+
+minecraftVersion = 1.7.10
+forgeVersion = 10.13.4.1614
+
+# Select a username for testing your mod with breakpoints. You may leave this empty for a random user name each time you
+# restart Minecraft in development. Choose this dependent on your mod:
+# Do you need consistent player progressing (for example Thaumcraft)? -> Select a name
+# Do you need to test how your custom blocks interacts with a player that is not the owner? -> leave name empty
+developmentEnvironmentUserName = "Developer"
+
+# Define a source file of your project with:
+# public static final String VERSION = "GRADLETOKEN_VERSION";
+# The string's content will be replaced with your mods version when compiled. You should use this to specify your mod's
+# version in @Mod([...], version = VERSION, [...])
+# Leave these properties empty to skip individual token replacements
+replaceGradleTokenInFile = AE2Stuff.scala
+gradleTokenModId =
+gradleTokenModName =
+gradleTokenVersion = GRADLETOKEN_VERSION
+gradleTokenGroupName =
+
+# In case your mod provides an API for other mods to implement you may declare its package here. Otherwise, you can
+# leave this property empty.
+# Example value: apiPackage = api + modGroup = com.myname.mymodid -> com.myname.mymodid.api
+apiPackage =
+
+# Specify the configuration file for Forge's access transformers here. I must be placed into /src/main/resources/META-INF/
+# Example value: mymodid_at.cfg
+accessTransformersFile = ae2stuff_at.cfg
+
+# Provides setup for Mixins if enabled. If you don't know what mixins are: Keep it disabled!
+usesMixins = false
+# Specify the location of your implementation of IMixinConfigPlugin. Leave it empty otherwise.
+mixinPlugin =
+# Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
+mixinsPackage =
+# Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!
+# This parameter is for legacy compatibility only
+# Example value: coreModClass = asm.FMLPlugin + modGroup = com.myname.mymodid -> com.myname.mymodid.asm.FMLPlugin
+coreModClass =
+# If your project is only a consolidation of mixins or a core mod and does NOT contain a 'normal' mod ( = some class
+# that is annotated with @Mod) you want this to be true. When in doubt: leave it on false!
+containsMixinsAndOrCoreModOnly = false
+
+# If enabled, you may use 'shadowImplementation' for dependencies. They will be integrated in your jar. It is your
+# responsibility check the licence and request permission for distribution, if required.
+usesShadowedDependencies = false
+
+# Optional parameter to customize the produced artifacts. Use this to preserver artifact naming when migrating older
+# projects. New projects should not use this parameter.
+#customArchiveBaseName =
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 99340b4..5c2d1cf 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 674bdda..3ab0b72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
diff --git a/gradlew b/gradlew
index 91a7e26..83f2acf 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,20 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
 ##
@@ -6,20 +22,38 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
-warn ( ) {
+warn () {
     echo "$*"
 }
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
@@ -30,6 +64,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +75,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
@@ -90,7 +105,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -110,10 +125,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,11 +170,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282..9618d8d 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -8,14 +24,14 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +62,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
 
 if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
 
 :win9xME_args
 @rem Slurp the command line arguments.
@@ -60,11 +75,6 @@ set _SKIP=2
 if "x%~1" == "x" goto execute
 
 set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
 
 :execute
 @rem Setup the command line
diff --git a/jitpack.yml b/jitpack.yml
new file mode 100644
index 0000000..09bbb51
--- /dev/null
+++ b/jitpack.yml
@@ -0,0 +1,2 @@
+before_install:
+  - ./gradlew setupCIWorkspace
\ No newline at end of file
diff --git a/repositories.gradle b/repositories.gradle
new file mode 100644
index 0000000..f717fc3
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,10 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        url "https://cursemaven.com"
+    }
+    maven {
+        url = "https://jitpack.io"
+    }
+}
diff --git a/resources/nei_at.cfg b/resources/nei_at.cfg
deleted file mode 100644
index cd2e437..0000000
--- a/resources/nei_at.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-# Shamelessly stolen from NEI
-public net.minecraft.client.gui.inventory.GuiContainer field_146999_f #xSize
-public net.minecraft.client.gui.inventory.GuiContainer field_147000_g #ySize
-public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
-public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
diff --git a/settings.gradle b/settings.gradle
deleted file mode 100644
index f8a2c9e..0000000
--- a/settings.gradle
+++ /dev/null
@@ -1 +0,0 @@
-rootProject.name = 'ae2stuff-rv3'
\ No newline at end of file
diff --git a/src/main/resources/META-INF/ae2stuff_at.cfg b/src/main/resources/META-INF/ae2stuff_at.cfg
new file mode 100644
index 0000000..17e1ce8
--- /dev/null
+++ b/src/main/resources/META-INF/ae2stuff_at.cfg
@@ -0,0 +1,2 @@
+public net.minecraft.client.gui.inventory.GuiContainer field_147003_i #guiLeft
+public net.minecraft.client.gui.inventory.GuiContainer field_147009_r #guiTop
\ No newline at end of file
diff --git a/resources/assets/ae2stuff/config/files.lst b/src/main/resources/assets/ae2stuff/config/files.lst
similarity index 100%
rename from resources/assets/ae2stuff/config/files.lst
rename to src/main/resources/assets/ae2stuff/config/files.lst
diff --git a/resources/assets/ae2stuff/config/recipes.cfg b/src/main/resources/assets/ae2stuff/config/recipes.cfg
similarity index 100%
rename from resources/assets/ae2stuff/config/recipes.cfg
rename to src/main/resources/assets/ae2stuff/config/recipes.cfg
diff --git a/resources/assets/ae2stuff/config/tuning.cfg b/src/main/resources/assets/ae2stuff/config/tuning.cfg
similarity index 100%
rename from resources/assets/ae2stuff/config/tuning.cfg
rename to src/main/resources/assets/ae2stuff/config/tuning.cfg
diff --git a/resources/assets/ae2stuff/lang/de_DE.lang b/src/main/resources/assets/ae2stuff/lang/de_DE.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/de_DE.lang
rename to src/main/resources/assets/ae2stuff/lang/de_DE.lang
diff --git a/resources/assets/ae2stuff/lang/en_US.lang b/src/main/resources/assets/ae2stuff/lang/en_US.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/en_US.lang
rename to src/main/resources/assets/ae2stuff/lang/en_US.lang
diff --git a/resources/assets/ae2stuff/lang/fr_FR.lang b/src/main/resources/assets/ae2stuff/lang/fr_FR.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/fr_FR.lang
rename to src/main/resources/assets/ae2stuff/lang/fr_FR.lang
diff --git a/resources/assets/ae2stuff/lang/hu_HU.lang b/src/main/resources/assets/ae2stuff/lang/hu_HU.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/hu_HU.lang
rename to src/main/resources/assets/ae2stuff/lang/hu_HU.lang
diff --git a/resources/assets/ae2stuff/lang/it_IT.lang b/src/main/resources/assets/ae2stuff/lang/it_IT.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/it_IT.lang
rename to src/main/resources/assets/ae2stuff/lang/it_IT.lang
diff --git a/resources/assets/ae2stuff/lang/ja_JP.lang b/src/main/resources/assets/ae2stuff/lang/ja_JP.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/ja_JP.lang
rename to src/main/resources/assets/ae2stuff/lang/ja_JP.lang
diff --git a/resources/assets/ae2stuff/lang/ko_KR.lang b/src/main/resources/assets/ae2stuff/lang/ko_KR.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/ko_KR.lang
rename to src/main/resources/assets/ae2stuff/lang/ko_KR.lang
diff --git a/resources/assets/ae2stuff/lang/pt_BR.lang b/src/main/resources/assets/ae2stuff/lang/pt_BR.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/pt_BR.lang
rename to src/main/resources/assets/ae2stuff/lang/pt_BR.lang
diff --git a/resources/assets/ae2stuff/lang/ru_RU.lang b/src/main/resources/assets/ae2stuff/lang/ru_RU.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/ru_RU.lang
rename to src/main/resources/assets/ae2stuff/lang/ru_RU.lang
diff --git a/resources/assets/ae2stuff/lang/zh_CN.lang b/src/main/resources/assets/ae2stuff/lang/zh_CN.lang
similarity index 100%
rename from resources/assets/ae2stuff/lang/zh_CN.lang
rename to src/main/resources/assets/ae2stuff/lang/zh_CN.lang
diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/side.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/side.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/encoder/side.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/side.png
diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/encoder/top_off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/encoder/top_on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/encoder/top_on.png
diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main.psd b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main.psd
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/grower/main.psd
rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main.psd
diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/grower/main_off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/grower/main_on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png
diff --git a/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta b/src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta
rename to src/main/resources/assets/ae2stuff/textures/blocks/grower/main_on.png.mcmeta
diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd
rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/lock.psd
diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/icons/lock/off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png b/src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/icons/lock/on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/icons/lock/on.png
diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/inscriber/side.psd
rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side.psd
diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png
diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta
rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/side_on.png.mcmeta
diff --git a/resources/assets/ae2stuff/textures/blocks/inscriber/top.png b/src/main/resources/assets/ae2stuff/textures/blocks/inscriber/top.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/inscriber/top.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/inscriber/top.png
diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/wireless/side_off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/wireless/side_on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/side_on.png
diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/wireless/top_off.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_off.png
diff --git a/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png b/src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/blocks/wireless/top_on.png
rename to src/main/resources/assets/ae2stuff/textures/blocks/wireless/top_on.png
diff --git a/resources/assets/ae2stuff/textures/gui/encoder.png b/src/main/resources/assets/ae2stuff/textures/gui/encoder.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/gui/encoder.png
rename to src/main/resources/assets/ae2stuff/textures/gui/encoder.png
diff --git a/resources/assets/ae2stuff/textures/gui/encoder.psd b/src/main/resources/assets/ae2stuff/textures/gui/encoder.psd
similarity index 100%
rename from resources/assets/ae2stuff/textures/gui/encoder.psd
rename to src/main/resources/assets/ae2stuff/textures/gui/encoder.psd
diff --git a/resources/assets/ae2stuff/textures/gui/grower.png b/src/main/resources/assets/ae2stuff/textures/gui/grower.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/gui/grower.png
rename to src/main/resources/assets/ae2stuff/textures/gui/grower.png
diff --git a/resources/assets/ae2stuff/textures/gui/grower.psd b/src/main/resources/assets/ae2stuff/textures/gui/grower.psd
similarity index 100%
rename from resources/assets/ae2stuff/textures/gui/grower.psd
rename to src/main/resources/assets/ae2stuff/textures/gui/grower.psd
diff --git a/resources/assets/ae2stuff/textures/items/visualiser.png b/src/main/resources/assets/ae2stuff/textures/items/visualiser.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/items/visualiser.png
rename to src/main/resources/assets/ae2stuff/textures/items/visualiser.png
diff --git a/resources/assets/ae2stuff/textures/items/wirelesskit.png b/src/main/resources/assets/ae2stuff/textures/items/wirelesskit.png
similarity index 100%
rename from resources/assets/ae2stuff/textures/items/wirelesskit.png
rename to src/main/resources/assets/ae2stuff/textures/items/wirelesskit.png
diff --git a/resources/mcmod.info b/src/main/resources/mcmod.info
similarity index 63%
rename from resources/mcmod.info
rename to src/main/resources/mcmod.info
index bce3c0a..2780b1b 100644
--- a/resources/mcmod.info
+++ b/src/main/resources/mcmod.info
@@ -1,9 +1,10 @@
 [
 {
-  "modid": "ae2stuff",
-  "name": "AE2 Stuff",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "",
-  "version": "@AE2STUFF_VER@",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "bdew.net",
   "updateUrl": "",
   "authorList": [
diff --git a/src/net/bdew/ae2stuff/AE2Defs.scala b/src/main/scala/net/bdew/ae2stuff/AE2Defs.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/AE2Defs.scala
rename to src/main/scala/net/bdew/ae2stuff/AE2Defs.scala
diff --git a/src/net/bdew/ae2stuff/AE2Stuff.scala b/src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala
similarity index 93%
rename from src/net/bdew/ae2stuff/AE2Stuff.scala
rename to src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala
index 1982da4..f6c42db 100644
--- a/src/net/bdew/ae2stuff/AE2Stuff.scala
+++ b/src/main/scala/net/bdew/ae2stuff/AE2Stuff.scala
@@ -25,7 +25,7 @@ import net.bdew.lib.Event
 import net.bdew.lib.gui.GuiHandler
 import org.apache.logging.log4j.Logger
 
-@Mod(modid = AE2Stuff.modId, version = "AE2STUFF_VER", name = "AE2 Stuff", dependencies = "required-after:appliedenergistics2;required-after:bdlib@[BDLIB_VER,)", modLanguage = "scala")
+@Mod(modid = AE2Stuff.modId, version = "GRADLETOKEN_VERSION", name = "AE2 Stuff", dependencies = "required-after:appliedenergistics2;required-after:bdlib@[1.9.4.109,)", modLanguage = "scala")
 object AE2Stuff {
   var log: Logger = null
   var instance = this
diff --git a/src/net/bdew/ae2stuff/AE2Textures.scala b/src/main/scala/net/bdew/ae2stuff/AE2Textures.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/AE2Textures.scala
rename to src/main/scala/net/bdew/ae2stuff/AE2Textures.scala
diff --git a/src/net/bdew/ae2stuff/CreativeTabs.scala b/src/main/scala/net/bdew/ae2stuff/CreativeTabs.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/CreativeTabs.scala
rename to src/main/scala/net/bdew/ae2stuff/CreativeTabs.scala
diff --git a/src/net/bdew/ae2stuff/Items.scala b/src/main/scala/net/bdew/ae2stuff/Items.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/Items.scala
rename to src/main/scala/net/bdew/ae2stuff/Items.scala
diff --git a/src/net/bdew/ae2stuff/Machines.scala b/src/main/scala/net/bdew/ae2stuff/Machines.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/Machines.scala
rename to src/main/scala/net/bdew/ae2stuff/Machines.scala
diff --git a/src/net/bdew/ae2stuff/Tuning.scala b/src/main/scala/net/bdew/ae2stuff/Tuning.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/Tuning.scala
rename to src/main/scala/net/bdew/ae2stuff/Tuning.scala
diff --git a/src/net/bdew/ae2stuff/compat/AEWrenchHandler.scala b/src/main/scala/net/bdew/ae2stuff/compat/AEWrenchHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/compat/AEWrenchHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/compat/AEWrenchHandler.scala
diff --git a/src/net/bdew/ae2stuff/compat/BCWrenchHandler.scala b/src/main/scala/net/bdew/ae2stuff/compat/BCWrenchHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/compat/BCWrenchHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/compat/BCWrenchHandler.scala
diff --git a/src/net/bdew/ae2stuff/compat/WrenchRegistry.scala b/src/main/scala/net/bdew/ae2stuff/compat/WrenchRegistry.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/compat/WrenchRegistry.scala
rename to src/main/scala/net/bdew/ae2stuff/compat/WrenchRegistry.scala
diff --git a/src/net/bdew/ae2stuff/grid/GridTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/GridTile.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/grid/GridTile.scala
rename to src/main/scala/net/bdew/ae2stuff/grid/GridTile.scala
diff --git a/src/net/bdew/ae2stuff/grid/PoweredTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/PoweredTile.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/grid/PoweredTile.scala
rename to src/main/scala/net/bdew/ae2stuff/grid/PoweredTile.scala
diff --git a/src/net/bdew/ae2stuff/grid/Security.scala b/src/main/scala/net/bdew/ae2stuff/grid/Security.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/grid/Security.scala
rename to src/main/scala/net/bdew/ae2stuff/grid/Security.scala
diff --git a/src/net/bdew/ae2stuff/grid/SleepableTile.scala b/src/main/scala/net/bdew/ae2stuff/grid/SleepableTile.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/grid/SleepableTile.scala
rename to src/main/scala/net/bdew/ae2stuff/grid/SleepableTile.scala
diff --git a/src/net/bdew/ae2stuff/grid/VariableIdlePower.scala b/src/main/scala/net/bdew/ae2stuff/grid/VariableIdlePower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/grid/VariableIdlePower.scala
rename to src/main/scala/net/bdew/ae2stuff/grid/VariableIdlePower.scala
diff --git a/src/net/bdew/ae2stuff/items/ItemWirelessKit.scala b/src/main/scala/net/bdew/ae2stuff/items/ItemWirelessKit.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/items/ItemWirelessKit.scala
rename to src/main/scala/net/bdew/ae2stuff/items/ItemWirelessKit.scala
diff --git a/src/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala
rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/ItemVisualiser.scala
diff --git a/src/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala
rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserOverlayRender.scala
diff --git a/src/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala
rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/VisualiserPlayerTracker.scala
diff --git a/src/net/bdew/ae2stuff/items/visualiser/data.scala b/src/main/scala/net/bdew/ae2stuff/items/visualiser/data.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/items/visualiser/data.scala
rename to src/main/scala/net/bdew/ae2stuff/items/visualiser/data.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/BlockEncoder.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/ContainerEncoder.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/GuiEncoder.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/MachineEncoder.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/TileEncoder.scala
diff --git a/src/net/bdew/ae2stuff/machines/encoder/slots.scala b/src/main/scala/net/bdew/ae2stuff/machines/encoder/slots.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/encoder/slots.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/encoder/slots.scala
diff --git a/src/net/bdew/ae2stuff/machines/grower/BlockGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/BlockGrower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/grower/BlockGrower.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/grower/BlockGrower.scala
diff --git a/src/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/grower/ContainerGrower.scala
diff --git a/src/net/bdew/ae2stuff/machines/grower/GuiGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/GuiGrower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/grower/GuiGrower.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/grower/GuiGrower.scala
diff --git a/src/net/bdew/ae2stuff/machines/grower/MachineGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/MachineGrower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/grower/MachineGrower.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/grower/MachineGrower.scala
diff --git a/src/net/bdew/ae2stuff/machines/grower/TileGrower.scala b/src/main/scala/net/bdew/ae2stuff/machines/grower/TileGrower.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/grower/TileGrower.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/grower/TileGrower.scala
diff --git a/src/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/BlockInscriber.scala
diff --git a/src/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/ContainerInscriber.scala
diff --git a/src/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/GuiInscriber.scala
diff --git a/src/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/MachineInscriber.scala
diff --git a/src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala b/src/main/scala/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/inscriber/TileInscriber.scala
diff --git a/src/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/BlockWireless.scala
diff --git a/src/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/MachineWireless.scala
diff --git a/src/net/bdew/ae2stuff/machines/wireless/TileWireless.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/wireless/TileWireless.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/TileWireless.scala
diff --git a/src/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala b/src/main/scala/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala
rename to src/main/scala/net/bdew/ae2stuff/machines/wireless/WirelessOverlayRender.scala
diff --git a/src/net/bdew/ae2stuff/misc/BlockWrenchable.scala b/src/main/scala/net/bdew/ae2stuff/misc/BlockWrenchable.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/BlockWrenchable.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/BlockWrenchable.scala
diff --git a/src/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala b/src/main/scala/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/ContainerUpgradeable.scala
diff --git a/src/net/bdew/ae2stuff/misc/Icons.scala b/src/main/scala/net/bdew/ae2stuff/misc/Icons.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/Icons.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/Icons.scala
diff --git a/src/net/bdew/ae2stuff/misc/ItemLocationStore.scala b/src/main/scala/net/bdew/ae2stuff/misc/ItemLocationStore.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/ItemLocationStore.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/ItemLocationStore.scala
diff --git a/src/net/bdew/ae2stuff/misc/MachineMaterial.scala b/src/main/scala/net/bdew/ae2stuff/misc/MachineMaterial.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/MachineMaterial.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/MachineMaterial.scala
diff --git a/src/net/bdew/ae2stuff/misc/MouseEventHandler.scala b/src/main/scala/net/bdew/ae2stuff/misc/MouseEventHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/MouseEventHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/MouseEventHandler.scala
diff --git a/src/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala b/src/main/scala/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/OverlayRenderHandler.scala
diff --git a/src/net/bdew/ae2stuff/misc/UpgradeInventory.scala b/src/main/scala/net/bdew/ae2stuff/misc/UpgradeInventory.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/UpgradeInventory.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/UpgradeInventory.scala
diff --git a/src/net/bdew/ae2stuff/misc/UpgradeableHelper.scala b/src/main/scala/net/bdew/ae2stuff/misc/UpgradeableHelper.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/UpgradeableHelper.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/UpgradeableHelper.scala
diff --git a/src/net/bdew/ae2stuff/misc/WidgetSlotLock.scala b/src/main/scala/net/bdew/ae2stuff/misc/WidgetSlotLock.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/misc/WidgetSlotLock.scala
rename to src/main/scala/net/bdew/ae2stuff/misc/WidgetSlotLock.scala
diff --git a/src/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala b/src/main/scala/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/nei/EncoderOverlayHandler.scala
diff --git a/src/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala b/src/main/scala/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/nei/InscriberGuiHandler.scala
diff --git a/src/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala b/src/main/scala/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala
rename to src/main/scala/net/bdew/ae2stuff/nei/NEI_AE2Stuff_Config.scala
diff --git a/src/net/bdew/ae2stuff/network/NetHandler.scala b/src/main/scala/net/bdew/ae2stuff/network/NetHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/network/NetHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/network/NetHandler.scala
diff --git a/src/net/bdew/ae2stuff/network/packets.scala b/src/main/scala/net/bdew/ae2stuff/network/packets.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/network/packets.scala
rename to src/main/scala/net/bdew/ae2stuff/network/packets.scala
diff --git a/src/net/bdew/ae2stuff/waila/BaseDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/BaseDataProvider.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/waila/BaseDataProvider.scala
rename to src/main/scala/net/bdew/ae2stuff/waila/BaseDataProvider.scala
diff --git a/src/net/bdew/ae2stuff/waila/WailaHandler.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaHandler.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/waila/WailaHandler.scala
rename to src/main/scala/net/bdew/ae2stuff/waila/WailaHandler.scala
diff --git a/src/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala
rename to src/main/scala/net/bdew/ae2stuff/waila/WailaPoweredDataProvider.scala
diff --git a/src/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala b/src/main/scala/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala
similarity index 100%
rename from src/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala
rename to src/main/scala/net/bdew/ae2stuff/waila/WailaWirelessDataProvider.scala