Re-organize the project into a better hierarchy.

.gitignore

@@ -3,40 +3,48 @@
 Thumbs.db
 
 # IntelliJ
-/MasterPassword/Java/.idea
-/.idea/*
-!/.idea/encodings.xml
-!/.idea/inspectionProfiles
-!/.idea/projectCodeStyle.xml
-!/.idea/validation.xml
+.idea/*
+!.idea/encodings.xml
+!.idea/inspectionProfiles
+!.idea/projectCodeStyle.xml
+!.idea/validation.xml
 *.iml
-/*.ipr
-/*.iws
+*.ipr
+*.iws
 
 # Xcode IDE
 xcuserdata/
-/DerivedData/
+DerivedData/
 
 # Generated
-MasterPassword/Resources/Media/Images.xcassets/
+/platform-independent/cli-c/VERSION
+/platform-independent/cli-c/mpw-*.tar.gz
+/platform-ios/Resources/Media/Images.xcassets/
 
 # Media
-Press/Background.png
-Press/Front-Page.png
-Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
+public/Press/Background.png
+public/Press/Front-Page.png
+public/Press/MasterPassword_PressKit/MasterPassword_pressrelease_*.pdf
 
-# IPA
-/sendipa/*
-!/sendipa/sendipa.conf
+# Gradle
+build
+!/build
+.gradle
+local.properties
+
+# Maven
+target
+dependency-reduced-pom.xml
 
 # C
-MasterPassword/C/VERSION
-MasterPassword/C/*.o
-MasterPassword/C/mpw-*.tar.gz
-MasterPassword/C/mpw
-MasterPassword/C/mpw-bench
-MasterPassword/C/mpw-tests
-MasterPassword/C/lib/*/.unpacked
-MasterPassword/C/lib/*/.patched
-MasterPassword/C/lib/*/src
-MasterPassword/C/lib/include
+desktop/cli/c/*.o
+desktop/cli/c/mpw-*.tar.gz
+desktop/cli/c/mpw
+desktop/cli/c/mpw-bench
+desktop/cli/c/mpw-tests
+desktop/cli/c/VERSION
+core/c/*.o
+core/c/lib/*/.unpacked
+core/c/lib/*/.patched
+core/c/lib/*/src
+core/c/lib/include