diff --git a/.gitmodules b/.gitmodules
index aef0ecf..78606de 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,10 @@
 [submodule "yapb"]
-	path = yapb
+	path = 3rdparty/yapb
 	url = https://github.com/jeefo/yapb
 
 [submodule "android/extras_src/extras"]
-	path = android/extras_src/extras
+	path = 3rdparty/extras
 	url = https://bitbucket.org/SergioPoverony/cs16client-vgui-menus
+[submodule "3rdparty/regamelite"]
+	path = 3rdparty/regamelite
+	url = https://bitbucket.org/dmitryzhukov/regamelite
diff --git a/android/extras_src/extras b/3rdparty/extras
similarity index 100%
rename from android/extras_src/extras
rename to 3rdparty/extras
diff --git a/3rdparty/regamelite b/3rdparty/regamelite
new file mode 160000
index 0000000..c332be7
--- /dev/null
+++ b/3rdparty/regamelite
@@ -0,0 +1 @@
+Subproject commit c332be731424f2cf0280a7884bfd9889264ca24b
diff --git a/3rdparty/yapb b/3rdparty/yapb
new file mode 160000
index 0000000..9f02b92
--- /dev/null
+++ b/3rdparty/yapb
@@ -0,0 +1 @@
+Subproject commit 9f02b92ee2d3baeeec8b6155ea3e9debf5d318ee
diff --git a/yapb b/yapb
deleted file mode 160000
index b458c51..0000000
--- a/yapb
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b458c513781bd51272170ed93832da08ef278cb3