diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..461cede
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/common"]
+	path = libs/common
+	url = https://github.com/irtimmer/limelight-common.git
diff --git a/libs/common b/libs/common
new file mode 160000
index 0000000..cbc9b99
--- /dev/null
+++ b/libs/common
@@ -0,0 +1 @@
+Subproject commit cbc9b99f267af911e54b3aa724732c1e15d048dd
diff --git a/libs/limelight-common.jar b/libs/limelight-common.jar
deleted file mode 100644
index 5a1383c..0000000
Binary files a/libs/limelight-common.jar and /dev/null differ
diff --git a/libs/xpp3-1.1.4c.jar b/libs/xpp3-1.1.4c.jar
deleted file mode 100644
index 451ac82..0000000
Binary files a/libs/xpp3-1.1.4c.jar and /dev/null differ