45 files changed, 3 insertions, 3 deletions
diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/.DS_Store
diff --git a/README.rst b/README.rst
index 6a509d4..4568fff 100644
--- a/README.rst
+++ b/README.rst
@@ -36,7 +36,7 @@ To build the javascript bindings, install emscripten from http://kripken.github.
 To build the android project for Android bindings, run:
 
 	.. code:: bash
-	cd java/android/OlmLibSdk
+	cd android
 	./gradlew clean assembleRelease
 
 Release process
diff --git a/android/.DS_Store b/android/.DS_Store
new file mode 100644
index 0000000..5008ddf
--- /dev/null
+++ b/android/.DS_Store
diff --git a/java/android/OlmLibSdk/README.rst b/android/README.rst
index 6a9eae8..46beaab 100644
--- a/java/android/OlmLibSdk/README.rst
+++ b/android/README.rst
@@ -22,7 +22,7 @@ Add in the dependencies category::
 
 Development
 -----------
-import the project from the ``/java/android/OlmLibSdk`` path.
+import the project from the ``android/`` path.
 
 The project contains some JNI files and some Java wraper files.
 
diff --git a/java/android/OlmLibSdk/build.gradle b/android/build.gradle
index 77ce66e..77ce66e 100644
--- a/java/android/OlmLibSdk/build.gradle
+++ b/android/build.gradle
diff --git a/java/android/OlmLibSdk/gradle.properties b/android/gradle.properties
index 13d64a5..13d64a5 100644
--- a/java/android/OlmLibSdk/gradle.properties
+++ b/android/gradle.properties
diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 13372ae..13372ae 100644
--- a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.jar
+++ b/android/gradle/wrapper/gradle-wrapper.jar
diff --git a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 4ba4622..4ba4622 100644
--- a/java/android/OlmLibSdk/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
diff --git a/java/android/OlmLibSdk/gradlew b/android/gradlew
index 9d82f78..9d82f78 100755
--- a/java/android/OlmLibSdk/gradlew
+++ b/android/gradlew
diff --git a/java/android/OlmLibSdk/gradlew.bat b/android/gradlew.bat
index 8a0b282..8a0b282 100644
--- a/java/android/OlmLibSdk/gradlew.bat
+++ b/android/gradlew.bat
diff --git a/java/android/OlmLibSdk/olm-sdk/build.gradle b/android/olm-sdk/build.gradle
index 9ce4d37..9ce4d37 100644
--- a/java/android/OlmLibSdk/olm-sdk/build.gradle
+++ b/android/olm-sdk/build.gradle
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
index ffbbca1..ffbbca1 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
+++ b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmAccountTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
index 9be6375..9be6375 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
+++ b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmGroupSessionTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
index e08b151..e08b151 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
+++ b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmSessionTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
index b560bff..b560bff 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
+++ b/android/olm-sdk/src/androidTest/java/org/matrix/olm/OlmUtilityTest.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java b/android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
index 4451f7a..4451f7a 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
+++ b/android/olm-sdk/src/androidTest/java/org/matrix/olm/TestHelper.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml b/android/olm-sdk/src/main/AndroidManifest.xml
index 902f2e3..902f2e3 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/AndroidManifest.xml
+++ b/android/olm-sdk/src/main/AndroidManifest.xml
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java b/android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
index 229963f..229963f 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/CommonSerializeUtils.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
index 26c3e60..26c3e60 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmAccount.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
index b0b1a6a..b0b1a6a 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmException.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
index 571bddb..571bddb 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmInboundGroupSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
index c1e6031..c1e6031 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmManager.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
index 08db993..08db993 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmMessage.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
index 0481824..0481824 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmOutboundGroupSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
index da2e963..da2e963 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmSession.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java b/android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
index bf9ef90..bf9ef90 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
+++ b/android/olm-sdk/src/main/java/org/matrix/olm/OlmUtility.java
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk b/android/olm-sdk/src/main/jni/Android.mk
index ffe1f67..97d747c 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Android.mk
+++ b/android/olm-sdk/src/main/jni/Android.mk
@@ -6,7 +6,7 @@ MAJOR := 2
 MINOR := 0
 PATCH := 0
 OLM_VERSION := $(MAJOR).$(MINOR).$(PATCH)
-SRC_ROOT_DIR := ../../../../../../..
+SRC_ROOT_DIR := ../../../../..
 
 $(info LOCAL_PATH=$(LOCAL_PATH))
 $(info SRC_ROOT_DIR=$(SRC_ROOT_DIR))
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk b/android/olm-sdk/src/main/jni/Application.mk
index 6516f5e..6516f5e 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/Application.mk
+++ b/android/olm-sdk/src/main/jni/Application.mk
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp b/android/olm-sdk/src/main/jni/olm_account.cpp
index 40081ac..40081ac 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.cpp
+++ b/android/olm-sdk/src/main/jni/olm_account.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h b/android/olm-sdk/src/main/jni/olm_account.h
index 42b2c2a..42b2c2a 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_account.h
+++ b/android/olm-sdk/src/main/jni/olm_account.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
index 23910bb..23910bb 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
+++ b/android/olm-sdk/src/main/jni/olm_inbound_group_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h b/android/olm-sdk/src/main/jni/olm_inbound_group_session.h
index 00990dd..00990dd 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_inbound_group_session.h
+++ b/android/olm-sdk/src/main/jni/olm_inbound_group_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h b/android/olm-sdk/src/main/jni/olm_jni.h
index e6a49e2..e6a49e2 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni.h
+++ b/android/olm-sdk/src/main/jni/olm_jni.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp b/android/olm-sdk/src/main/jni/olm_jni_helper.cpp
index a1f5c59..a1f5c59 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.cpp
+++ b/android/olm-sdk/src/main/jni/olm_jni_helper.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h b/android/olm-sdk/src/main/jni/olm_jni_helper.h
index a181b32..a181b32 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_jni_helper.h
+++ b/android/olm-sdk/src/main/jni/olm_jni_helper.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp b/android/olm-sdk/src/main/jni/olm_manager.cpp
index 8ee0df7..8ee0df7 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.cpp
+++ b/android/olm-sdk/src/main/jni/olm_manager.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h b/android/olm-sdk/src/main/jni/olm_manager.h
index 5fb6da2..5fb6da2 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_manager.h
+++ b/android/olm-sdk/src/main/jni/olm_manager.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp b/android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
index a821709..a821709 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
+++ b/android/olm-sdk/src/main/jni/olm_outbound_group_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h b/android/olm-sdk/src/main/jni/olm_outbound_group_session.h
index f6abba2..f6abba2 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_outbound_group_session.h
+++ b/android/olm-sdk/src/main/jni/olm_outbound_group_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp b/android/olm-sdk/src/main/jni/olm_session.cpp
index 5ca49db..5ca49db 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.cpp
+++ b/android/olm-sdk/src/main/jni/olm_session.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h b/android/olm-sdk/src/main/jni/olm_session.h
index b8cdd2f..b8cdd2f 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_session.h
+++ b/android/olm-sdk/src/main/jni/olm_session.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp b/android/olm-sdk/src/main/jni/olm_utility.cpp
index f6fe719..f6fe719 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.cpp
+++ b/android/olm-sdk/src/main/jni/olm_utility.cpp
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h b/android/olm-sdk/src/main/jni/olm_utility.h
index de4b290..de4b290 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/jni/olm_utility.h
+++ b/android/olm-sdk/src/main/jni/olm_utility.h
diff --git a/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml b/android/olm-sdk/src/main/res/values/strings.xml
index 93bea1d..93bea1d 100644
--- a/java/android/OlmLibSdk/olm-sdk/src/main/res/values/strings.xml
+++ b/android/olm-sdk/src/main/res/values/strings.xml
diff --git a/java/android/OlmLibSdk/settings.gradle b/android/settings.gradle
index d11302c..d11302c 100644
--- a/java/android/OlmLibSdk/settings.gradle
+++ b/android/settings.gradle