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 b6d2bb9..8544606 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,11 @@
-.gradle/
-.settings/
-bin/
-build/
-doc/
+.settings
+
+# IDE-based
+Client Holocore.iml
+out
+.idea
+
+# Gradle
+.gradle
+gradle
+gradlew*
diff --git a/.project b/.project
deleted file mode 100644
index d3fd460..0000000
--- a/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Client Holocore</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/PSWGCommon b/PSWGCommon
index 8505a99..30536a3 160000
--- a/PSWGCommon
+++ b/PSWGCommon
@@ -1 +1 @@
-Subproject commit 8505a996c3758d5b1d4054d302474d4cd6979808
+Subproject commit 30536a3871fb7b43a5c4905805202383c8b2f7e5
diff --git a/build.gradle b/build.gradle
index aed389b..d2ac452 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,22 +1,25 @@
-apply plugin: 'java'
-
-sourceSets {
-    main {
-        java {
-            srcDirs = ['src']
-        }
-        resources {
-            srcDirs = ['src']
-        }
-    }
+plugins {
+	id 'java'
+	id 'idea'
 }
 
-dependencies {
-	compile project(':PSWGCommon')
-	compile fileTree(dir: 'lib', include: ['*.jar'])
+sourceSets {
+	main {
+		java {
+			srcDir 'src'
+		}
+	}
 }
 
 jar {
 	from sourceSets.main.allSource
-	archiveName = "ClientHolocore.jar"
+	archiveName = "PSWGCommon.jar"
+}
+
+task wrapper(type: Wrapper) {
+	gradleVersion = "4.4"
+}
+
+dependencies {
+	compile project(':PSWGCommon')
 }
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..40825e9
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+include ':PSWGCommon'