diff --git a/.classpath b/.classpath
deleted file mode 100644
index 2ebdd55..0000000
--- a/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
-	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/.gitignore b/.gitignore
index a80544b..e20d3d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,12 @@
-bin/
-/.gradle/
-/build/
+.settings
+
+# IDE-based
+Forwarder.iml
+out
+.idea
+
+# Gradle
+build
+.gradle
+gradle
+gradlew*
diff --git a/.project b/.project
deleted file mode 100644
index 073e59a..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Forwarder</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
-	</natures>
-</projectDescription>
diff --git a/Client Holocore b/Client Holocore
index 075ae7a..f6266df 160000
--- a/Client Holocore	
+++ b/Client Holocore	
@@ -1 +1 @@
-Subproject commit 075ae7a6ef14b9c3c7d8c802d47d4bafcc6c6656
+Subproject commit f6266df106083e9de18bfc514c6ccc7234408b92
diff --git a/PSWGCommon b/PSWGCommon
index 8505a99..753adac 160000
--- a/PSWGCommon
+++ b/PSWGCommon
@@ -1 +1 @@
-Subproject commit 8505a996c3758d5b1d4054d302474d4cd6979808
+Subproject commit 753adaca225ec1db30c8b72e35bbe216d8def52e