diff --git a/.gitmodules b/.gitmodules index c10e5d70..bba8bfbb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -17,7 +17,7 @@ path = platform-darwin/External/jrswizzle url = git://github.com/jonmarimba/jrswizzle.git [submodule "MasterPassword/Web/js/mpw-js"] - path = platform-independent/web-js/js/mpw-js + path = platform-independent/web/js/mpw-js url = https://github.com/tmthrgd/mpw-js.git [submodule "lib/libsodium"] path = lib/libsodium diff --git a/core/java/tests/src/main/resources/mpw_tests.xml b/core/java/tests/src/main/resources/mpw_tests.xml deleted file mode 120000 index 0176543d..00000000 --- a/core/java/tests/src/main/resources/mpw_tests.xml +++ /dev/null @@ -1 +0,0 @@ -../../../../../mpw_tests.xml \ No newline at end of file diff --git a/gradle/settings.gradle b/gradle/settings.gradle index bfa45923..425cc7b6 100644 --- a/gradle/settings.gradle +++ b/gradle/settings.gradle @@ -7,16 +7,16 @@ try { } include 'masterpassword-core' -project(':masterpassword-core').projectDir = new File( '../core/c' ) +project(':masterpassword-core').projectDir = new File( '../platform-independent/c/core' ) include 'masterpassword-algorithm' -project(':masterpassword-algorithm').projectDir = new File( '../core/java/algorithm' ) +project(':masterpassword-algorithm').projectDir = new File( '../platform-independent/java/core' ) include 'masterpassword-model' -project(':masterpassword-model').projectDir = new File( '../core/java/model' ) +project(':masterpassword-model').projectDir = new File( '../platform-independent/java/model' ) include 'masterpassword-tests' -project(':masterpassword-tests').projectDir = new File( '../core/java/tests' ) +project(':masterpassword-tests').projectDir = new File( '../platform-independent/java/tests' ) include 'masterpassword-gui' project(':masterpassword-gui').projectDir = new File( '../platform-independent/gui-java' ) diff --git a/platform-independent/cli-c/README.md b/platform-independent/c/README.md similarity index 92% rename from platform-independent/cli-c/README.md rename to platform-independent/c/README.md index b2ada816..23118738 100644 --- a/platform-independent/cli-c/README.md +++ b/platform-independent/c/README.md @@ -1,9 +1,13 @@ # Native CLI -This is a command-line terminal interface to the Master Password standard implementation. +The CLI is a command-line terminal interface to the Master Password standard implementation. To use the app, you'll first need to build it, then install it into your system's PATH. +Start by changing into the CLI application directory: + + cd cli + ## Building @@ -15,6 +19,13 @@ Note that the build depends on your system having certain dependencies already i By default, you'll need to have at least `libsodium`, `libjson-c` and `libncurses` installed. +## Building with docker + +To install mpw into a Docker container, make sure you have Docker installed on your system, then run something like: + + docker build -f cli/Dockerfile . + + ## Building with cmake There is also a cmake configuration you can use to build instead of using the `./build` script. While `./build` depends on Bash and is geared toward POSIX systems, cmake is platform-independent. You should use your platform's cmake tools to continue. On POSIX systems, you can do this: diff --git a/platform-independent/cli-c/.gitignore b/platform-independent/c/cli/.gitignore similarity index 100% rename from platform-independent/cli-c/.gitignore rename to platform-independent/c/cli/.gitignore diff --git a/platform-independent/cli-c/CMakeLists.txt b/platform-independent/c/cli/CMakeLists.txt similarity index 80% rename from platform-independent/cli-c/CMakeLists.txt rename to platform-independent/c/cli/CMakeLists.txt index d60f280a..6eb0e5bb 100644 --- a/platform-independent/cli-c/CMakeLists.txt +++ b/platform-independent/c/cli/CMakeLists.txt @@ -123,9 +123,11 @@ endfunction() ### TARGET: MPW if( BUILD_MPW ) # target - add_executable( mpw "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "core/mpw-marshal-util.c" "core/mpw-marshal.c" - "cli/mpw-cli-util.c" "cli/mpw-cli.c" ) - target_include_directories( mpw PUBLIC core cli ) + add_executable( mpw "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" + "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c" + "src/mpw-cli-util.c" "src/mpw-cli.c" ) + target_include_directories( mpw PUBLIC ../core/src src ) + install( TARGETS mpw RUNTIME DESTINATION bin ) # dependencies use_mpw_sodium( mpw required ) @@ -137,23 +139,25 @@ endif() ### TARGET: MPW-BENCH if( BUILD_MPW_BENCH ) # target - add_executable( mpw_bench "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" - "cli/mpw-bench.c" ) - target_include_directories( mpw_bench PUBLIC core cli ) + add_executable( mpw-bench "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" + "src/mpw-bench.c" ) + target_include_directories( mpw-bench PUBLIC ../core/src src ) + install( TARGETS mpw-bench RUNTIME DESTINATION bin ) # dependencies - use_mpw_sodium( mpw_bench required ) + use_mpw_sodium( mpw-bench required ) endif() ### TARGET: MPW-TESTS if( BUILD_MPW_TESTS ) # target - add_executable( mpw_tests "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" - "cli/mpw-tests-util.c" "cli/mpw-tests.c" ) - target_include_directories( mpw_tests PUBLIC core cli ) + add_executable( mpw-tests "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" + "src/mpw-tests-util.c" "src/mpw-tests.c" ) + target_include_directories( mpw-tests PUBLIC ../core/src src ) + install( TARGETS mpw-tests RUNTIME DESTINATION bin ) # dependencies - use_mpw_sodium( mpw_tests required ) - use_mpw_xml( mpw_tests required ) + use_mpw_sodium( mpw-tests required ) + use_mpw_xml( mpw-tests required ) endif() diff --git a/platform-independent/c/cli/Dockerfile b/platform-independent/c/cli/Dockerfile new file mode 100644 index 00000000..daaeb473 --- /dev/null +++ b/platform-independent/c/cli/Dockerfile @@ -0,0 +1,9 @@ +FROM ubuntu +WORKDIR /mpw/cli +ADD . /mpw + +RUN apt-get update && apt -y install cmake libsodium-dev libjson-c-dev libncurses-dev libxml2-dev +RUN cmake -DBUILD_MPW_TESTS=ON . && make install +RUN mpw-tests + +CMD mpw diff --git a/platform-independent/cli-c/bashcomplib b/platform-independent/c/cli/bashcomplib similarity index 100% rename from platform-independent/cli-c/bashcomplib rename to platform-independent/c/cli/bashcomplib diff --git a/platform-independent/cli-c/bashlib b/platform-independent/c/cli/bashlib similarity index 100% rename from platform-independent/cli-c/bashlib rename to platform-independent/c/cli/bashlib diff --git a/platform-independent/cli-c/build b/platform-independent/c/cli/build similarity index 85% rename from platform-independent/cli-c/build rename to platform-independent/c/cli/build index 6d1364ea..d53be3cf 100755 --- a/platform-independent/cli-c/build +++ b/platform-independent/c/cli/build @@ -63,18 +63,18 @@ mpw() { cflags=( "${cflags[@]}" - # library paths - -I"lib/include" # mpw paths - -I"core" -I"cli" + -I"../core/src" -I"src" ) ldflags=( "${ldflags[@]}" ) # build - cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "core/mpw-marshal-util.c" "core/mpw-marshal.c" "cli/mpw-cli-util.c" \ - "${ldflags[@]}" "cli/mpw-cli.c" -o "mpw" + cc "${cflags[@]}" "$@" \ + "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \ + "../core/src/mpw-marshal-util.c" "../core/src/mpw-marshal.c" "src/mpw-cli-util.c" \ + "${ldflags[@]}" "src/mpw-cli.c" -o "mpw" echo "done! You can now run ./mpw-cli-tests, ./install or use ./$_" } @@ -88,18 +88,17 @@ mpw-bench() { cflags=( "${cflags[@]}" - # library paths - -I"lib/include" # mpw paths - -I"core" -I"cli" + -I"../core/src" -I"src" ) ldflags=( "${ldflags[@]}" ) # build - cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" \ - "${ldflags[@]}" "cli/mpw-bench.c" -o "mpw-bench" + cc "${cflags[@]}" "$@" \ + "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" \ + "${ldflags[@]}" "src/mpw-bench.c" -o "mpw-bench" echo "done! You can now use ./$_" } @@ -114,18 +113,17 @@ mpw-tests() { cflags=( "${cflags[@]}" - # library paths - -I"lib/include" # mpw paths - -I"core" -I"cli" + -I"../core/src" -I"src" ) ldflags=( "${ldflags[@]}" ) # build - cc "${cflags[@]}" "$@" "core/base64.c" "core/aes.c" "core/mpw-algorithm.c" "core/mpw-types.c" "core/mpw-util.c" "cli/mpw-tests-util.c" \ - "${ldflags[@]}" "cli/mpw-tests.c" -o "mpw-tests" + cc "${cflags[@]}" "$@" \ + "../core/src/base64.c" "../core/src/aes.c" "../core/src/mpw-algorithm.c" "../core/src/mpw-types.c" "../core/src/mpw-util.c" "src/mpw-tests-util.c" \ + "${ldflags[@]}" "src/mpw-tests.c" -o "mpw-tests" echo "done! You can now use ./$_" } diff --git a/platform-independent/c/cli/clean b/platform-independent/c/cli/clean new file mode 100755 index 00000000..f34e3588 --- /dev/null +++ b/platform-independent/c/cli/clean @@ -0,0 +1,7 @@ +#!/usr/bin/env bash +# +# Clean all generated build files. +set -e +cd "${BASH_SOURCE%/*}" + +rm -vfr mpw mpw-bench mpw-tests diff --git a/platform-independent/cli-c/distribute b/platform-independent/c/cli/distribute similarity index 94% rename from platform-independent/cli-c/distribute rename to platform-independent/c/cli/distribute index d09e5e17..ca9e6830 100755 --- a/platform-independent/cli-c/distribute +++ b/platform-independent/c/cli/distribute @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -cd "${BASH_SOURCE%/*}" +cd "${BASH_SOURCE%/*}/.." tag=$(git describe --exact-match --match '*-cli*') || { echo >&2 "Tree is not at a release tag."; exit 1; } version=$(git describe --match '*-cli*' --long --dirty --broken) [[ $version != *-dirty ]] || { echo >&2 "Tree is dirty, first commit any changes."; exit 1; } @@ -11,7 +11,7 @@ mpwArchive=mpw-$version.tar.gz read -n1 -p "Will prepare and release $mpwArchive. Press a key to continue or ^C to abort." echo "Cleaning .." -( git clean -ffdx . && cd core && git clean -ffdx . ) +git clean -ffdx . echo "Creating archive $mpwArchive .." echo "$version" > VERSION diff --git a/platform-independent/cli-c/install b/platform-independent/c/cli/install similarity index 100% rename from platform-independent/cli-c/install rename to platform-independent/c/cli/install diff --git a/platform-independent/cli-c/mpw-cli-tests b/platform-independent/c/cli/mpw-cli-tests similarity index 100% rename from platform-independent/cli-c/mpw-cli-tests rename to platform-independent/c/cli/mpw-cli-tests diff --git a/platform-independent/cli-c/mpw.bashrc b/platform-independent/c/cli/mpw.bashrc similarity index 100% rename from platform-independent/cli-c/mpw.bashrc rename to platform-independent/c/cli/mpw.bashrc diff --git a/platform-independent/cli-c/mpw.completion.bash b/platform-independent/c/cli/mpw.completion.bash similarity index 100% rename from platform-independent/cli-c/mpw.completion.bash rename to platform-independent/c/cli/mpw.completion.bash diff --git a/core/mpw_tests.xml b/platform-independent/c/cli/mpw_tests.xml similarity index 100% rename from core/mpw_tests.xml rename to platform-independent/c/cli/mpw_tests.xml diff --git a/platform-independent/cli-c/cli/bcrypt.h b/platform-independent/c/cli/src/bcrypt.h similarity index 100% rename from platform-independent/cli-c/cli/bcrypt.h rename to platform-independent/c/cli/src/bcrypt.h diff --git a/platform-independent/cli-c/cli/blf.h b/platform-independent/c/cli/src/blf.h similarity index 100% rename from platform-independent/cli-c/cli/blf.h rename to platform-independent/c/cli/src/blf.h diff --git a/platform-independent/cli-c/cli/blowfish.h b/platform-independent/c/cli/src/blowfish.h similarity index 100% rename from platform-independent/cli-c/cli/blowfish.h rename to platform-independent/c/cli/src/blowfish.h diff --git a/platform-independent/cli-c/cli/mpw-bench.c b/platform-independent/c/cli/src/mpw-bench.c similarity index 100% rename from platform-independent/cli-c/cli/mpw-bench.c rename to platform-independent/c/cli/src/mpw-bench.c diff --git a/platform-independent/cli-c/cli/mpw-cli-util.c b/platform-independent/c/cli/src/mpw-cli-util.c similarity index 100% rename from platform-independent/cli-c/cli/mpw-cli-util.c rename to platform-independent/c/cli/src/mpw-cli-util.c diff --git a/platform-independent/cli-c/cli/mpw-cli-util.h b/platform-independent/c/cli/src/mpw-cli-util.h similarity index 100% rename from platform-independent/cli-c/cli/mpw-cli-util.h rename to platform-independent/c/cli/src/mpw-cli-util.h diff --git a/platform-independent/cli-c/cli/mpw-cli.c b/platform-independent/c/cli/src/mpw-cli.c similarity index 100% rename from platform-independent/cli-c/cli/mpw-cli.c rename to platform-independent/c/cli/src/mpw-cli.c diff --git a/platform-independent/cli-c/cli/mpw-tests-util.c b/platform-independent/c/cli/src/mpw-tests-util.c similarity index 100% rename from platform-independent/cli-c/cli/mpw-tests-util.c rename to platform-independent/c/cli/src/mpw-tests-util.c diff --git a/platform-independent/cli-c/cli/mpw-tests-util.h b/platform-independent/c/cli/src/mpw-tests-util.h similarity index 100% rename from platform-independent/cli-c/cli/mpw-tests-util.h rename to platform-independent/c/cli/src/mpw-tests-util.h diff --git a/platform-independent/cli-c/cli/mpw-tests.c b/platform-independent/c/cli/src/mpw-tests.c similarity index 100% rename from platform-independent/cli-c/cli/mpw-tests.c rename to platform-independent/c/cli/src/mpw-tests.c diff --git a/core/c/build.gradle b/platform-independent/c/core/build.gradle similarity index 100% rename from core/c/build.gradle rename to platform-independent/c/core/build.gradle diff --git a/core/c/src/aes.c b/platform-independent/c/core/src/aes.c similarity index 100% rename from core/c/src/aes.c rename to platform-independent/c/core/src/aes.c diff --git a/core/c/src/aes.h b/platform-independent/c/core/src/aes.h similarity index 100% rename from core/c/src/aes.h rename to platform-independent/c/core/src/aes.h diff --git a/core/c/src/base64.c b/platform-independent/c/core/src/base64.c similarity index 100% rename from core/c/src/base64.c rename to platform-independent/c/core/src/base64.c diff --git a/core/c/src/base64.h b/platform-independent/c/core/src/base64.h similarity index 100% rename from core/c/src/base64.h rename to platform-independent/c/core/src/base64.h diff --git a/core/c/src/mpw-algorithm.c b/platform-independent/c/core/src/mpw-algorithm.c similarity index 100% rename from core/c/src/mpw-algorithm.c rename to platform-independent/c/core/src/mpw-algorithm.c diff --git a/core/c/src/mpw-algorithm.h b/platform-independent/c/core/src/mpw-algorithm.h similarity index 100% rename from core/c/src/mpw-algorithm.h rename to platform-independent/c/core/src/mpw-algorithm.h diff --git a/core/c/src/mpw-algorithm_v0.c b/platform-independent/c/core/src/mpw-algorithm_v0.c similarity index 100% rename from core/c/src/mpw-algorithm_v0.c rename to platform-independent/c/core/src/mpw-algorithm_v0.c diff --git a/core/c/src/mpw-algorithm_v1.c b/platform-independent/c/core/src/mpw-algorithm_v1.c similarity index 100% rename from core/c/src/mpw-algorithm_v1.c rename to platform-independent/c/core/src/mpw-algorithm_v1.c diff --git a/core/c/src/mpw-algorithm_v2.c b/platform-independent/c/core/src/mpw-algorithm_v2.c similarity index 100% rename from core/c/src/mpw-algorithm_v2.c rename to platform-independent/c/core/src/mpw-algorithm_v2.c diff --git a/core/c/src/mpw-algorithm_v3.c b/platform-independent/c/core/src/mpw-algorithm_v3.c similarity index 100% rename from core/c/src/mpw-algorithm_v3.c rename to platform-independent/c/core/src/mpw-algorithm_v3.c diff --git a/core/c/src/mpw-jni.c b/platform-independent/c/core/src/mpw-jni.c similarity index 100% rename from core/c/src/mpw-jni.c rename to platform-independent/c/core/src/mpw-jni.c diff --git a/core/c/src/mpw-jni.h b/platform-independent/c/core/src/mpw-jni.h similarity index 100% rename from core/c/src/mpw-jni.h rename to platform-independent/c/core/src/mpw-jni.h diff --git a/core/c/src/mpw-marshal-util.c b/platform-independent/c/core/src/mpw-marshal-util.c similarity index 100% rename from core/c/src/mpw-marshal-util.c rename to platform-independent/c/core/src/mpw-marshal-util.c diff --git a/core/c/src/mpw-marshal-util.h b/platform-independent/c/core/src/mpw-marshal-util.h similarity index 100% rename from core/c/src/mpw-marshal-util.h rename to platform-independent/c/core/src/mpw-marshal-util.h diff --git a/core/c/src/mpw-marshal.c b/platform-independent/c/core/src/mpw-marshal.c similarity index 100% rename from core/c/src/mpw-marshal.c rename to platform-independent/c/core/src/mpw-marshal.c diff --git a/core/c/src/mpw-marshal.h b/platform-independent/c/core/src/mpw-marshal.h similarity index 100% rename from core/c/src/mpw-marshal.h rename to platform-independent/c/core/src/mpw-marshal.h diff --git a/core/c/src/mpw-types.c b/platform-independent/c/core/src/mpw-types.c similarity index 100% rename from core/c/src/mpw-types.c rename to platform-independent/c/core/src/mpw-types.c diff --git a/core/c/src/mpw-types.h b/platform-independent/c/core/src/mpw-types.h similarity index 100% rename from core/c/src/mpw-types.h rename to platform-independent/c/core/src/mpw-types.h diff --git a/core/c/src/mpw-util.c b/platform-independent/c/core/src/mpw-util.c similarity index 100% rename from core/c/src/mpw-util.c rename to platform-independent/c/core/src/mpw-util.c diff --git a/core/c/src/mpw-util.h b/platform-independent/c/core/src/mpw-util.h similarity index 100% rename from core/c/src/mpw-util.h rename to platform-independent/c/core/src/mpw-util.h diff --git a/platform-independent/cli-c/clean b/platform-independent/cli-c/clean deleted file mode 100755 index 00fa656e..00000000 --- a/platform-independent/cli-c/clean +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# -# Clean all generated build files. -set -e -cd "${BASH_SOURCE%/*}" - -rm -vfr lib/*/{.unpacked,.patched,src} lib/include -rm -vfr {core,cli,.}/{*.o,*.dSYM} mpw mpw-bench mpw-tests diff --git a/platform-independent/cli-c/core b/platform-independent/cli-c/core deleted file mode 120000 index bb825c69..00000000 --- a/platform-independent/cli-c/core +++ /dev/null @@ -1 +0,0 @@ -../../core/c/src \ No newline at end of file diff --git a/platform-independent/cli-c/lib b/platform-independent/cli-c/lib deleted file mode 120000 index c2307820..00000000 --- a/platform-independent/cli-c/lib +++ /dev/null @@ -1 +0,0 @@ -core/lib \ No newline at end of file diff --git a/platform-independent/cli-c/mpw_tests.xml b/platform-independent/cli-c/mpw_tests.xml deleted file mode 120000 index 89a4ee29..00000000 --- a/platform-independent/cli-c/mpw_tests.xml +++ /dev/null @@ -1 +0,0 @@ -../../core/mpw_tests.xml \ No newline at end of file diff --git a/core/java/algorithm/build.gradle b/platform-independent/java/core/algorithm/build.gradle similarity index 100% rename from core/java/algorithm/build.gradle rename to platform-independent/java/core/algorithm/build.gradle diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithm.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPAlgorithmException.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPException.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPIdenticon.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyPurpose.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPKeyUnavailableException.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPMasterKey.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultType.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPResultTypeClass.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPSiteFeature.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplate.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/MPTemplateCharacterClass.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV0.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV1.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV2.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/MPAlgorithmV3.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/Native.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/impl/package-info.java diff --git a/core/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java b/platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java similarity index 100% rename from core/java/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java rename to platform-independent/java/core/algorithm/src/main/java/com/lyndir/masterpassword/package-info.java diff --git a/core/java/model/build.gradle b/platform-independent/java/core/model/build.gradle similarity index 100% rename from core/java/model/build.gradle rename to platform-independent/java/core/model/build.gradle diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPConstant.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPIncorrectMasterPasswordException.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPQuestion.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSite.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPSiteResult.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUser.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/MPUserManager.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicQuestion.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicSite.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPBasicUser.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileQuestion.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileSite.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUser.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFileUserManager.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatMarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPFlatUnmarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONAnyObject.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONFile.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONMarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPJSONUnmarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalException.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshalFormat.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPMarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/MPUnmarshaller.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/impl/package-info.java diff --git a/core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java b/platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java similarity index 100% rename from core/java/model/src/main/java/com/lyndir/masterpassword/model/package-info.java rename to platform-independent/java/core/model/src/main/java/com/lyndir/masterpassword/model/package-info.java diff --git a/core/java/tests/build.gradle b/platform-independent/java/core/tests/build.gradle similarity index 100% rename from core/java/tests/build.gradle rename to platform-independent/java/core/tests/build.gradle diff --git a/core/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java b/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java similarity index 100% rename from core/java/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java rename to platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTestSuite.java diff --git a/core/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java b/platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java similarity index 100% rename from core/java/tests/src/main/java/com/lyndir/masterpassword/MPTests.java rename to platform-independent/java/core/tests/src/main/java/com/lyndir/masterpassword/MPTests.java diff --git a/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml b/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml new file mode 120000 index 00000000..2e9edd37 --- /dev/null +++ b/platform-independent/java/core/tests/src/main/resources/mpw_tests.xml @@ -0,0 +1 @@ +../../../../../../c/cli/mpw_tests.xml \ No newline at end of file diff --git a/core/java/tests/src/main/resources/test.mpsites.json b/platform-independent/java/core/tests/src/main/resources/test.mpsites.json similarity index 100% rename from core/java/tests/src/main/resources/test.mpsites.json rename to platform-independent/java/core/tests/src/main/resources/test.mpsites.json diff --git a/core/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java b/platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java similarity index 100% rename from core/java/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java rename to platform-independent/java/core/tests/src/test/java/com/lyndir/masterpassword/MPMasterKeyTest.java diff --git a/core/java/tests/src/test/resources/logback.xml b/platform-independent/java/core/tests/src/test/resources/logback.xml similarity index 100% rename from core/java/tests/src/test/resources/logback.xml rename to platform-independent/java/core/tests/src/test/resources/logback.xml diff --git a/platform-independent/gui-java/build.gradle b/platform-independent/java/gui/build.gradle similarity index 100% rename from platform-independent/gui-java/build.gradle rename to platform-independent/java/gui/build.gradle diff --git a/platform-independent/gui-java/masterpassword.keystore b/platform-independent/java/gui/masterpassword.keystore similarity index 100% rename from platform-independent/gui-java/masterpassword.keystore rename to platform-independent/java/gui/masterpassword.keystore diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/Config.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Config.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/Config.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/GUI.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/GUI.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/GUI.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/Res.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/Res.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/Res.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoQuestion.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoSite.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoSite.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoSite.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoSite.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/MPIncognitoUser.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/model/package-info.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/package-info.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/package-info.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/package-info.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/platform/mac/AppleGUI.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/package-info.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/platform/mac/package-info.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/platform/mac/package-info.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/platform/mac/package-info.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/Components.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/Components.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/UnsignedIntegerModel.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/util/package-info.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/AuthenticationPanel.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/IncognitoAuthenticationPanel.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/ModelAuthenticationPanel.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/PasswordFrame.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/UnlockFrame.java diff --git a/platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/package-info.java b/platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/package-info.java similarity index 100% rename from platform-independent/gui-java/src/main/java/com/lyndir/masterpassword/gui/view/package-info.java rename to platform-independent/java/gui/src/main/java/com/lyndir/masterpassword/gui/view/package-info.java diff --git a/platform-independent/gui-java/src/main/resources/fonts/Arimo-Bold.ttf b/platform-independent/java/gui/src/main/resources/fonts/Arimo-Bold.ttf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Arimo-Bold.ttf rename to platform-independent/java/gui/src/main/resources/fonts/Arimo-Bold.ttf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Arimo-BoldItalic.ttf b/platform-independent/java/gui/src/main/resources/fonts/Arimo-BoldItalic.ttf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Arimo-BoldItalic.ttf rename to platform-independent/java/gui/src/main/resources/fonts/Arimo-BoldItalic.ttf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Arimo-Italic.ttf b/platform-independent/java/gui/src/main/resources/fonts/Arimo-Italic.ttf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Arimo-Italic.ttf rename to platform-independent/java/gui/src/main/resources/fonts/Arimo-Italic.ttf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Arimo-Regular.ttf b/platform-independent/java/gui/src/main/resources/fonts/Arimo-Regular.ttf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Arimo-Regular.ttf rename to platform-independent/java/gui/src/main/resources/fonts/Arimo-Regular.ttf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Emoticons-Regular.otf b/platform-independent/java/gui/src/main/resources/fonts/Emoticons-Regular.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Emoticons-Regular.otf rename to platform-independent/java/gui/src/main/resources/fonts/Emoticons-Regular.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Bold.otf b/platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Bold.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Bold.otf rename to platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Bold.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Exo2.0-ExtraBold.otf b/platform-independent/java/gui/src/main/resources/fonts/Exo2.0-ExtraBold.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Exo2.0-ExtraBold.otf rename to platform-independent/java/gui/src/main/resources/fonts/Exo2.0-ExtraBold.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Regular.otf b/platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Regular.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Regular.otf rename to platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Regular.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Thin.otf b/platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Thin.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/Exo2.0-Thin.otf rename to platform-independent/java/gui/src/main/resources/fonts/Exo2.0-Thin.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-Bold.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-Bold.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-Bold.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-Bold.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-ExtraLight.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-ExtraLight.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-ExtraLight.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-ExtraLight.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-Regular.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-Regular.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceCodePro-Regular.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceCodePro-Regular.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Black.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Black.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Black.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Black.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-BlackIt.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-BlackIt.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-BlackIt.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-BlackIt.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Bold.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Bold.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Bold.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Bold.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-BoldIt.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-BoldIt.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-BoldIt.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-BoldIt.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-ExtraLight.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-ExtraLight.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-ExtraLight.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-ExtraLight.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-ExtraLightIt.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-ExtraLightIt.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-ExtraLightIt.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-ExtraLightIt.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-It.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-It.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-It.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-It.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Light.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Light.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Light.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Light.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-LightIt.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-LightIt.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-LightIt.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-LightIt.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Regular.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Regular.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Regular.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Regular.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Semibold.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Semibold.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-Semibold.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-Semibold.otf diff --git a/platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-SemiboldIt.otf b/platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-SemiboldIt.otf similarity index 100% rename from platform-independent/gui-java/src/main/resources/fonts/SourceSansPro-SemiboldIt.otf rename to platform-independent/java/gui/src/main/resources/fonts/SourceSansPro-SemiboldIt.otf diff --git a/platform-independent/gui-java/src/main/resources/logback.xml b/platform-independent/java/gui/src/main/resources/logback.xml similarity index 100% rename from platform-independent/gui-java/src/main/resources/logback.xml rename to platform-independent/java/gui/src/main/resources/logback.xml diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-0.png b/platform-independent/java/gui/src/main/resources/media/avatar-0.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-0.png rename to platform-independent/java/gui/src/main/resources/media/avatar-0.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-0@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-0@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-0@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-0@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-1.png b/platform-independent/java/gui/src/main/resources/media/avatar-1.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-1.png rename to platform-independent/java/gui/src/main/resources/media/avatar-1.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-10.png b/platform-independent/java/gui/src/main/resources/media/avatar-10.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-10.png rename to platform-independent/java/gui/src/main/resources/media/avatar-10.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-10@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-10@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-10@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-10@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-11.png b/platform-independent/java/gui/src/main/resources/media/avatar-11.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-11.png rename to platform-independent/java/gui/src/main/resources/media/avatar-11.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-11@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-11@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-11@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-11@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-12.png b/platform-independent/java/gui/src/main/resources/media/avatar-12.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-12.png rename to platform-independent/java/gui/src/main/resources/media/avatar-12.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-12@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-12@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-12@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-12@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-13.png b/platform-independent/java/gui/src/main/resources/media/avatar-13.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-13.png rename to platform-independent/java/gui/src/main/resources/media/avatar-13.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-13@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-13@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-13@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-13@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-14.png b/platform-independent/java/gui/src/main/resources/media/avatar-14.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-14.png rename to platform-independent/java/gui/src/main/resources/media/avatar-14.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-14@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-14@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-14@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-14@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-15.png b/platform-independent/java/gui/src/main/resources/media/avatar-15.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-15.png rename to platform-independent/java/gui/src/main/resources/media/avatar-15.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-15@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-15@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-15@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-15@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-16.png b/platform-independent/java/gui/src/main/resources/media/avatar-16.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-16.png rename to platform-independent/java/gui/src/main/resources/media/avatar-16.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-16@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-16@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-16@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-16@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-17.png b/platform-independent/java/gui/src/main/resources/media/avatar-17.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-17.png rename to platform-independent/java/gui/src/main/resources/media/avatar-17.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-17@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-17@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-17@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-17@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-18.png b/platform-independent/java/gui/src/main/resources/media/avatar-18.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-18.png rename to platform-independent/java/gui/src/main/resources/media/avatar-18.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-18@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-18@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-18@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-18@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-1@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-1@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-1@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-1@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-2.png b/platform-independent/java/gui/src/main/resources/media/avatar-2.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-2.png rename to platform-independent/java/gui/src/main/resources/media/avatar-2.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-2@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-2@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-2@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-2@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-3.png b/platform-independent/java/gui/src/main/resources/media/avatar-3.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-3.png rename to platform-independent/java/gui/src/main/resources/media/avatar-3.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-3@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-3@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-3@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-3@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-4.png b/platform-independent/java/gui/src/main/resources/media/avatar-4.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-4.png rename to platform-independent/java/gui/src/main/resources/media/avatar-4.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-4@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-4@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-4@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-4@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-5.png b/platform-independent/java/gui/src/main/resources/media/avatar-5.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-5.png rename to platform-independent/java/gui/src/main/resources/media/avatar-5.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-5@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-5@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-5@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-5@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-6.png b/platform-independent/java/gui/src/main/resources/media/avatar-6.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-6.png rename to platform-independent/java/gui/src/main/resources/media/avatar-6.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-6@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-6@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-6@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-6@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-7.png b/platform-independent/java/gui/src/main/resources/media/avatar-7.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-7.png rename to platform-independent/java/gui/src/main/resources/media/avatar-7.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-7@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-7@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-7@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-7@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-8.png b/platform-independent/java/gui/src/main/resources/media/avatar-8.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-8.png rename to platform-independent/java/gui/src/main/resources/media/avatar-8.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-8@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-8@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-8@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-8@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-9.png b/platform-independent/java/gui/src/main/resources/media/avatar-9.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-9.png rename to platform-independent/java/gui/src/main/resources/media/avatar-9.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-9@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-9@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-9@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-9@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-add.png b/platform-independent/java/gui/src/main/resources/media/avatar-add.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-add.png rename to platform-independent/java/gui/src/main/resources/media/avatar-add.png diff --git a/platform-independent/gui-java/src/main/resources/media/avatar-add@2x.png b/platform-independent/java/gui/src/main/resources/media/avatar-add@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/avatar-add@2x.png rename to platform-independent/java/gui/src/main/resources/media/avatar-add@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_add.png b/platform-independent/java/gui/src/main/resources/media/icon_add.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_add.png rename to platform-independent/java/gui/src/main/resources/media/icon_add.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_add@2x.png b/platform-independent/java/gui/src/main/resources/media/icon_add@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_add@2x.png rename to platform-independent/java/gui/src/main/resources/media/icon_add@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_delete.png b/platform-independent/java/gui/src/main/resources/media/icon_delete.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_delete.png rename to platform-independent/java/gui/src/main/resources/media/icon_delete.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_delete@2x.png b/platform-independent/java/gui/src/main/resources/media/icon_delete@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_delete@2x.png rename to platform-independent/java/gui/src/main/resources/media/icon_delete@2x.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_question.png b/platform-independent/java/gui/src/main/resources/media/icon_question.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_question.png rename to platform-independent/java/gui/src/main/resources/media/icon_question.png diff --git a/platform-independent/gui-java/src/main/resources/media/icon_question@2x.png b/platform-independent/java/gui/src/main/resources/media/icon_question@2x.png similarity index 100% rename from platform-independent/gui-java/src/main/resources/media/icon_question@2x.png rename to platform-independent/java/gui/src/main/resources/media/icon_question@2x.png diff --git a/platform-independent/web-js/.gitignore b/platform-independent/web/.gitignore similarity index 100% rename from platform-independent/web-js/.gitignore rename to platform-independent/web/.gitignore diff --git a/platform-independent/web-js/css/main.css b/platform-independent/web/css/main.css similarity index 100% rename from platform-independent/web-js/css/main.css rename to platform-independent/web/css/main.css diff --git a/platform-independent/web-js/img/spinner.svg b/platform-independent/web/img/spinner.svg similarity index 100% rename from platform-independent/web-js/img/spinner.svg rename to platform-independent/web/img/spinner.svg diff --git a/platform-independent/web-js/index.html b/platform-independent/web/index.html similarity index 100% rename from platform-independent/web-js/index.html rename to platform-independent/web/index.html diff --git a/platform-independent/web-js/js/Makefile b/platform-independent/web/js/Makefile similarity index 100% rename from platform-independent/web-js/js/Makefile rename to platform-independent/web/js/Makefile diff --git a/platform-independent/web-js/js/README.md b/platform-independent/web/js/README.md similarity index 100% rename from platform-independent/web-js/js/README.md rename to platform-independent/web/js/README.md diff --git a/platform-independent/web-js/js/dependencies.js b/platform-independent/web/js/dependencies.js similarity index 100% rename from platform-independent/web-js/js/dependencies.js rename to platform-independent/web/js/dependencies.js diff --git a/platform-independent/web-js/js/encoding-polyfill.js b/platform-independent/web/js/encoding-polyfill.js similarity index 100% rename from platform-independent/web-js/js/encoding-polyfill.js rename to platform-independent/web/js/encoding-polyfill.js diff --git a/platform-independent/web-js/js/main.js b/platform-independent/web/js/main.js similarity index 100% rename from platform-independent/web-js/js/main.js rename to platform-independent/web/js/main.js diff --git a/platform-independent/web-js/js/mpw-js b/platform-independent/web/js/mpw-js similarity index 100% rename from platform-independent/web-js/js/mpw-js rename to platform-independent/web/js/mpw-js diff --git a/platform-independent/web-js/js/promise-polyfill.js b/platform-independent/web/js/promise-polyfill.js similarity index 100% rename from platform-independent/web-js/js/promise-polyfill.js rename to platform-independent/web/js/promise-polyfill.js diff --git a/platform-independent/web-js/js/setImmediate-polyfill.js b/platform-independent/web/js/setImmediate-polyfill.js similarity index 100% rename from platform-independent/web-js/js/setImmediate-polyfill.js rename to platform-independent/web/js/setImmediate-polyfill.js diff --git a/platform-independent/web-js/js/typedarray-polyfill.js b/platform-independent/web/js/typedarray-polyfill.js similarity index 100% rename from platform-independent/web-js/js/typedarray-polyfill.js rename to platform-independent/web/js/typedarray-polyfill.js diff --git a/platform-independent/web-js/js/vendor/jquery-2.1.1.js b/platform-independent/web/js/vendor/jquery-2.1.1.js similarity index 100% rename from platform-independent/web-js/js/vendor/jquery-2.1.1.js rename to platform-independent/web/js/vendor/jquery-2.1.1.js diff --git a/platform-independent/web-js/js/vendor/jquery-2.1.1.min.js b/platform-independent/web/js/vendor/jquery-2.1.1.min.js similarity index 100% rename from platform-independent/web-js/js/vendor/jquery-2.1.1.min.js rename to platform-independent/web/js/vendor/jquery-2.1.1.min.js diff --git a/platform-independent/web-js/js/vendor/jquery-2.1.1.min.map b/platform-independent/web/js/vendor/jquery-2.1.1.min.map similarity index 100% rename from platform-independent/web-js/js/vendor/jquery-2.1.1.min.map rename to platform-independent/web/js/vendor/jquery-2.1.1.min.map diff --git a/platform-independent/web-js/sync b/platform-independent/web/sync similarity index 100% rename from platform-independent/web-js/sync rename to platform-independent/web/sync