diff --git a/.gitmodules b/.gitmodules
index a651c04db..e69de29bb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +0,0 @@
-[submodule "Universal-Electricity"]
-	path = Universal-Electricity
-	url = https://github.com/Universal-Electricity/Universal-Electricity
-[submodule "Calclavia-Core"]
-	path = Calclavia-Core
-	url = git@bitbucket.org:calclavia/calclavia-core.git
diff --git a/Calclavia-Core b/Calclavia-Core
deleted file mode 160000
index e8565a102..000000000
--- a/Calclavia-Core
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit e8565a102742614e1a3f1a9b767249c82cbef7b4
diff --git a/Universal-Electricity b/Universal-Electricity
deleted file mode 160000
index c0d32e250..000000000
--- a/Universal-Electricity
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c0d32e2507b3e5efc74dfede53e6c15743fa286e
diff --git a/build.gradle b/build.gradle
index 806812c7f..166ab0fc5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -22,11 +22,17 @@ buildProps.withReader {
 }
 
 version = "${config.version.mod.major}.${config.version.mod.minor}.${config.version.mod.revis}"
-group = "resonant-induction"
+group = "resonantinduction"
 archivesBaseName = "Resonant-Induction"
 
 minecraft {
     version = "${config.version.minecraft}-${config.version.forge}"
+	
+	replaceIn "ResonantInduction.java"
+	replace "@MAJOR@", config.version.mod.major
+	replace "@MINOR@", config.version.mod.minor
+	replace "@REVIS@", config.version.mod.revis
+	replace "@BUILD@", System.getenv("BUILD_NUMBER")
 }
 
 if (System.getenv("BUILD_NUMBER") != null)
@@ -37,23 +43,35 @@ processResources {
 	from 'build.properties'
 }
 
-
 task copyBuildXml(type: Copy) {
     from 'build.properties'
     into 'output'
 }
 
+task apiZip(type: Zip) {
+    classifier = 'api'
+    from sourceSets*.allSource
+    include 'resonantinduction/api/**'
+    destinationDir = file 'output'
+}
+
+artifacts {
+    archives apiZip
+}
+
 jar {
     dependsOn copyBuildXml
     classifier = ''
     destinationDir = file 'output'
 	include('resonantinduction/**')
+	include('assets/**')
+	include('*.png')
 }
 
 repositories {
     maven { url 'http://calclavia.com/maven/' }
 }
 dependencies {
-    compile 'universalelectricity:Universal-Electricity:3.0.0.258:dev'
-    compile 'calclaviacore:calclavia-core:1.0.0.44:dev'
+    compile 'universalelectricity:Universal-Electricity:3.0.0.300:dev'
+    compile 'calclaviacore:calclavia-core:1.0.0.48:dev'
 }
diff --git a/build.properties b/build.properties
index f5692b57d..a6bef0ef5 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,8 @@
 dir.development=./
 dir.mcp=${dir.development}forge/mcp
 version.minecraft=1.6.4
+version.forge=9.11.1.964
+version.universalelectricity=3.0.0
 version.mod.major=0
 version.mod.minor=3
-version.mod.revis=0
-version.universalelectricity=3.0.0
\ No newline at end of file
+version.mod.revis=0
\ No newline at end of file
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 000000000..8a0b282aa
--- /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/src/main/java/resonantinduction/ResonantInduction.java b/src/main/java/resonantinduction/ResonantInduction.java
index 858fcf9ae..138d6c966 100644
--- a/src/main/java/resonantinduction/ResonantInduction.java
+++ b/src/main/java/resonantinduction/ResonantInduction.java
@@ -267,10 +267,10 @@ public class ResonantInduction
 		metadata.modId = ID;
 		metadata.name = NAME;
 		metadata.description = TranslationHelper.getLocal("meta.resonantinduction.description");
-		metadata.url = "http://universalelectricity.com/resonant-induction";
-		metadata.logoFile = "/ri_logo.png";
+		metadata.url = "http://calclavia.com/resonant-induction";
+		metadata.logoFile = "ri_logo.png";
 		metadata.version = VERSION + BUILD_VERSION;
-		metadata.authorList = Arrays.asList(new String[] { "Calclavia", "Aidancbrady" });
+		metadata.authorList = Arrays.asList(new String[] { "Calclavia", "Alex_hawks" });
 		metadata.credits = TranslationHelper.getLocal("meta.resonantinduction.credits");
 		metadata.autogenerated = false;
 
diff --git a/src/main/resources/assets/resonantinduction/languages/en_US.properties b/src/main/resources/assets/resonantinduction/languages/en_US.properties
index 8ecf3782d..bb7ff4d43 100644
--- a/src/main/resources/assets/resonantinduction/languages/en_US.properties
+++ b/src/main/resources/assets/resonantinduction/languages/en_US.properties
@@ -5,7 +5,7 @@
 
 itemGroup.resonantinduction=Resonant Induction
 meta.resonantinduction.description=Resonant Induction is a Minecraft mod focusing on the manipulation of electricity and wireless technology. Ever wanted blazing electrical shocks flying off your evil lairs? You've came to the right place!
-meta.resonantinduction.credits=Thanks to Archadia for the awesome assets!
+meta.resonantinduction.credits=Visit website for credits.
 
 fluid.mixture=Mixture