diff --git a/.gitignore b/.gitignore
index 48b1cb6..efbafd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,6 @@
 .mtj.tmp/
 
 # Package Files #
-*.jar
 *.war
 *.ear
 
diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..97d53c0
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,114 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        maven {
+            name = "forge"
+            url = "http://files.minecraftforge.net/maven"
+        }
+        maven {
+            name = "sonatype"
+            url = "https://oss.sonatype.org/content/repositories/snapshots/"
+        }
+    }
+    dependencies {
+        classpath 'net.minecraftforge.gradle:ForgeGradle:1.2-SNAPSHOT'
+    }
+}
+
+apply plugin: 'forge'
+apply plugin: 'maven'
+apply plugin: 'maven-publish'
+
+
+repositories {
+    maven {
+        name = "Modmuss50"
+        url = "http://maven.modmuss50.me/"
+    }
+	
+}
+
+
+def ENV = System.getenv()
+if (ENV.BUILD_NUMBER) {
+    version = "1.1.1.5-" + "${System.getenv().BUILD_NUMBER}"
+} else {
+    version = "1.1.1.5"
+}
+
+minecraft {
+    version = "1.7.10-10.13.4.1448-1.7.10"
+}
+
+group = 'IC2Classic'
+
+task sourceJar(type: Jar) {
+    from sourceSets.main.allSource
+    classifier = 'src'
+}
+
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    classifier = 'dev'
+}
+
+jar {
+    classifier = 'universal'
+}
+
+task apiJar(type: Jar) {
+    from sourceSets.main.allSource
+    from sourceSets.main.output
+
+    classifier = "api"
+}
+
+apiJar.mustRunAfter deobfJar
+
+artifacts {
+    archives sourceJar
+    archives deobfJar
+    archives apiJar
+}
+
+uploadArchives {
+    repositories {
+        mavenDeployer {
+            repository(url: "file:///var/www/maven/")
+            pom {
+                groupId = project.group
+                version = project.version
+                artifactId = project.archivesBaseName
+            }
+
+            pom.project {
+                name project.archivesBaseName
+                packaging 'jar'
+                description 'IC2Classic'
+                url 'https://github.com/TinyModularThings/IC2Classic'
+
+                scm {
+                    url 'https://github.com/TinyModularThings/IC2Classic'
+                    connection 'scm:git:git://github.com/TinyModularThings/IC2Classic.git'
+                    developerConnection 'scm:git:git@github.com/TinyModularThings/IC2Classic.git'
+                }
+
+                issueManagement {
+                    system 'github'
+                    url 'https://github.com/TinyModularThings/IC2Classicissues'
+                }
+
+               
+                developers {
+                    developer {
+                        id 'Speiger'
+                        name 'Speiger'
+                        roles {
+                            role 'developer'
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..085a1cd
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..64a2139
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Sat Jun 06 13:39:31 BST 2015
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100644
index 0000000..91a7e26
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,164 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# 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"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+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
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    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=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..8a0b282
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@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 Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windowz 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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/ic2/api/Direction.java b/src/main/java/ic2/api/Direction.java
similarity index 100%
rename from ic2/api/Direction.java
rename to src/main/java/ic2/api/Direction.java
diff --git a/ic2/api/crops/BaseSeed.java b/src/main/java/ic2/api/crops/BaseSeed.java
similarity index 100%
rename from ic2/api/crops/BaseSeed.java
rename to src/main/java/ic2/api/crops/BaseSeed.java
diff --git a/ic2/api/crops/CropCard.java b/src/main/java/ic2/api/crops/CropCard.java
similarity index 100%
rename from ic2/api/crops/CropCard.java
rename to src/main/java/ic2/api/crops/CropCard.java
diff --git a/ic2/api/crops/Crops.java b/src/main/java/ic2/api/crops/Crops.java
similarity index 100%
rename from ic2/api/crops/Crops.java
rename to src/main/java/ic2/api/crops/Crops.java
diff --git a/ic2/api/crops/ICropTile.java b/src/main/java/ic2/api/crops/ICropTile.java
similarity index 100%
rename from ic2/api/crops/ICropTile.java
rename to src/main/java/ic2/api/crops/ICropTile.java
diff --git a/ic2/api/crops/package-info.java b/src/main/java/ic2/api/crops/package-info.java
similarity index 100%
rename from ic2/api/crops/package-info.java
rename to src/main/java/ic2/api/crops/package-info.java
diff --git a/ic2/api/energy/EnergyNet.java b/src/main/java/ic2/api/energy/EnergyNet.java
similarity index 100%
rename from ic2/api/energy/EnergyNet.java
rename to src/main/java/ic2/api/energy/EnergyNet.java
diff --git a/ic2/api/energy/IEnergyNet.java b/src/main/java/ic2/api/energy/IEnergyNet.java
similarity index 100%
rename from ic2/api/energy/IEnergyNet.java
rename to src/main/java/ic2/api/energy/IEnergyNet.java
diff --git a/ic2/api/energy/IPacketEnergyNet.java b/src/main/java/ic2/api/energy/IPacketEnergyNet.java
similarity index 100%
rename from ic2/api/energy/IPacketEnergyNet.java
rename to src/main/java/ic2/api/energy/IPacketEnergyNet.java
diff --git a/ic2/api/energy/NodeStats.java b/src/main/java/ic2/api/energy/NodeStats.java
similarity index 100%
rename from ic2/api/energy/NodeStats.java
rename to src/main/java/ic2/api/energy/NodeStats.java
diff --git a/ic2/api/energy/PacketStat.java b/src/main/java/ic2/api/energy/PacketStat.java
similarity index 100%
rename from ic2/api/energy/PacketStat.java
rename to src/main/java/ic2/api/energy/PacketStat.java
diff --git a/ic2/api/energy/event/EnergyTileEvent.java b/src/main/java/ic2/api/energy/event/EnergyTileEvent.java
similarity index 100%
rename from ic2/api/energy/event/EnergyTileEvent.java
rename to src/main/java/ic2/api/energy/event/EnergyTileEvent.java
diff --git a/ic2/api/energy/event/EnergyTileLoadEvent.java b/src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java
similarity index 100%
rename from ic2/api/energy/event/EnergyTileLoadEvent.java
rename to src/main/java/ic2/api/energy/event/EnergyTileLoadEvent.java
diff --git a/ic2/api/energy/event/EnergyTileUnloadEvent.java b/src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
similarity index 100%
rename from ic2/api/energy/event/EnergyTileUnloadEvent.java
rename to src/main/java/ic2/api/energy/event/EnergyTileUnloadEvent.java
diff --git a/ic2/api/energy/event/package-info.java b/src/main/java/ic2/api/energy/event/package-info.java
similarity index 100%
rename from ic2/api/energy/event/package-info.java
rename to src/main/java/ic2/api/energy/event/package-info.java
diff --git a/ic2/api/energy/package-info.java b/src/main/java/ic2/api/energy/package-info.java
similarity index 100%
rename from ic2/api/energy/package-info.java
rename to src/main/java/ic2/api/energy/package-info.java
diff --git a/ic2/api/energy/prefab/BasicSink.java b/src/main/java/ic2/api/energy/prefab/BasicSink.java
similarity index 100%
rename from ic2/api/energy/prefab/BasicSink.java
rename to src/main/java/ic2/api/energy/prefab/BasicSink.java
diff --git a/ic2/api/energy/prefab/BasicSource.java b/src/main/java/ic2/api/energy/prefab/BasicSource.java
similarity index 100%
rename from ic2/api/energy/prefab/BasicSource.java
rename to src/main/java/ic2/api/energy/prefab/BasicSource.java
diff --git a/ic2/api/energy/prefab/package-info.java b/src/main/java/ic2/api/energy/prefab/package-info.java
similarity index 100%
rename from ic2/api/energy/prefab/package-info.java
rename to src/main/java/ic2/api/energy/prefab/package-info.java
diff --git a/ic2/api/energy/tile/IEnergyAcceptor.java b/src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergyAcceptor.java
rename to src/main/java/ic2/api/energy/tile/IEnergyAcceptor.java
diff --git a/ic2/api/energy/tile/IEnergyConductor.java b/src/main/java/ic2/api/energy/tile/IEnergyConductor.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergyConductor.java
rename to src/main/java/ic2/api/energy/tile/IEnergyConductor.java
diff --git a/ic2/api/energy/tile/IEnergyConductorColored.java b/src/main/java/ic2/api/energy/tile/IEnergyConductorColored.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergyConductorColored.java
rename to src/main/java/ic2/api/energy/tile/IEnergyConductorColored.java
diff --git a/ic2/api/energy/tile/IEnergyEmitter.java b/src/main/java/ic2/api/energy/tile/IEnergyEmitter.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergyEmitter.java
rename to src/main/java/ic2/api/energy/tile/IEnergyEmitter.java
diff --git a/ic2/api/energy/tile/IEnergySink.java b/src/main/java/ic2/api/energy/tile/IEnergySink.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergySink.java
rename to src/main/java/ic2/api/energy/tile/IEnergySink.java
diff --git a/ic2/api/energy/tile/IEnergySource.java b/src/main/java/ic2/api/energy/tile/IEnergySource.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergySource.java
rename to src/main/java/ic2/api/energy/tile/IEnergySource.java
diff --git a/ic2/api/energy/tile/IEnergySourceInfo.java b/src/main/java/ic2/api/energy/tile/IEnergySourceInfo.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergySourceInfo.java
rename to src/main/java/ic2/api/energy/tile/IEnergySourceInfo.java
diff --git a/ic2/api/energy/tile/IEnergyTile.java b/src/main/java/ic2/api/energy/tile/IEnergyTile.java
similarity index 100%
rename from ic2/api/energy/tile/IEnergyTile.java
rename to src/main/java/ic2/api/energy/tile/IEnergyTile.java
diff --git a/ic2/api/energy/tile/IHeatSource.java b/src/main/java/ic2/api/energy/tile/IHeatSource.java
similarity index 100%
rename from ic2/api/energy/tile/IHeatSource.java
rename to src/main/java/ic2/api/energy/tile/IHeatSource.java
diff --git a/ic2/api/energy/tile/IKineticSource.java b/src/main/java/ic2/api/energy/tile/IKineticSource.java
similarity index 100%
rename from ic2/api/energy/tile/IKineticSource.java
rename to src/main/java/ic2/api/energy/tile/IKineticSource.java
diff --git a/ic2/api/energy/tile/IMetaDelegate.java b/src/main/java/ic2/api/energy/tile/IMetaDelegate.java
similarity index 100%
rename from ic2/api/energy/tile/IMetaDelegate.java
rename to src/main/java/ic2/api/energy/tile/IMetaDelegate.java
diff --git a/ic2/api/energy/tile/IMultiEnergySource.java b/src/main/java/ic2/api/energy/tile/IMultiEnergySource.java
similarity index 100%
rename from ic2/api/energy/tile/IMultiEnergySource.java
rename to src/main/java/ic2/api/energy/tile/IMultiEnergySource.java
diff --git a/ic2/api/energy/tile/package-info.java b/src/main/java/ic2/api/energy/tile/package-info.java
similarity index 100%
rename from ic2/api/energy/tile/package-info.java
rename to src/main/java/ic2/api/energy/tile/package-info.java
diff --git a/ic2/api/energy/usage.txt b/src/main/java/ic2/api/energy/usage.txt
similarity index 100%
rename from ic2/api/energy/usage.txt
rename to src/main/java/ic2/api/energy/usage.txt
diff --git a/ic2/api/event/ExplosionEvent.java b/src/main/java/ic2/api/event/ExplosionEvent.java
similarity index 100%
rename from ic2/api/event/ExplosionEvent.java
rename to src/main/java/ic2/api/event/ExplosionEvent.java
diff --git a/ic2/api/event/FoamEvent.java b/src/main/java/ic2/api/event/FoamEvent.java
similarity index 100%
rename from ic2/api/event/FoamEvent.java
rename to src/main/java/ic2/api/event/FoamEvent.java
diff --git a/ic2/api/event/LaserEvent.java b/src/main/java/ic2/api/event/LaserEvent.java
similarity index 100%
rename from ic2/api/event/LaserEvent.java
rename to src/main/java/ic2/api/event/LaserEvent.java
diff --git a/ic2/api/event/PaintEvent.java b/src/main/java/ic2/api/event/PaintEvent.java
similarity index 100%
rename from ic2/api/event/PaintEvent.java
rename to src/main/java/ic2/api/event/PaintEvent.java
diff --git a/ic2/api/event/RetextureEvent.java b/src/main/java/ic2/api/event/RetextureEvent.java
similarity index 100%
rename from ic2/api/event/RetextureEvent.java
rename to src/main/java/ic2/api/event/RetextureEvent.java
diff --git a/ic2/api/event/package-info.java b/src/main/java/ic2/api/event/package-info.java
similarity index 100%
rename from ic2/api/event/package-info.java
rename to src/main/java/ic2/api/event/package-info.java
diff --git a/ic2/api/event/recipe/CannerRecipe.java b/src/main/java/ic2/api/event/recipe/CannerRecipe.java
similarity index 100%
rename from ic2/api/event/recipe/CannerRecipe.java
rename to src/main/java/ic2/api/event/recipe/CannerRecipe.java
diff --git a/ic2/api/event/recipe/ElectrolyzerRecipeEvent.java b/src/main/java/ic2/api/event/recipe/ElectrolyzerRecipeEvent.java
similarity index 100%
rename from ic2/api/event/recipe/ElectrolyzerRecipeEvent.java
rename to src/main/java/ic2/api/event/recipe/ElectrolyzerRecipeEvent.java
diff --git a/ic2/api/event/recipe/RecipeEvent.java b/src/main/java/ic2/api/event/recipe/RecipeEvent.java
similarity index 100%
rename from ic2/api/event/recipe/RecipeEvent.java
rename to src/main/java/ic2/api/event/recipe/RecipeEvent.java
diff --git a/ic2/api/info/IC2Classic.java b/src/main/java/ic2/api/info/IC2Classic.java
similarity index 100%
rename from ic2/api/info/IC2Classic.java
rename to src/main/java/ic2/api/info/IC2Classic.java
diff --git a/ic2/api/info/IEnergyValueProvider.java b/src/main/java/ic2/api/info/IEnergyValueProvider.java
similarity index 100%
rename from ic2/api/info/IEnergyValueProvider.java
rename to src/main/java/ic2/api/info/IEnergyValueProvider.java
diff --git a/ic2/api/info/IFuelValueProvider.java b/src/main/java/ic2/api/info/IFuelValueProvider.java
similarity index 100%
rename from ic2/api/info/IFuelValueProvider.java
rename to src/main/java/ic2/api/info/IFuelValueProvider.java
diff --git a/ic2/api/info/IWindTicker.java b/src/main/java/ic2/api/info/IWindTicker.java
similarity index 100%
rename from ic2/api/info/IWindTicker.java
rename to src/main/java/ic2/api/info/IWindTicker.java
diff --git a/ic2/api/info/Info.java b/src/main/java/ic2/api/info/Info.java
similarity index 100%
rename from ic2/api/info/Info.java
rename to src/main/java/ic2/api/info/Info.java
diff --git a/ic2/api/info/package-info.java b/src/main/java/ic2/api/info/package-info.java
similarity index 100%
rename from ic2/api/info/package-info.java
rename to src/main/java/ic2/api/info/package-info.java
diff --git a/ic2/api/item/ElectricItem.java b/src/main/java/ic2/api/item/ElectricItem.java
similarity index 100%
rename from ic2/api/item/ElectricItem.java
rename to src/main/java/ic2/api/item/ElectricItem.java
diff --git a/ic2/api/item/IBackupElectricItemManager.java b/src/main/java/ic2/api/item/IBackupElectricItemManager.java
similarity index 100%
rename from ic2/api/item/IBackupElectricItemManager.java
rename to src/main/java/ic2/api/item/IBackupElectricItemManager.java
diff --git a/ic2/api/item/IBlockCuttingBlade.java b/src/main/java/ic2/api/item/IBlockCuttingBlade.java
similarity index 100%
rename from ic2/api/item/IBlockCuttingBlade.java
rename to src/main/java/ic2/api/item/IBlockCuttingBlade.java
diff --git a/ic2/api/item/IBoxable.java b/src/main/java/ic2/api/item/IBoxable.java
similarity index 100%
rename from ic2/api/item/IBoxable.java
rename to src/main/java/ic2/api/item/IBoxable.java
diff --git a/ic2/api/item/IC2Items.java b/src/main/java/ic2/api/item/IC2Items.java
similarity index 100%
rename from ic2/api/item/IC2Items.java
rename to src/main/java/ic2/api/item/IC2Items.java
diff --git a/ic2/api/item/ICustomDamageItem.java b/src/main/java/ic2/api/item/ICustomDamageItem.java
similarity index 100%
rename from ic2/api/item/ICustomDamageItem.java
rename to src/main/java/ic2/api/item/ICustomDamageItem.java
diff --git a/ic2/api/item/IDebuggable.java b/src/main/java/ic2/api/item/IDebuggable.java
similarity index 100%
rename from ic2/api/item/IDebuggable.java
rename to src/main/java/ic2/api/item/IDebuggable.java
diff --git a/ic2/api/item/IElectricItem.java b/src/main/java/ic2/api/item/IElectricItem.java
similarity index 100%
rename from ic2/api/item/IElectricItem.java
rename to src/main/java/ic2/api/item/IElectricItem.java
diff --git a/ic2/api/item/IElectricItemManager.java b/src/main/java/ic2/api/item/IElectricItemManager.java
similarity index 100%
rename from ic2/api/item/IElectricItemManager.java
rename to src/main/java/ic2/api/item/IElectricItemManager.java
diff --git a/ic2/api/item/IItemHudInfo.java b/src/main/java/ic2/api/item/IItemHudInfo.java
similarity index 100%
rename from ic2/api/item/IItemHudInfo.java
rename to src/main/java/ic2/api/item/IItemHudInfo.java
diff --git a/ic2/api/item/IKineticRotor.java b/src/main/java/ic2/api/item/IKineticRotor.java
similarity index 100%
rename from ic2/api/item/IKineticRotor.java
rename to src/main/java/ic2/api/item/IKineticRotor.java
diff --git a/ic2/api/item/ILatheItem.java b/src/main/java/ic2/api/item/ILatheItem.java
similarity index 100%
rename from ic2/api/item/ILatheItem.java
rename to src/main/java/ic2/api/item/ILatheItem.java
diff --git a/ic2/api/item/IMachineUpgradeItem.java b/src/main/java/ic2/api/item/IMachineUpgradeItem.java
similarity index 100%
rename from ic2/api/item/IMachineUpgradeItem.java
rename to src/main/java/ic2/api/item/IMachineUpgradeItem.java
diff --git a/ic2/api/item/IMetalArmor.java b/src/main/java/ic2/api/item/IMetalArmor.java
similarity index 100%
rename from ic2/api/item/IMetalArmor.java
rename to src/main/java/ic2/api/item/IMetalArmor.java
diff --git a/ic2/api/item/IScannerItem.java b/src/main/java/ic2/api/item/IScannerItem.java
similarity index 100%
rename from ic2/api/item/IScannerItem.java
rename to src/main/java/ic2/api/item/IScannerItem.java
diff --git a/ic2/api/item/ISpecialElectricItem.java b/src/main/java/ic2/api/item/ISpecialElectricItem.java
similarity index 100%
rename from ic2/api/item/ISpecialElectricItem.java
rename to src/main/java/ic2/api/item/ISpecialElectricItem.java
diff --git a/ic2/api/item/ITerraformingBP.java b/src/main/java/ic2/api/item/ITerraformingBP.java
similarity index 100%
rename from ic2/api/item/ITerraformingBP.java
rename to src/main/java/ic2/api/item/ITerraformingBP.java
diff --git a/ic2/api/item/IWrenchHandler.java b/src/main/java/ic2/api/item/IWrenchHandler.java
similarity index 100%
rename from ic2/api/item/IWrenchHandler.java
rename to src/main/java/ic2/api/item/IWrenchHandler.java
diff --git a/ic2/api/item/ItemWrapper.java b/src/main/java/ic2/api/item/ItemWrapper.java
similarity index 100%
rename from ic2/api/item/ItemWrapper.java
rename to src/main/java/ic2/api/item/ItemWrapper.java
diff --git a/ic2/api/item/package-info.java b/src/main/java/ic2/api/item/package-info.java
similarity index 100%
rename from ic2/api/item/package-info.java
rename to src/main/java/ic2/api/item/package-info.java
diff --git a/ic2/api/network/INetworkClientTileEntityEventListener.java b/src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java
similarity index 100%
rename from ic2/api/network/INetworkClientTileEntityEventListener.java
rename to src/main/java/ic2/api/network/INetworkClientTileEntityEventListener.java
diff --git a/ic2/api/network/INetworkDataProvider.java b/src/main/java/ic2/api/network/INetworkDataProvider.java
similarity index 100%
rename from ic2/api/network/INetworkDataProvider.java
rename to src/main/java/ic2/api/network/INetworkDataProvider.java
diff --git a/ic2/api/network/INetworkItemEventListener.java b/src/main/java/ic2/api/network/INetworkItemEventListener.java
similarity index 100%
rename from ic2/api/network/INetworkItemEventListener.java
rename to src/main/java/ic2/api/network/INetworkItemEventListener.java
diff --git a/ic2/api/network/INetworkTileEntityEventListener.java b/src/main/java/ic2/api/network/INetworkTileEntityEventListener.java
similarity index 100%
rename from ic2/api/network/INetworkTileEntityEventListener.java
rename to src/main/java/ic2/api/network/INetworkTileEntityEventListener.java
diff --git a/ic2/api/network/INetworkUpdateListener.java b/src/main/java/ic2/api/network/INetworkUpdateListener.java
similarity index 100%
rename from ic2/api/network/INetworkUpdateListener.java
rename to src/main/java/ic2/api/network/INetworkUpdateListener.java
diff --git a/ic2/api/network/NetworkHelper.java b/src/main/java/ic2/api/network/NetworkHelper.java
similarity index 100%
rename from ic2/api/network/NetworkHelper.java
rename to src/main/java/ic2/api/network/NetworkHelper.java
diff --git a/ic2/api/network/package-info.java b/src/main/java/ic2/api/network/package-info.java
similarity index 100%
rename from ic2/api/network/package-info.java
rename to src/main/java/ic2/api/network/package-info.java
diff --git a/ic2/api/package-info.java b/src/main/java/ic2/api/package-info.java
similarity index 100%
rename from ic2/api/package-info.java
rename to src/main/java/ic2/api/package-info.java
diff --git a/ic2/api/reactor/IReactor.java b/src/main/java/ic2/api/reactor/IReactor.java
similarity index 100%
rename from ic2/api/reactor/IReactor.java
rename to src/main/java/ic2/api/reactor/IReactor.java
diff --git a/ic2/api/reactor/IReactorChamber.java b/src/main/java/ic2/api/reactor/IReactorChamber.java
similarity index 100%
rename from ic2/api/reactor/IReactorChamber.java
rename to src/main/java/ic2/api/reactor/IReactorChamber.java
diff --git a/ic2/api/reactor/IReactorComponent.java b/src/main/java/ic2/api/reactor/IReactorComponent.java
similarity index 100%
rename from ic2/api/reactor/IReactorComponent.java
rename to src/main/java/ic2/api/reactor/IReactorComponent.java
diff --git a/ic2/api/reactor/ISteamReactor.java b/src/main/java/ic2/api/reactor/ISteamReactor.java
similarity index 100%
rename from ic2/api/reactor/ISteamReactor.java
rename to src/main/java/ic2/api/reactor/ISteamReactor.java
diff --git a/ic2/api/reactor/ISteamReactorChamber.java b/src/main/java/ic2/api/reactor/ISteamReactorChamber.java
similarity index 100%
rename from ic2/api/reactor/ISteamReactorChamber.java
rename to src/main/java/ic2/api/reactor/ISteamReactorChamber.java
diff --git a/ic2/api/reactor/ISteamReactorComponent.java b/src/main/java/ic2/api/reactor/ISteamReactorComponent.java
similarity index 100%
rename from ic2/api/reactor/ISteamReactorComponent.java
rename to src/main/java/ic2/api/reactor/ISteamReactorComponent.java
diff --git a/ic2/api/reactor/package-info.java b/src/main/java/ic2/api/reactor/package-info.java
similarity index 100%
rename from ic2/api/reactor/package-info.java
rename to src/main/java/ic2/api/reactor/package-info.java
diff --git a/ic2/api/recipe/ICannerBottleRecipeManager.java b/src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java
similarity index 100%
rename from ic2/api/recipe/ICannerBottleRecipeManager.java
rename to src/main/java/ic2/api/recipe/ICannerBottleRecipeManager.java
diff --git a/ic2/api/recipe/ICannerEnrichRecipeManager.java b/src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
similarity index 100%
rename from ic2/api/recipe/ICannerEnrichRecipeManager.java
rename to src/main/java/ic2/api/recipe/ICannerEnrichRecipeManager.java
diff --git a/ic2/api/recipe/ICraftingRecipeManager.java b/src/main/java/ic2/api/recipe/ICraftingRecipeManager.java
similarity index 100%
rename from ic2/api/recipe/ICraftingRecipeManager.java
rename to src/main/java/ic2/api/recipe/ICraftingRecipeManager.java
diff --git a/ic2/api/recipe/IFluidHeatManager.java b/src/main/java/ic2/api/recipe/IFluidHeatManager.java
similarity index 100%
rename from ic2/api/recipe/IFluidHeatManager.java
rename to src/main/java/ic2/api/recipe/IFluidHeatManager.java
diff --git a/ic2/api/recipe/ILiquidAcceptManager.java b/src/main/java/ic2/api/recipe/ILiquidAcceptManager.java
similarity index 100%
rename from ic2/api/recipe/ILiquidAcceptManager.java
rename to src/main/java/ic2/api/recipe/ILiquidAcceptManager.java
diff --git a/ic2/api/recipe/ILiquidHeatExchangerManager.java b/src/main/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
similarity index 100%
rename from ic2/api/recipe/ILiquidHeatExchangerManager.java
rename to src/main/java/ic2/api/recipe/ILiquidHeatExchangerManager.java
diff --git a/ic2/api/recipe/IListRecipeManager.java b/src/main/java/ic2/api/recipe/IListRecipeManager.java
similarity index 100%
rename from ic2/api/recipe/IListRecipeManager.java
rename to src/main/java/ic2/api/recipe/IListRecipeManager.java
diff --git a/ic2/api/recipe/IMachineRecipeManager.java b/src/main/java/ic2/api/recipe/IMachineRecipeManager.java
similarity index 100%
rename from ic2/api/recipe/IMachineRecipeManager.java
rename to src/main/java/ic2/api/recipe/IMachineRecipeManager.java
diff --git a/ic2/api/recipe/IMachineRecipeManagerExt.java b/src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java
similarity index 100%
rename from ic2/api/recipe/IMachineRecipeManagerExt.java
rename to src/main/java/ic2/api/recipe/IMachineRecipeManagerExt.java
diff --git a/ic2/api/recipe/IPatternStorage.java b/src/main/java/ic2/api/recipe/IPatternStorage.java
similarity index 100%
rename from ic2/api/recipe/IPatternStorage.java
rename to src/main/java/ic2/api/recipe/IPatternStorage.java
diff --git a/ic2/api/recipe/IRecipeInput.java b/src/main/java/ic2/api/recipe/IRecipeInput.java
similarity index 100%
rename from ic2/api/recipe/IRecipeInput.java
rename to src/main/java/ic2/api/recipe/IRecipeInput.java
diff --git a/ic2/api/recipe/IScrapboxManager.java b/src/main/java/ic2/api/recipe/IScrapboxManager.java
similarity index 100%
rename from ic2/api/recipe/IScrapboxManager.java
rename to src/main/java/ic2/api/recipe/IScrapboxManager.java
diff --git a/ic2/api/recipe/ISemiFluidFuelManager.java b/src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java
similarity index 100%
rename from ic2/api/recipe/ISemiFluidFuelManager.java
rename to src/main/java/ic2/api/recipe/ISemiFluidFuelManager.java
diff --git a/ic2/api/recipe/RecipeInputFluidContainer.java b/src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java
similarity index 100%
rename from ic2/api/recipe/RecipeInputFluidContainer.java
rename to src/main/java/ic2/api/recipe/RecipeInputFluidContainer.java
diff --git a/ic2/api/recipe/RecipeInputItemStack.java b/src/main/java/ic2/api/recipe/RecipeInputItemStack.java
similarity index 100%
rename from ic2/api/recipe/RecipeInputItemStack.java
rename to src/main/java/ic2/api/recipe/RecipeInputItemStack.java
diff --git a/ic2/api/recipe/RecipeInputOreDict.java b/src/main/java/ic2/api/recipe/RecipeInputOreDict.java
similarity index 100%
rename from ic2/api/recipe/RecipeInputOreDict.java
rename to src/main/java/ic2/api/recipe/RecipeInputOreDict.java
diff --git a/ic2/api/recipe/RecipeOutput.java b/src/main/java/ic2/api/recipe/RecipeOutput.java
similarity index 100%
rename from ic2/api/recipe/RecipeOutput.java
rename to src/main/java/ic2/api/recipe/RecipeOutput.java
diff --git a/ic2/api/recipe/Recipes.java b/src/main/java/ic2/api/recipe/Recipes.java
similarity index 100%
rename from ic2/api/recipe/Recipes.java
rename to src/main/java/ic2/api/recipe/Recipes.java
diff --git a/ic2/api/recipe/package-info.java b/src/main/java/ic2/api/recipe/package-info.java
similarity index 100%
rename from ic2/api/recipe/package-info.java
rename to src/main/java/ic2/api/recipe/package-info.java
diff --git a/ic2/api/tile/ExplosionWhitelist.java b/src/main/java/ic2/api/tile/ExplosionWhitelist.java
similarity index 100%
rename from ic2/api/tile/ExplosionWhitelist.java
rename to src/main/java/ic2/api/tile/ExplosionWhitelist.java
diff --git a/ic2/api/tile/IEnergyStorage.java b/src/main/java/ic2/api/tile/IEnergyStorage.java
similarity index 100%
rename from ic2/api/tile/IEnergyStorage.java
rename to src/main/java/ic2/api/tile/IEnergyStorage.java
diff --git a/ic2/api/tile/IMachine.java b/src/main/java/ic2/api/tile/IMachine.java
similarity index 100%
rename from ic2/api/tile/IMachine.java
rename to src/main/java/ic2/api/tile/IMachine.java
diff --git a/ic2/api/tile/IWrenchable.java b/src/main/java/ic2/api/tile/IWrenchable.java
similarity index 100%
rename from ic2/api/tile/IWrenchable.java
rename to src/main/java/ic2/api/tile/IWrenchable.java
diff --git a/ic2/api/tile/package-info.java b/src/main/java/ic2/api/tile/package-info.java
similarity index 100%
rename from ic2/api/tile/package-info.java
rename to src/main/java/ic2/api/tile/package-info.java
diff --git a/ic2/api/util/IKeyboard.java b/src/main/java/ic2/api/util/IKeyboard.java
similarity index 100%
rename from ic2/api/util/IKeyboard.java
rename to src/main/java/ic2/api/util/IKeyboard.java
diff --git a/ic2/api/util/Keys.java b/src/main/java/ic2/api/util/Keys.java
similarity index 100%
rename from ic2/api/util/Keys.java
rename to src/main/java/ic2/api/util/Keys.java
diff --git a/ic2/api/util/package-info.java b/src/main/java/ic2/api/util/package-info.java
similarity index 100%
rename from ic2/api/util/package-info.java
rename to src/main/java/ic2/api/util/package-info.java