diff --git a/.github/scripts/test-no-crash-reports.sh b/.github/scripts/test-no-crash-reports.sh
new file mode 100644
index 0000000..c67e342
--- /dev/null
+++ b/.github/scripts/test-no-crash-reports.sh
@@ -0,0 +1,9 @@
+directory="run/crash-reports"
+if [ -d $directory ]; then
+  echo "Crash reports detected:"
+  cat $directory/*
+  exit 1
+else
+  echo "No crash reports detected"
+  exit 0
+fi
diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
new file mode 100644
index 0000000..a60a2b6
--- /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 minute
+      run: |
+        mkdir run
+        echo "eula=true" > run/eula.txt  
+        timeout 60 ./gradlew runServer || true
+
+    - name: Test no crashes happend
+      run: |
+        chmod +x .github/scripts/test-no-crash-reports.sh
+        .github/scripts/test-no-crash-reports.sh
diff --git a/.github/workflows/release-tags.yml b/.github/workflows/release-tags.yml
new file mode 100644
index 0000000..25c354b
--- /dev/null
+++ b/.github/workflows/release-tags.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: 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
diff --git a/.gitignore b/.gitignore
index b133e6a..558ad12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,25 +1,28 @@
-bin
-libs
-run
-*.class
 .gradle
+.settings
+/.idea/
+/run/
+/build/
+/eclipse/
 .classpath
-build
 .project
-.idea
-*.launch
-# Mobile Tools for Java (J2ME)
-.mtj.tmp/
-
-# Package Files #
-*.jar
-*.war
-*.ear
-
-# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
-hs_err_pid*
-WirelessCraftingTerminal.iml
-WirelessCraftingTerminal.ipr
-WirelessCraftingTerminal.iws
-*.bat
-out/
+/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
diff --git a/build.gradle b/build.gradle
index a879540..18fedd3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,116 +1,529 @@
+//version: 928ecf7feb33a1149538b0e2cd17e3bc5f281428
+/*
+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 {
     repositories {
-        mavenCentral()
-		maven {
-			name = "gt"
-			url = "https://gregtech.overminddl1.com/"
-		}
+        maven {
+            name = "forge"
+            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 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+        classpath 'com.github.GTNewHorizons:ForgeGradle:1.2.4'
     }
 }
 
+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")
+}
+
 apply plugin: 'forge'
-targetCompatibility=7
-sourceCompatibility=7
 
-version = minecraft_version + "-" + aeversion + "-" + wctbuild + "" + wctchannel
-group = wctgroup
-archivesBaseName = wctbasename
+def projectJavaVersion = JavaLanguageVersion.of(8)
+
+java {
+    toolchain {
+        languageVersion.set(projectJavaVersion)
+    }
+}
+
+idea {
+    module {
+        inheritOutputDirs = true
+        downloadJavadoc = true
+        downloadSources = true
+    }
+}
+
+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)
+}
+
+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)
+}
+
+// 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 = modGroup
+if(project.hasProperty("customArchiveBaseName") && customArchiveBaseName) {
+    archivesBaseName = customArchiveBaseName
+}
+else {
+    archivesBaseName = modId
+}
 
 minecraft {
-    version = minecraft_version + "-" + forge_version
+    version = minecraftVersion + "-" + forgeVersion + "-" + minecraftVersion
     runDir = "run"
-	
-    replaceIn "Reference.java"
-    replaceIn "package-info.java"
-	
-	replace "@version@", project.version
+
+    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
+        }
+    }
 }
 
-jar {
-    include "net/p455w0rd/wirelesscraftingterminal/**"
-	include "cofh/api/**"
-    include "assets/**"
-	include "ic2/**"
-    include "mcmod.info"
-    include "pack.mcmeta"
+if(file("addon.gradle").exists()) {
+    apply from: "addon.gradle"
 }
 
-task deobfJar(type: Jar) { // Generate deobfuscated
-    from sourceSets.main.output
-    classifier = 'deobf'
-}
-task sourceJar(type: Jar) { // Generate sources
-    from sourceSets.main.allSource
-    classifier = 'sources'
-}
-tasks.build.dependsOn('sourceJar', 'deobfJar')
-artifacts {
-    archives deobfJar
-    archives sourceJar
-    archives jar
+apply from: 'repositories.gradle'
+
+configurations {
+    implementation.extendsFrom(shadowImplementation)
 }
 
 repositories {
     maven {
-        name "ChickenBones"
-        url "http://chickenbones.net/maven/"
+        name = "Overmind forge repo mirror"
+        url = "https://gregtech.overminddl1.com/"
     }
-	maven { // EnderIO & EnderCore
-		name 'tterrag Repo'
-		url "http://maven.tterrag.com"
-	}
-    maven {
-        url = "http://gregtech.overminddl1.com/"
+    if(usesMixins.toBoolean()) {
+        maven {
+            name = "sponge"
+            url = "https://repo.spongepowered.org/repository/maven-public"
+        }
+        maven {
+            url = "https://jitpack.io"
+        }
     }
-	maven {
-		url "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/"
-	}
 }
 
 dependencies {
-	compile("appeng:appliedenergistics2:rv3-beta-59-GTNH:dev") {
-		transitive = false
+    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")
     }
-	compile("com.enderio:EnderIO:1.7.10-2.3.0.417_beta:dev") {
-		transitive = false
-    }
-	compile "codechicken:NotEnoughItems:1.7.10-1.0.5.120:dev"
-	compile "codechicken:CodeChickenCore:1.7.10-1.0.7.47:dev"
-    compile "codechicken:CodeChickenLib:1.7.10-1.1.3.140:dev"
-	compile "com.enderio.core:EnderCore:1.7.10-0.1.0.25_beta:dev"
-    compile "com.azanor.baubles:Baubles:1.7.10-1.0.1.10:deobf"
 }
 
-sourceSets {
-    main {
-        java {
-            srcDir "src/java/"
-			
-        }
+apply from: 'dependencies.gradle'
 
-        resources {
-            srcDir "src/resources/"
-            include "assets/ae2wct/lang/*.lang",
-                    "assets/ae2wct/textures/gui/*",
-                    "assets/ae2wct/textures/items/*",
-					"assets/ae2wct/textures/cape/*",
-					"mcmod.info",
-                    "pack.mcmeta"
+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())
+    }
+
+    minimize()  // This will only allow shading for actually used classes
+    configurations = [project.configurations.shadowImplementation]
+    dependsOn(relocateShadowJar)
+}
+
+jar {
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(shadowJar)
+        enabled = false
+    }
+}
+
+reobf {
+    if(usesMixins.toBoolean()) {
+        addExtraSrgFile mixinSrg
+    }
+}
+
+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"
+            ]
         }
     }
 }
 
-processResources {
-    from(sourceSets.main.resources.srcDirs) {
-        include 'mcmod.info'
-        expand 'version': project.version, 'mcversion': minecraft_version
+runClient {
+    def arguments = []
+
+    if(usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    if(developmentEnvironmentUserName) {
+        arguments += [
+                "--username",
+                developmentEnvironmentUserName
+        ]
+    }
+
+    args(arguments)
+}
+
+runServer {
+    def arguments = []
+
+    if (usesMixins.toBoolean()) {
+        arguments += [
+                "--mods=../build/libs/$modId-${version}.jar",
+                "--tweakClass org.spongepowered.asm.launch.MixinTweaker"
+        ]
+    }
+
+    args(arguments)
+}
+
+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()]
+    }
+
+    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 sourcesJar(type: Jar) {
+    from (sourceSets.main.allJava)
+    from (file("$projectDir/LICENSE"))
+    getArchiveClassifier().set('sources')
+}
+
+task shadowDevJar(type: ShadowJar) {
+    from sourceSets.main.output
+    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"
+}
+
+task circularResolverJar(type: Jar) {
+    dependsOn(relocateShadowDevJar)
+    dependsOn(shadowDevJar)
+    enabled = false
+}
+
+task devJar(type: Jar) {
+    from sourceSets.main.output
+    getArchiveClassifier().set("dev")
+
+    manifest {
+        attributes(getManifestAttributes())
+    }
+
+    if(usesShadowedDependencies.toBoolean()) {
+        dependsOn(circularResolverJar)
+        enabled = false
     }
 }
 
+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')
+}
+
+artifacts {
+    archives sourcesJar
+    archives devJar
+    if(apiPackage) {
+        archives apiJar
+    }
+}
+
+// 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/dependencies.gradle b/dependencies.gradle
new file mode 100644
index 0000000..fa46acd
--- /dev/null
+++ b/dependencies.gradle
@@ -0,0 +1,17 @@
+// Add your dependencies here
+
+dependencies {
+    implementation "com.github.GTNewHorizons:NotEnoughItems:master-SNAPSHOT:dev"
+    implementation("com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    implementation("com.github.GTNewHorizons:EnderIO:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    implementation("com.github.GTNewHorizons:EnderCore:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+    implementation("com.github.GTNewHorizons:Baubles:master-SNAPSHOT:dev") {
+        transitive = false
+    }
+}
diff --git a/gradle.properties b/gradle.properties
index 3732088..4475e80 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,11 +1,64 @@
-aeversion=rv3
-wctchannel=
-wctbuild=1.8.8.1-GTNH
-wctgroup=net.p455w0rd.wirelesscraftingterminal
-wctbasename=WirelessCraftingTerminal
+modName = AE2 Wireless Crafting Terminal
 
-#########################################################
-# Versions                                              #
-#########################################################
-minecraft_version=1.7.10
-forge_version=10.13.4.1614-1.7.10
\ No newline at end of file
+# This is a case-sensitive string to identify your mod. Convention is to use lower case.
+modId = ae2wct
+
+modGroup = net.p455w0rd.wirelesscraftingterminal
+
+# 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 = Tags.java
+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 =
+
+# 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 3baa851..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 82b0d2f..3ab0b72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Jan 04 01:52:14 CET 2020
 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-4.4.1-bin.zip
diff --git a/gradlew b/gradlew
old mode 100644
new mode 100755
index 91a7e26..83f2acf
--- 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,47 +22,6 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=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"
@@ -61,9 +36,49 @@ while [ -h "$PRG" ] ; do
     fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
+cd "`dirname \"$PRG\"`/" >/dev/null
 APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
+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 () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
@@ -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 "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# 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" "$@"
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..f9da606
--- /dev/null
+++ b/repositories.gradle
@@ -0,0 +1,13 @@
+// Add any additional repositories for your dependencies here
+
+repositories {
+    maven {
+        url = "https://gregtech.overminddl1.com/"
+    }
+    maven {
+        url = "http://downloads.gtnewhorizons.com/Mods_for_Jenkins/"
+    }
+    maven {
+        url = "https://jitpack.io"
+    }
+}
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTInteractionHelper.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItemDescription.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWCTItems.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTermHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/IWirelessCraftingTerminalItem.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/WCTApi.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/MissingIngredientError.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/ModNotInstalled.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/exceptions/RegistrationError.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/grid/ICraftingIssuerHost.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/gui/ICraftingIssuerContainer.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/MachineSource.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTIActionHost.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/networking/security/WCTPlayerSource.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/package-info.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/IIngredient.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/IRecipeBakeable.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/api/recipes/game/ShapedRecipe.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftAmount.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftConfirm.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingCPU.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiCraftingStatus.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiFactory.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/GuiWirelessCraftingTerminal.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTBaseGui.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/WCTGuiConfig.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiScrollbar.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTabButton.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/GuiTrashButton.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/MEGuiTextField.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiButton.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/gui/widgets/WCTGuiCheckBox.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ClientDCInternalInv.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/InternalSlotME.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/ItemRepo.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotDisconnected.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/SlotME.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/me/WCTRenderItem.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/IStateIconTexture.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/client/textures/WCTStateIconsEnum.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WCTGuiHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/WirelessCraftingTerminal.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftAmount.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftConfirm.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingCPU.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerCraftingStatus.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerOpenContext.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/ContainerWirelessCraftingTerminal.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/CraftingCPURecord.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/WCTBaseContainer.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/GuiSync.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/guisync/SyncData.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngCraftingSlot.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/AppEngSlot.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/IOptionalSlotHost.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/NullSlot.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/OptionalSlotFake.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotArmor.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotBooster.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingMatrix.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotCraftingTerm.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotDisabled.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFake.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotFakeCraftingMatrix.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotInaccessible.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotMagnetFilter.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotOutput.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerHotBar.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotPlayerInv.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotTrash.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/container/slot/SlotViewCell.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryBooster.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCraftResult.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryCrafting.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryMagnetFilter.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryTrash.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/inventory/WCTInventoryViewCell.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/registries/EnumCache.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/RandomUtils.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/ReflectionUtils.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/common/utils/WCTLog.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacket.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/WCTPacketHandlerBase.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/INetworkInfo.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/IPacketHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/NetworkHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTClientPacketHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/network/WCTServerPacketHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketConfigSync.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketCraftRequest.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketEmptyTrash.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketInventoryAction.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMEInventoryUpdate.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketMagnetFilter.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketNEIRecipe.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketOpenGui.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketPartialItem.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketProgressBar.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetJobBytes.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSetMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwapSlots.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketSwitchGuis.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketUpdateCPUInfo.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/core/sync/packets/PacketValueConfig.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/creativetab/CreativeTabWCT.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/AchievementHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/ConfigHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/KeybindHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/LocaleHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/NEIRecipeHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/RecipeHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/handlers/VersionCheckHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/Reflected.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/helpers/WirelessTerminalGuiObject.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTAPIImplementation.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTInteractionHelper.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItemDescription.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WCTItems.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/implementation/WirelessAELink.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/EnderIO.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IIntegrationModule.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationHelper.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationNode.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationRegistry.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationSide.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationStage.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/IntegrationType.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/abstraction/INEI.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEI.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEIAEShapedRecipeHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/NEIHelpers/NEICraftingHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/RFItem.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/integration/modules/helpers/NullRFHandler.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemBoosterBGIcon.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemEnum.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemInfinityBooster.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemMagnet.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/items/ItemWirelessCraftingTerminal.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/ClientProxy.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/proxy/CommonProxy.java
diff --git a/src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java b/src/main/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java
similarity index 100%
rename from src/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java
rename to src/main/java/net/p455w0rd/wirelesscraftingterminal/reference/Reference.java
diff --git a/src/resources/CoFH_at.cfg b/src/resources/CoFH_at.cfg
deleted file mode 100644
index b1cf76f..0000000
--- a/src/resources/CoFH_at.cfg
+++ /dev/null
@@ -1,66 +0,0 @@
-# NetherOres
-public net.minecraft.entity.monster.EntityPigZombie func_70835_c(Lnet/minecraft/entity/Entity;)V # becomeAngryAt
-public net.minecraft.entity.monster.EntitySilverfish field_70843_d # allySummonCooldown
-public-f net.minecraft.init.Blocks field_150449_bY # oreNetherQuartz
-
-# MineFactory Reloaded
-protected net.minecraft.util.WeightedRandomFishable * # need it all
-public net.minecraft.entity.EntityList field_75624_e # classToIDMapping
-public net.minecraft.entity.EntityList field_75622_f # stringToIDMapping
-public net.minecraft.entity.monster.EntitySlime func_70799_a(I)V # setSlimeSize
-public net.minecraft.entity.monster.EntityZombie func_82228_a(I)V # startConversion
-public net.minecraft.entity.EntityLivingBase field_70718_bc # recentlyHit
-public-f net.minecraft.init.Blocks field_150432_aD # ice
-public-f net.minecraft.init.Blocks field_150410_aZ # glass_pane
-public-f net.minecraft.init.Items field_151117_aB # milkBucket
-protected net.minecraft.block.Block field_149770_b # unlocalizedName
-public net.minecraft.server.management.PlayerManager func_72690_a(IIZ)Lnet/minecraft/server/management/PlayerManager$PlayerInstance; # getOrCreateChunkWatcher
-public net.minecraft.server.management.PlayerManager$PlayerInstance
-public net.minecraft.server.management.PlayerManager$PlayerInstance field_73263_b # playersWatchingChunk
-public net.minecraft.entity.EntityLiving field_70728_aV # experienceValue
-public net.minecraft.entity.EntityLiving field_82174_bp # equipmentDropChances
-
-# ThermalFoundation
-public net.minecraft.entity.Entity field_70171_ac # inWater
-
-# ThermalDynamics
-public net.minecraft.client.renderer.Tessellator field_147569_p # rawBufferIndex
-public net.minecraft.client.renderer.Tessellator field_78408_v # xOffset
-public net.minecraft.client.renderer.Tessellator field_78407_w # yOffset
-public net.minecraft.client.renderer.Tessellator field_78417_x # zOffset
-public net.minecraft.client.renderer.Tessellator field_78406_i # rawBuffer
-public net.minecraft.client.renderer.Tessellator field_78405_h # vertexCount
-
-# Thermal Expansion
-public net.minecraft.entity.Entity field_83001_bt # invulnerable
-public net.minecraft.entity.Entity field_70178_ae # isImmuneToFire
-public net.minecraft.entity.player.EntityPlayer field_71074_e # itemInUse
-public net.minecraft.server.management.ItemInWorldManager field_73094_o #durabilityRemainingOnBlock
-protected net.minecraft.client.particle.EntityFireworkSparkFX * # everything
-
-# PC Core
-public net.minecraft.client.gui.GuiScreen field_146289_q # fontRenderer
-public net.minecraft.client.gui.inventory.GuiContainer field_147003_i # guiLeft
-public net.minecraft.client.gui.inventory.GuiContainer field_147009_r # guiTop
-public net.minecraft.world.WorldServer field_73068_P # allPlayersSleeping
-
-# CoFH Core
-protected net.minecraft.inventory.Container * # senseless to have private stuff here
-protected net.minecraft.client.gui.inventory.GuiContainer * # senseless to have private stuff here
-protected net.minecraft.client.gui.FontRenderer *()V # all of it
-protected net.minecraft.client.gui.FontRenderer * # all of it
-public net.minecraft.entity.projectile.EntityFishHook * # (nearly) literally everything is private
-
-public net.minecraft.nbt.NBTTagByteArray func_74734_a(Ljava/io/DataOutput;)V # write
-
-protected net.minecraft.entity.player.EntityPlayer field_71072_f # itemInUseCount
-public net.minecraft.item.ItemPickaxe field_150915_c # blocksEffectiveAgainst
-public net.minecraft.item.ItemSpade field_150916_c # blocksEffectiveAgainst
-public net.minecraft.item.ItemAxe field_150917_c # blocksEffectiveAgainst
-public net.minecraft.util.RegistrySimple field_82596_a # registryObjects
-public-f net.minecraft.util.RegistryNamespaced field_148759_a # underlyingIntegerMap
-public net.minecraft.world.World field_72998_d # collidingBoundingBoxes
-
-# WorldProxy
-public-f net.minecraft.world.World *()V # Doesn't matter what it is, we need it public
-public-f net.minecraft.world.WorldServer *()V # Doesn't matter what it is, we need it public
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index b25fac6..7e70ead 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -1,10 +1,10 @@
 [
 {
-  "modid": "ae2wct",
-  "name": "AE2 Wireless Crafting Terminal",
+  "modid": "${modId}",
+  "name": "${modName}",
   "description": "Adds a wireless version of the AE2 Crafting Terminal",
-  "version": "${version}",
-  "mcversion": "${mcversion}",
+  "version": "${modVersion}",
+  "mcversion": "${minecraftVersion}",
   "url": "http://p455w0rd.net/",
   "updateUrl": "",
   "authorList": ["TheRealp455w0rd"],