diff --git a/.gitmodules b/.gitmodules
index e92902458114ad626fae1ce05c297c90cefd4b5a..e4098287aeacee800fb8fd75186f36d1c7cc8df0 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
-[submodule "minidns"]
-	path = minidns
+[submodule "libs/MemorizingTrustManager"]
+	path = libs/MemorizingTrustManager
+	url = https://github.com/iNPUTmice/MemorizingTrustManager.git
+[submodule "libs/minidns"]
+	path = libs/minidns
 	url = https://github.com/rtreffer/minidns.git
-[submodule "openpgpapilib"]
-	path = openpgpapilib
+[submodule "libs/openpgp-api-lib"]
+	path = libs/openpgp-api-lib
 	url = https://github.com/open-keychain/openpgp-api-lib.git
-[submodule "memorizingTrustManager"]
-	path = memorizingTrustManager
-	url = https://github.com/iNPUTmice/MemorizingTrustManager.git
diff --git a/build.gradle b/build.gradle
index c46df4c79add305d3af0371a090da5c3c65eb48a..37d59089a3734c1a59ed9f8b4274d8ffac637d8b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,9 +28,9 @@ repositories {
 }
 
 dependencies {
-	compile project(':minidns')
-	compile project(':openpgpapilib')
-	compile project(':memorizingTrustManager')
+	compile project(':libs/minidns')
+	compile project(':libs/openpgp-api-lib')
+	compile project(':libs/MemorizingTrustManager')
 	compile 'com.android.support:support-v13:19.1.0'
 	compile 'org.bouncycastle:bcprov-jdk15on:1.50'
 	compile 'net.java:otr4j:0.21'
diff --git a/memorizingTrustManager b/libs/MemorizingTrustManager
similarity index 100%
rename from memorizingTrustManager
rename to libs/MemorizingTrustManager
diff --git a/minidns b/libs/minidns
similarity index 100%
rename from minidns
rename to libs/minidns
diff --git a/openpgpapilib b/libs/openpgp-api-lib
similarity index 100%
rename from openpgpapilib
rename to libs/openpgp-api-lib
diff --git a/settings.gradle b/settings.gradle
index 890f1242c5820fc679ab22f8086ab6883bc4f82a..52bfd2b46c67b1fef0afba3512adce6da4031ddd 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,4 +1,4 @@
-include ':memorizingTrustManager'
-include ':minidns'
-include ':openpgpapilib'
+include ':libs/MemorizingTrustManager'
+include ':libs/minidns'
+include ':libs/openpgp-api-lib'
 include ':conversations'