diff --git a/.gitignore b/.gitignore
index 4c9773a..ec433bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,24 @@
/.idea
.DS_Store
/build
+
+#built application files
+*.apk
+*.ap_
+
+# files for the dex VM
+*.dex
+
+# Java class files
+*.class
+
+# generated files
+bin/
+gen/
+
+# Eclipse project files
+.classpath
+.project
+
+# Android Studio
+*.iml
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0611a28
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,6 @@
+[submodule "ethereumj"]
+ path = ethereumj
+ url = https://github.com/syng-io/ethereumj-android.git
+[submodule "cordova-android"]
+ path = cordova-android
+ url = https://github.com/apache/cordova-android.git
diff --git a/app/app.iml b/app/app.iml
index 0c55f79..3e787c6 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -98,58 +98,58 @@
-
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
diff --git a/cordova-android b/cordova-android
new file mode 160000
index 0000000..892b875
--- /dev/null
+++ b/cordova-android
@@ -0,0 +1 @@
+Subproject commit 892b875867722b072c690234545d79afa9a78ffb
diff --git a/ethereumj b/ethereumj
new file mode 160000
index 0000000..6340cc4
--- /dev/null
+++ b/ethereumj
@@ -0,0 +1 @@
+Subproject commit 6340cc47a4e496c5a25840097d66bfbbb0a557ab
diff --git a/settings.gradle b/settings.gradle
index 140ae72..1e14497 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,7 +1,7 @@
include ':ethereumj-core'
-project(':ethereumj-core').projectDir = new File('../ethereumj/ethereumj-core')
+project(':ethereumj-core').projectDir = new File('ethereumj/ethereumj-core')
include ':ethereumj-core-android'
-project(':ethereumj-core-android').projectDir = new File('../ethereumj/ethereumj-core-android')
+project(':ethereumj-core-android').projectDir = new File('ethereumj/ethereumj-core-android')
include ':cordova-android'
-project(':cordova-android').projectDir = new File('../cordova-android-master/framework')
+project(':cordova-android').projectDir = new File('cordova-android/framework')
include ':app'
\ No newline at end of file
diff --git a/syng-client.iml b/syng-client.iml
deleted file mode 100644
index 9a602d0..0000000
--- a/syng-client.iml
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file