From 1876f826117b0236c023eff47f3d4692d2f74f32 Mon Sep 17 00:00:00 2001
From: Sebastian Stenzel <sebastianstenzel@gmail.com>
Date: Sat, 29 Nov 2014 17:03:55 +0100
Subject: [PATCH] renamed to Cryptomator

---
 {oce-main/oce-core => main/core}/.gitignore   |   0
 {oce-main/oce-core => main/core}/pom.xml      |  12 +-
 .../org/cryptomator}/webdav/WebDAVServer.java |   7 +-
 .../exceptions/DavRuntimeException.java       |   2 +-
 .../webdav/exceptions/IORuntimeException.java |   2 +-
 .../webdav/jackrabbit/BidiLRUMap.java         |   2 +-
 .../jackrabbit/WebDavLocatorFactory.java      |   7 +-
 .../jackrabbit/WebDavResourceFactory.java     |  13 +-
 .../webdav/jackrabbit/WebDavServlet.java      |   5 +-
 .../webdav/jackrabbit/WebDavSession.java      |   2 +-
 .../jackrabbit/WebDavSessionProvider.java     |   2 +-
 .../resources/AbstractEncryptedNode.java      |   7 +-
 .../jackrabbit/resources/EncryptedDir.java    |   9 +-
 .../jackrabbit/resources/EncryptedFile.java   |   7 +-
 .../jackrabbit/resources/NonExistingNode.java |   5 +-
 .../jackrabbit/resources/PathUtils.java       |   2 +-
 .../core}/src/main/resources/log4j.xml        |   0
 .../crypto-aes}/pom.xml                       |  12 +-
 .../crypto/aes256/Aes256Cryptor.java          |  15 +-
 .../aes256/AesCryptographicConfiguration.java |   2 +-
 .../crypto/aes256/FileNamingConventions.java  |   2 +-
 .../org/cryptomator}/crypto/aes256/Key.java   |   2 +-
 .../cryptomator}/crypto/aes256/Metadata.java  |   2 +-
 .../exceptions/DecryptFailedException.java    |   2 +-
 .../exceptions/StorageCryptingException.java  |   2 +-
 .../UnsupportedKeyLengthException.java        |   2 +-
 .../exceptions/WrongPasswordException.java    |   2 +-
 .../crypto/aes256/Aes256CryptorTest.java      |  10 +-
 .../crypto-api}/.gitignore                    |   0
 .../crypto-api}/pom.xml                       |   8 +-
 .../cryptomator}/crypto/AbstractCryptor.java  |   2 +-
 .../java/org/cryptomator}/crypto/Cryptor.java |   2 +-
 .../crypto/SensitiveDataSwipeListener.java    |   2 +-
 .../io/SeekableByteChannelInputStream.java    |   2 +-
 .../io/SeekableByteChannelOutputStream.java   |   2 +-
 {oce-main => main}/pom.xml                    |  18 +-
 {oce-main/oce-ui => main/ui}/pom.xml          |  18 +-
 .../org/cryptomator}/ui/AccessController.java |  19 +-
 .../cryptomator}/ui/AdvancedController.java   |   5 +-
 .../cryptomator}/ui/InitializeController.java |  11 +-
 .../org/cryptomator}/ui/MainApplication.java  |   9 +-
 .../org/cryptomator}/ui/MainController.java   |   2 +-
 .../ui/controls/ClearOnDisableListener.java   |   2 +-
 .../ui/controls/SecPasswordField.java         |   2 +-
 .../cryptomator}/ui/settings/Settings.java    |   2 +-
 .../cryptomator}/ui/util/MasterKeyFilter.java |   4 +-
 .../ui}/src/main/resources/access.fxml        |   6 +-
 .../ui}/src/main/resources/advanced.fxml      |   2 +-
 .../ui}/src/main/resources/initialize.fxml    |   4 +-
 .../main/resources/localization.properties    |   0
 .../ui}/src/main/resources/main.css           |   0
 .../ui}/src/main/resources/main.fxml          |   2 +-
 .../ui}/src/main/resources/panels.css         |   0
 .../oce/ui/controls/SecurePasswordField.java  | 213 ------------------
 54 files changed, 125 insertions(+), 349 deletions(-)
 rename {oce-main/oce-core => main/core}/.gitignore (100%)
 rename {oce-main/oce-core => main/core}/pom.xml (89%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/WebDAVServer.java (93%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/exceptions/DavRuntimeException.java (94%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/exceptions/IORuntimeException.java (94%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/BidiLRUMap.java (93%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/WebDavLocatorFactory.java (95%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/WebDavResourceFactory.java (87%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/WebDavServlet.java (96%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/WebDavSession.java (95%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/WebDavSessionProvider.java (94%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/resources/AbstractEncryptedNode.java (97%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/resources/EncryptedDir.java (96%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/resources/EncryptedFile.java (95%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/resources/NonExistingNode.java (94%)
 rename {oce-main/oce-core/src/main/java/de/sebastianstenzel/oce => main/core/src/main/java/org/cryptomator}/webdav/jackrabbit/resources/PathUtils.java (93%)
 rename {oce-main/oce-core => main/core}/src/main/resources/log4j.xml (100%)
 rename {oce-main/oce-crypto-aes => main/crypto-aes}/pom.xml (87%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/aes256/Aes256Cryptor.java (97%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/aes256/AesCryptographicConfiguration.java (98%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/aes256/FileNamingConventions.java (97%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/aes256/Key.java (96%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/aes256/Metadata.java (97%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/exceptions/DecryptFailedException.java (81%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/exceptions/StorageCryptingException.java (85%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/exceptions/UnsupportedKeyLengthException.java (91%)
 rename {oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce => main/crypto-aes/src/main/java/org/cryptomator}/crypto/exceptions/WrongPasswordException.java (80%)
 rename {oce-main/oce-crypto-aes/src/test/java/de/sebastianstenzel/oce => main/crypto-aes/src/test/java/org/cryptomator}/crypto/aes256/Aes256CryptorTest.java (93%)
 rename {oce-main/oce-crypto-api => main/crypto-api}/.gitignore (100%)
 rename {oce-main/oce-crypto-api => main/crypto-api}/pom.xml (85%)
 rename {oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce => main/crypto-api/src/main/java/org/cryptomator}/crypto/AbstractCryptor.java (95%)
 rename {oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce => main/crypto-api/src/main/java/org/cryptomator}/crypto/Cryptor.java (98%)
 rename {oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce => main/crypto-api/src/main/java/org/cryptomator}/crypto/SensitiveDataSwipeListener.java (86%)
 rename {oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce => main/crypto-api/src/main/java/org/cryptomator}/crypto/io/SeekableByteChannelInputStream.java (98%)
 rename {oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce => main/crypto-api/src/main/java/org/cryptomator}/crypto/io/SeekableByteChannelOutputStream.java (97%)
 rename {oce-main => main}/pom.xml (89%)
 rename {oce-main/oce-ui => main/ui}/pom.xml (90%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/AccessController.java (93%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/AdvancedController.java (96%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/InitializeController.java (96%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/MainApplication.java (86%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/MainController.java (96%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/controls/ClearOnDisableListener.java (91%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/controls/SecPasswordField.java (97%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/settings/Settings.java (98%)
 rename {oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce => main/ui/src/main/java/org/cryptomator}/ui/util/MasterKeyFilter.java (86%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/access.fxml (81%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/advanced.fxml (82%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/initialize.fxml (90%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/localization.properties (100%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/main.css (100%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/main.fxml (91%)
 rename {oce-main/oce-ui => main/ui}/src/main/resources/panels.css (100%)
 delete mode 100644 oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecurePasswordField.java

diff --git a/oce-main/oce-core/.gitignore b/main/core/.gitignore
similarity index 100%
rename from oce-main/oce-core/.gitignore
rename to main/core/.gitignore
diff --git a/oce-main/oce-core/pom.xml b/main/core/pom.xml
similarity index 89%
rename from oce-main/oce-core/pom.xml
rename to main/core/pom.xml
index 4a1310b41..cfd19cab9 100644
--- a/oce-main/oce-core/pom.xml
+++ b/main/core/pom.xml
@@ -10,12 +10,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>de.sebastianstenzel.oce</groupId>
-		<artifactId>oce-main</artifactId>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>oce-core</artifactId>
-	<name>Open Cloud Encryptor core I/O module</name>
+	<artifactId>core</artifactId>
+	<name>Cryptomator core I/O module</name>
 
 	<properties>
 		<jetty.version>9.1.0.v20131115</jetty.version>
@@ -26,8 +26,8 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>de.sebastianstenzel.oce</groupId>
-			<artifactId>oce-crypto-api</artifactId>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>crypto-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/WebDAVServer.java b/main/core/src/main/java/org/cryptomator/webdav/WebDAVServer.java
similarity index 93%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/WebDAVServer.java
rename to main/core/src/main/java/org/cryptomator/webdav/WebDAVServer.java
index d6dd54de6..da4d85322 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/WebDAVServer.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/WebDAVServer.java
@@ -6,8 +6,10 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav;
+package org.cryptomator.webdav;
 
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.webdav.jackrabbit.WebDavServlet;
 import org.eclipse.jetty.server.Connector;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;
@@ -16,9 +18,6 @@ import org.eclipse.jetty.servlet.ServletHolder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.webdav.jackrabbit.WebDavServlet;
-
 public final class WebDAVServer {
 
 	private static final Logger LOG = LoggerFactory.getLogger(WebDAVServer.class);
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/DavRuntimeException.java b/main/core/src/main/java/org/cryptomator/webdav/exceptions/DavRuntimeException.java
similarity index 94%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/DavRuntimeException.java
rename to main/core/src/main/java/org/cryptomator/webdav/exceptions/DavRuntimeException.java
index 483cea4e2..9b8893a7b 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/DavRuntimeException.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/exceptions/DavRuntimeException.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.exceptions;
+package org.cryptomator.webdav.exceptions;
 
 import org.apache.jackrabbit.webdav.DavException;
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/IORuntimeException.java b/main/core/src/main/java/org/cryptomator/webdav/exceptions/IORuntimeException.java
similarity index 94%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/IORuntimeException.java
rename to main/core/src/main/java/org/cryptomator/webdav/exceptions/IORuntimeException.java
index 716ed7606..210524596 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/exceptions/IORuntimeException.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/exceptions/IORuntimeException.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.exceptions;
+package org.cryptomator.webdav.exceptions;
 
 import java.io.IOException;
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/BidiLRUMap.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/BidiLRUMap.java
similarity index 93%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/BidiLRUMap.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/BidiLRUMap.java
index c5924735d..0a73599c3 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/BidiLRUMap.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/BidiLRUMap.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import java.util.Map;
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavLocatorFactory.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavLocatorFactory.java
similarity index 95%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavLocatorFactory.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavLocatorFactory.java
index c79d94a61..5509ca682 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavLocatorFactory.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavLocatorFactory.java
@@ -6,16 +6,15 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
 
 import org.apache.jackrabbit.webdav.AbstractLocatorFactory;
 import org.apache.jackrabbit.webdav.DavResourceLocator;
-
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.crypto.SensitiveDataSwipeListener;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.crypto.SensitiveDataSwipeListener;
 
 public class WebDavLocatorFactory extends AbstractLocatorFactory implements SensitiveDataSwipeListener {
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavResourceFactory.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavResourceFactory.java
similarity index 87%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavResourceFactory.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavResourceFactory.java
index 6c45c949e..455507350 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavResourceFactory.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavResourceFactory.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -21,12 +21,11 @@ import org.apache.jackrabbit.webdav.DavServletResponse;
 import org.apache.jackrabbit.webdav.DavSession;
 import org.apache.jackrabbit.webdav.lock.LockManager;
 import org.apache.jackrabbit.webdav.lock.SimpleLockManager;
-
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.webdav.jackrabbit.resources.EncryptedDir;
-import de.sebastianstenzel.oce.webdav.jackrabbit.resources.EncryptedFile;
-import de.sebastianstenzel.oce.webdav.jackrabbit.resources.NonExistingNode;
-import de.sebastianstenzel.oce.webdav.jackrabbit.resources.PathUtils;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.webdav.jackrabbit.resources.EncryptedDir;
+import org.cryptomator.webdav.jackrabbit.resources.EncryptedFile;
+import org.cryptomator.webdav.jackrabbit.resources.NonExistingNode;
+import org.cryptomator.webdav.jackrabbit.resources.PathUtils;
 
 public class WebDavResourceFactory implements DavResourceFactory {
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavServlet.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavServlet.java
similarity index 96%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavServlet.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavServlet.java
index 858b12337..5b0ddb9ca 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavServlet.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavServlet.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
@@ -17,8 +17,7 @@ import org.apache.jackrabbit.webdav.DavResourceFactory;
 import org.apache.jackrabbit.webdav.DavSessionProvider;
 import org.apache.jackrabbit.webdav.WebdavRequest;
 import org.apache.jackrabbit.webdav.server.AbstractWebdavServlet;
-
-import de.sebastianstenzel.oce.crypto.Cryptor;
+import org.cryptomator.crypto.Cryptor;
 
 public class WebDavServlet extends AbstractWebdavServlet {
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSession.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSession.java
similarity index 95%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSession.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSession.java
index e551cb0cc..94da3bbac 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSession.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSession.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import org.apache.jackrabbit.webdav.DavSession;
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSessionProvider.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSessionProvider.java
similarity index 94%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSessionProvider.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSessionProvider.java
index 38b53bfaf..c6c3ff909 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/WebDavSessionProvider.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/WebDavSessionProvider.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit;
+package org.cryptomator.webdav.jackrabbit;
 
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.DavSessionProvider;
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/AbstractEncryptedNode.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/AbstractEncryptedNode.java
similarity index 97%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/AbstractEncryptedNode.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/AbstractEncryptedNode.java
index b33f5abc3..d1c99d885 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/AbstractEncryptedNode.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/AbstractEncryptedNode.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit.resources;
+package org.cryptomator.webdav.jackrabbit.resources;
 
 import java.io.IOException;
 import java.nio.file.AtomicMoveNotSupportedException;
@@ -33,12 +33,11 @@ import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
 import org.apache.jackrabbit.webdav.property.PropEntry;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.webdav.exceptions.IORuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.webdav.exceptions.IORuntimeException;
-
 public abstract class AbstractEncryptedNode implements DavResource {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AbstractEncryptedNode.class);
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedDir.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedDir.java
similarity index 96%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedDir.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedDir.java
index f7c4e7f74..9c500d56f 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedDir.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedDir.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit.resources;
+package org.cryptomator.webdav.jackrabbit.resources;
 
 import java.io.IOException;
 import java.nio.channels.SeekableByteChannel;
@@ -35,13 +35,12 @@ import org.apache.jackrabbit.webdav.lock.LockManager;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
 import org.apache.jackrabbit.webdav.property.ResourceType;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.webdav.exceptions.DavRuntimeException;
+import org.cryptomator.webdav.exceptions.IORuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.webdav.exceptions.DavRuntimeException;
-import de.sebastianstenzel.oce.webdav.exceptions.IORuntimeException;
-
 public class EncryptedDir extends AbstractEncryptedNode {
 
 	private static final Logger LOG = LoggerFactory.getLogger(EncryptedDir.class);
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedFile.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedFile.java
similarity index 95%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedFile.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedFile.java
index 59aa9f70c..0d834b8b7 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/EncryptedFile.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/EncryptedFile.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit.resources;
+package org.cryptomator.webdav.jackrabbit.resources;
 
 import java.io.EOFException;
 import java.io.IOException;
@@ -28,12 +28,11 @@ import org.apache.jackrabbit.webdav.io.OutputContext;
 import org.apache.jackrabbit.webdav.lock.LockManager;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
+import org.cryptomator.crypto.Cryptor;
+import org.cryptomator.webdav.exceptions.IORuntimeException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.Cryptor;
-import de.sebastianstenzel.oce.webdav.exceptions.IORuntimeException;
-
 public class EncryptedFile extends AbstractEncryptedNode {
 
 	private static final Logger LOG = LoggerFactory.getLogger(EncryptedFile.class);
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/NonExistingNode.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/NonExistingNode.java
similarity index 94%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/NonExistingNode.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/NonExistingNode.java
index 10a8e22c8..2a58e62a2 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/NonExistingNode.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/NonExistingNode.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit.resources;
+package org.cryptomator.webdav.jackrabbit.resources;
 
 import java.io.IOException;
 
@@ -19,8 +19,7 @@ import org.apache.jackrabbit.webdav.DavSession;
 import org.apache.jackrabbit.webdav.io.InputContext;
 import org.apache.jackrabbit.webdav.io.OutputContext;
 import org.apache.jackrabbit.webdav.lock.LockManager;
-
-import de.sebastianstenzel.oce.crypto.Cryptor;
+import org.cryptomator.crypto.Cryptor;
 
 public class NonExistingNode extends AbstractEncryptedNode {
 
diff --git a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/PathUtils.java b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/PathUtils.java
similarity index 93%
rename from oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/PathUtils.java
rename to main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/PathUtils.java
index 9665b2057..4c568ce2b 100644
--- a/oce-main/oce-core/src/main/java/de/sebastianstenzel/oce/webdav/jackrabbit/resources/PathUtils.java
+++ b/main/core/src/main/java/org/cryptomator/webdav/jackrabbit/resources/PathUtils.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.webdav.jackrabbit.resources;
+package org.cryptomator.webdav.jackrabbit.resources;
 
 import java.nio.file.FileSystems;
 import java.nio.file.Path;
diff --git a/oce-main/oce-core/src/main/resources/log4j.xml b/main/core/src/main/resources/log4j.xml
similarity index 100%
rename from oce-main/oce-core/src/main/resources/log4j.xml
rename to main/core/src/main/resources/log4j.xml
diff --git a/oce-main/oce-crypto-aes/pom.xml b/main/crypto-aes/pom.xml
similarity index 87%
rename from oce-main/oce-crypto-aes/pom.xml
rename to main/crypto-aes/pom.xml
index 3faf1dd05..1f09c76f2 100644
--- a/oce-main/oce-crypto-aes/pom.xml
+++ b/main/crypto-aes/pom.xml
@@ -10,18 +10,18 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>de.sebastianstenzel.oce</groupId>
-		<artifactId>oce-main</artifactId>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>oce-crypto-aes</artifactId>
-	<name>Open Cloud Encryptor cryptographic module (AES)</name>
+	<artifactId>crypto-aes</artifactId>
+	<name>Cryptomator cryptographic module (AES)</name>
 	<description>Provides stream ciphers and filename pseudonymization functions.</description>
 
 	<dependencies>
 		<dependency>
-			<groupId>de.sebastianstenzel.oce</groupId>
-			<artifactId>oce-crypto-api</artifactId>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>crypto-api</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Aes256Cryptor.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java
similarity index 97%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Aes256Cryptor.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java
index 5b5481338..cc361bdad 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Aes256Cryptor.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Aes256Cryptor.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -41,16 +41,15 @@ import javax.crypto.spec.SecretKeySpec;
 import org.apache.commons.io.Charsets;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.cryptomator.crypto.AbstractCryptor;
+import org.cryptomator.crypto.exceptions.DecryptFailedException;
+import org.cryptomator.crypto.exceptions.UnsupportedKeyLengthException;
+import org.cryptomator.crypto.exceptions.WrongPasswordException;
+import org.cryptomator.crypto.io.SeekableByteChannelInputStream;
+import org.cryptomator.crypto.io.SeekableByteChannelOutputStream;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import de.sebastianstenzel.oce.crypto.AbstractCryptor;
-import de.sebastianstenzel.oce.crypto.exceptions.DecryptFailedException;
-import de.sebastianstenzel.oce.crypto.exceptions.UnsupportedKeyLengthException;
-import de.sebastianstenzel.oce.crypto.exceptions.WrongPasswordException;
-import de.sebastianstenzel.oce.crypto.io.SeekableByteChannelInputStream;
-import de.sebastianstenzel.oce.crypto.io.SeekableByteChannelOutputStream;
-
 public class Aes256Cryptor extends AbstractCryptor implements AesCryptographicConfiguration, FileNamingConventions {
 
 	/**
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/AesCryptographicConfiguration.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java
similarity index 98%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/AesCryptographicConfiguration.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java
index 0fd66c3a2..ab8f22614 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/AesCryptographicConfiguration.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/AesCryptographicConfiguration.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 interface AesCryptographicConfiguration {
 
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/FileNamingConventions.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/FileNamingConventions.java
similarity index 97%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/FileNamingConventions.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/FileNamingConventions.java
index da3fbc1b9..c9a496573 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/FileNamingConventions.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/FileNamingConventions.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 import java.nio.file.FileSystems;
 import java.nio.file.PathMatcher;
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Key.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Key.java
similarity index 96%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Key.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Key.java
index cb4a570ae..c14bb7c7e 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Key.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Key.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 import java.io.Serializable;
 
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Metadata.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Metadata.java
similarity index 97%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Metadata.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Metadata.java
index 9e69c784f..914138fd2 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/aes256/Metadata.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/aes256/Metadata.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 import java.io.Serializable;
 import java.util.HashMap;
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/DecryptFailedException.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/DecryptFailedException.java
similarity index 81%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/DecryptFailedException.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/DecryptFailedException.java
index 10c01308b..b815e19e7 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/DecryptFailedException.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/DecryptFailedException.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto.exceptions;
+package org.cryptomator.crypto.exceptions;
 
 public class DecryptFailedException extends StorageCryptingException {
 	private static final long serialVersionUID = -3855673600374897828L;
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/StorageCryptingException.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/StorageCryptingException.java
similarity index 85%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/StorageCryptingException.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/StorageCryptingException.java
index 5777e8ab5..a618bbe6e 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/StorageCryptingException.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/StorageCryptingException.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto.exceptions;
+package org.cryptomator.crypto.exceptions;
 
 public class StorageCryptingException extends Exception {
 	private static final long serialVersionUID = -6622699014483319376L;
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/UnsupportedKeyLengthException.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java
similarity index 91%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/UnsupportedKeyLengthException.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java
index 53268faa6..bc7950255 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/UnsupportedKeyLengthException.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/UnsupportedKeyLengthException.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto.exceptions;
+package org.cryptomator.crypto.exceptions;
 
 public class UnsupportedKeyLengthException extends StorageCryptingException {
 	private static final long serialVersionUID = 8114147446419390179L;
diff --git a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/WrongPasswordException.java b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/WrongPasswordException.java
similarity index 80%
rename from oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/WrongPasswordException.java
rename to main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/WrongPasswordException.java
index 50358ee3b..97fa04c67 100644
--- a/oce-main/oce-crypto-aes/src/main/java/de/sebastianstenzel/oce/crypto/exceptions/WrongPasswordException.java
+++ b/main/crypto-aes/src/main/java/org/cryptomator/crypto/exceptions/WrongPasswordException.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto.exceptions;
+package org.cryptomator.crypto.exceptions;
 
 public class WrongPasswordException extends StorageCryptingException {
 	private static final long serialVersionUID = -602047799678568780L;
diff --git a/oce-main/oce-crypto-aes/src/test/java/de/sebastianstenzel/oce/crypto/aes256/Aes256CryptorTest.java b/main/crypto-aes/src/test/java/org/cryptomator/crypto/aes256/Aes256CryptorTest.java
similarity index 93%
rename from oce-main/oce-crypto-aes/src/test/java/de/sebastianstenzel/oce/crypto/aes256/Aes256CryptorTest.java
rename to main/crypto-aes/src/test/java/org/cryptomator/crypto/aes256/Aes256CryptorTest.java
index d77b47455..fa89aac81 100644
--- a/oce-main/oce-crypto-aes/src/test/java/de/sebastianstenzel/oce/crypto/aes256/Aes256CryptorTest.java
+++ b/main/crypto-aes/src/test/java/org/cryptomator/crypto/aes256/Aes256CryptorTest.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.aes256;
+package org.cryptomator.crypto.aes256;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -19,14 +19,14 @@ import java.nio.file.Path;
 import java.nio.file.StandardOpenOption;
 
 import org.apache.commons.io.FileUtils;
+import org.cryptomator.crypto.aes256.Aes256Cryptor;
+import org.cryptomator.crypto.exceptions.DecryptFailedException;
+import org.cryptomator.crypto.exceptions.UnsupportedKeyLengthException;
+import org.cryptomator.crypto.exceptions.WrongPasswordException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
-import de.sebastianstenzel.oce.crypto.exceptions.DecryptFailedException;
-import de.sebastianstenzel.oce.crypto.exceptions.UnsupportedKeyLengthException;
-import de.sebastianstenzel.oce.crypto.exceptions.WrongPasswordException;
-
 public class Aes256CryptorTest {
 
 	private Path tmpDir;
diff --git a/oce-main/oce-crypto-api/.gitignore b/main/crypto-api/.gitignore
similarity index 100%
rename from oce-main/oce-crypto-api/.gitignore
rename to main/crypto-api/.gitignore
diff --git a/oce-main/oce-crypto-api/pom.xml b/main/crypto-api/pom.xml
similarity index 85%
rename from oce-main/oce-crypto-api/pom.xml
rename to main/crypto-api/pom.xml
index ed89f4854..072fa335e 100644
--- a/oce-main/oce-crypto-api/pom.xml
+++ b/main/crypto-api/pom.xml
@@ -10,12 +10,12 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>de.sebastianstenzel.oce</groupId>
-		<artifactId>oce-main</artifactId>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>oce-crypto-api</artifactId>
-	<name>Open Cloud Encryptor cryptographic module API</name>
+	<artifactId>crypto-api</artifactId>
+	<name>Cryptomator cryptographic module API</name>
 
 	<dependencies>
 		<dependency>
diff --git a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/AbstractCryptor.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/AbstractCryptor.java
similarity index 95%
rename from oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/AbstractCryptor.java
rename to main/crypto-api/src/main/java/org/cryptomator/crypto/AbstractCryptor.java
index 05d055602..3f40ef34f 100644
--- a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/AbstractCryptor.java
+++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/AbstractCryptor.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto;
+package org.cryptomator.crypto;
 
 import java.util.HashSet;
 import java.util.Set;
diff --git a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/Cryptor.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/Cryptor.java
similarity index 98%
rename from oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/Cryptor.java
rename to main/crypto-api/src/main/java/org/cryptomator/crypto/Cryptor.java
index 63a5a0a17..321b27c99 100644
--- a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/Cryptor.java
+++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/Cryptor.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto;
+package org.cryptomator.crypto;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/SensitiveDataSwipeListener.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/SensitiveDataSwipeListener.java
similarity index 86%
rename from oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/SensitiveDataSwipeListener.java
rename to main/crypto-api/src/main/java/org/cryptomator/crypto/SensitiveDataSwipeListener.java
index 5abbd66c1..bc02282a5 100644
--- a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/SensitiveDataSwipeListener.java
+++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/SensitiveDataSwipeListener.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.crypto;
+package org.cryptomator.crypto;
 
 public interface SensitiveDataSwipeListener {
 
diff --git a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelInputStream.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelInputStream.java
similarity index 98%
rename from oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelInputStream.java
rename to main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelInputStream.java
index db4421a93..a441d7be4 100644
--- a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelInputStream.java
+++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelInputStream.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.io;
+package org.cryptomator.crypto.io;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelOutputStream.java b/main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelOutputStream.java
similarity index 97%
rename from oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelOutputStream.java
rename to main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelOutputStream.java
index 14ecca572..bdac2c594 100644
--- a/oce-main/oce-crypto-api/src/main/java/de/sebastianstenzel/oce/crypto/io/SeekableByteChannelOutputStream.java
+++ b/main/crypto-api/src/main/java/org/cryptomator/crypto/io/SeekableByteChannelOutputStream.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.crypto.io;
+package org.cryptomator.crypto.io;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/oce-main/pom.xml b/main/pom.xml
similarity index 89%
rename from oce-main/pom.xml
rename to main/pom.xml
index c44ce6801..ed50f873c 100644
--- a/oce-main/pom.xml
+++ b/main/pom.xml
@@ -9,13 +9,13 @@
 -->
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>de.sebastianstenzel.oce</groupId>
-	<artifactId>oce-main</artifactId>
+	<groupId>org.cryptomator</groupId>
+	<artifactId>main</artifactId>
 	<version>0.1.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<name>Open Cloud Encryptor</name>
+	<name>Cryptomator</name>
 	<organization>
-		<name>sebastianstenzel.de</name>
+		<name>cryptomator.org</name>
 	</organization>
 
 	<properties>
@@ -34,7 +34,7 @@
 	<developers>
 		<developer>
 			<name>Sebastian Stenzel</name>
-			<email>mail@sebastianstenzel.de</email>
+			<email>sebastian.stenzel@gmail.com</email>
 		</developer>
 	</developers>
 
@@ -97,10 +97,10 @@
 	</dependencyManagement>
 
 	<modules>
-		<module>oce-crypto-api</module>
-		<module>oce-crypto-aes</module>
-		<module>oce-core</module>
-		<module>oce-ui</module>
+		<module>crypto-api</module>
+		<module>crypto-aes</module>
+		<module>core</module>
+		<module>ui</module>
 	</modules>
 
 </project>
diff --git a/oce-main/oce-ui/pom.xml b/main/ui/pom.xml
similarity index 90%
rename from oce-main/oce-ui/pom.xml
rename to main/ui/pom.xml
index 8aa7bcb57..3cc4baff0 100644
--- a/oce-main/oce-ui/pom.xml
+++ b/main/ui/pom.xml
@@ -3,27 +3,27 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
-		<groupId>de.sebastianstenzel.oce</groupId>
-		<artifactId>oce-main</artifactId>
+		<groupId>org.cryptomator</groupId>
+		<artifactId>main</artifactId>
 		<version>0.1.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>oce-ui</artifactId>
-	<name>Open Cloud Encryptor GUI</name>
+	<artifactId>ui</artifactId>
+	<name>Cryptomator GUI</name>
 
 	<properties>
-		<exec.mainClass>de.sebastianstenzel.oce.ui.MainApplication</exec.mainClass>
+		<exec.mainClass>org.cryptomator.ui.MainApplication</exec.mainClass>
 		<javafx.tools.ant.jar>${java.home}/../lib/ant-javafx.jar</javafx.tools.ant.jar>
 	</properties>
 
 	<dependencies>
 		<dependency>
-			<groupId>de.sebastianstenzel.oce</groupId>
-			<artifactId>oce-core</artifactId>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>core</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>de.sebastianstenzel.oce</groupId>
-			<artifactId>oce-crypto-aes</artifactId>
+			<groupId>org.cryptomator</groupId>
+			<artifactId>crypto-aes</artifactId>
 			<version>${project.parent.version}</version>
 		</dependency>
 
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AccessController.java b/main/ui/src/main/java/org/cryptomator/ui/AccessController.java
similarity index 93%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AccessController.java
rename to main/ui/src/main/java/org/cryptomator/ui/AccessController.java
index f4b527ba8..07243d78a 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AccessController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/AccessController.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui;
+package org.cryptomator.ui;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,18 +36,17 @@ import javafx.stage.DirectoryChooser;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.cryptomator.crypto.aes256.Aes256Cryptor;
+import org.cryptomator.crypto.exceptions.DecryptFailedException;
+import org.cryptomator.crypto.exceptions.UnsupportedKeyLengthException;
+import org.cryptomator.crypto.exceptions.WrongPasswordException;
+import org.cryptomator.ui.controls.SecPasswordField;
+import org.cryptomator.ui.settings.Settings;
+import org.cryptomator.ui.util.MasterKeyFilter;
+import org.cryptomator.webdav.WebDAVServer;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.aes256.Aes256Cryptor;
-import de.sebastianstenzel.oce.crypto.exceptions.DecryptFailedException;
-import de.sebastianstenzel.oce.crypto.exceptions.UnsupportedKeyLengthException;
-import de.sebastianstenzel.oce.crypto.exceptions.WrongPasswordException;
-import de.sebastianstenzel.oce.ui.controls.SecPasswordField;
-import de.sebastianstenzel.oce.ui.settings.Settings;
-import de.sebastianstenzel.oce.ui.util.MasterKeyFilter;
-import de.sebastianstenzel.oce.webdav.WebDAVServer;
-
 public class AccessController implements Initializable {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AccessController.class);
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AdvancedController.java b/main/ui/src/main/java/org/cryptomator/ui/AdvancedController.java
similarity index 96%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AdvancedController.java
rename to main/ui/src/main/java/org/cryptomator/ui/AdvancedController.java
index d0dafd8d5..d1eb684cf 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/AdvancedController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/AdvancedController.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui;
+package org.cryptomator.ui;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -21,11 +21,10 @@ import javafx.scene.input.KeyEvent;
 import javafx.scene.layout.GridPane;
 
 import org.apache.commons.lang3.CharUtils;
+import org.cryptomator.ui.settings.Settings;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.ui.settings.Settings;
-
 public class AdvancedController implements Initializable {
 
 	private static final Logger LOG = LoggerFactory.getLogger(AdvancedController.class);
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/InitializeController.java b/main/ui/src/main/java/org/cryptomator/ui/InitializeController.java
similarity index 96%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/InitializeController.java
rename to main/ui/src/main/java/org/cryptomator/ui/InitializeController.java
index 686c77c8d..a7083235f 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/InitializeController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/InitializeController.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui;
+package org.cryptomator.ui;
 
 import java.io.File;
 import java.io.IOException;
@@ -36,14 +36,13 @@ import javafx.stage.DirectoryChooser;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.CharUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.cryptomator.crypto.aes256.Aes256Cryptor;
+import org.cryptomator.ui.controls.ClearOnDisableListener;
+import org.cryptomator.ui.controls.SecPasswordField;
+import org.cryptomator.ui.util.MasterKeyFilter;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import de.sebastianstenzel.oce.crypto.aes256.Aes256Cryptor;
-import de.sebastianstenzel.oce.ui.controls.ClearOnDisableListener;
-import de.sebastianstenzel.oce.ui.controls.SecPasswordField;
-import de.sebastianstenzel.oce.ui.util.MasterKeyFilter;
-
 public class InitializeController implements Initializable {
 
 	private static final Logger LOG = LoggerFactory.getLogger(InitializeController.class);
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainApplication.java b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
similarity index 86%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainApplication.java
rename to main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
index 487d83a84..1e978775b 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainApplication.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainApplication.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui;
+package org.cryptomator.ui;
 
 import java.io.IOException;
 import java.util.ResourceBundle;
@@ -16,8 +16,9 @@ import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import de.sebastianstenzel.oce.ui.settings.Settings;
-import de.sebastianstenzel.oce.webdav.WebDAVServer;
+
+import org.cryptomator.ui.settings.Settings;
+import org.cryptomator.webdav.WebDAVServer;
 
 public class MainApplication extends Application {
 
@@ -30,7 +31,7 @@ public class MainApplication extends Application {
 		final ResourceBundle localizations = ResourceBundle.getBundle("localization");
 		final Parent root = FXMLLoader.load(getClass().getResource("/main.fxml"), localizations);
 		final Scene scene = new Scene(root);
-		primaryStage.setTitle("Open Cloud Encryptor");
+		primaryStage.setTitle("Cryptomator");
 		primaryStage.setScene(scene);
 		primaryStage.sizeToScene();
 		primaryStage.setResizable(false);
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainController.java b/main/ui/src/main/java/org/cryptomator/ui/MainController.java
similarity index 96%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainController.java
rename to main/ui/src/main/java/org/cryptomator/ui/MainController.java
index a482a347b..94ec34438 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/MainController.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/MainController.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui;
+package org.cryptomator.ui;
 
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/ClearOnDisableListener.java b/main/ui/src/main/java/org/cryptomator/ui/controls/ClearOnDisableListener.java
similarity index 91%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/ClearOnDisableListener.java
rename to main/ui/src/main/java/org/cryptomator/ui/controls/ClearOnDisableListener.java
index eb0e18599..38e8655f0 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/ClearOnDisableListener.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/ClearOnDisableListener.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.ui.controls;
+package org.cryptomator.ui.controls;
 
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecPasswordField.java b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
similarity index 97%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecPasswordField.java
rename to main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
index 1bc6808fa..14f7f6391 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecPasswordField.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/controls/SecPasswordField.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui.controls;
+package org.cryptomator.ui.controls;
 
 import java.util.Arrays;
 
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/settings/Settings.java b/main/ui/src/main/java/org/cryptomator/ui/settings/Settings.java
similarity index 98%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/settings/Settings.java
rename to main/ui/src/main/java/org/cryptomator/ui/settings/Settings.java
index b8e87cb9f..f470bd310 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/settings/Settings.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/settings/Settings.java
@@ -6,7 +6,7 @@
  * Contributors:
  *     Sebastian Stenzel - initial API and implementation
  ******************************************************************************/
-package de.sebastianstenzel.oce.ui.settings;
+package org.cryptomator.ui.settings;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/util/MasterKeyFilter.java b/main/ui/src/main/java/org/cryptomator/ui/util/MasterKeyFilter.java
similarity index 86%
rename from oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/util/MasterKeyFilter.java
rename to main/ui/src/main/java/org/cryptomator/ui/util/MasterKeyFilter.java
index 9d1e327ca..c747c749e 100644
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/util/MasterKeyFilter.java
+++ b/main/ui/src/main/java/org/cryptomator/ui/util/MasterKeyFilter.java
@@ -1,4 +1,4 @@
-package de.sebastianstenzel.oce.ui.util;
+package org.cryptomator.ui.util;
 
 import java.io.IOException;
 import java.nio.file.DirectoryStream;
@@ -6,7 +6,7 @@ import java.nio.file.DirectoryStream.Filter;
 import java.nio.file.Files;
 import java.nio.file.Path;
 
-import de.sebastianstenzel.oce.crypto.aes256.Aes256Cryptor;
+import org.cryptomator.crypto.aes256.Aes256Cryptor;
 
 public class MasterKeyFilter implements Filter<Path> {
 
diff --git a/oce-main/oce-ui/src/main/resources/access.fxml b/main/ui/src/main/resources/access.fxml
similarity index 81%
rename from oce-main/oce-ui/src/main/resources/access.fxml
rename to main/ui/src/main/resources/access.fxml
index c0e299593..ba4b3e353 100644
--- a/oce-main/oce-ui/src/main/resources/access.fxml
+++ b/main/ui/src/main/resources/access.fxml
@@ -12,10 +12,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<?import de.sebastianstenzel.oce.ui.controls.*?>
+<?import org.cryptomator.ui.controls.*?>
 
 
-<GridPane fx:id="rootGridPane" fx:controller="de.sebastianstenzel.oce.ui.AccessController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
+<GridPane fx:id="rootGridPane" fx:controller="org.cryptomator.ui.AccessController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
 	<stylesheets>
 		<URL value="@panels.css" />
 	</stylesheets>
@@ -34,7 +34,7 @@
 		<!-- Row 0 -->
 		<Label GridPane.rowIndex="0" GridPane.columnIndex="0" text="%access.label.workDir" GridPane.halignment="RIGHT" />
 		<TextField fx:id="workDirTextField" GridPane.rowIndex="0" GridPane.columnIndex="1" />
-		<Button fx:id="chooseWorkDirButton" GridPane.rowIndex="0" GridPane.columnIndex="2" text="%access.button.chooseWorkDir" onAction="#chooseWorkDir" focusTraversable="false"  />
+		<Button GridPane.rowIndex="0" GridPane.columnIndex="2" text="%access.button.chooseWorkDir" onAction="#chooseWorkDir" focusTraversable="false"  />
 		
 		<!-- Row 1 -->
 		<Label GridPane.rowIndex="1" GridPane.columnIndex="0" text="%access.label.username" GridPane.halignment="RIGHT" />
diff --git a/oce-main/oce-ui/src/main/resources/advanced.fxml b/main/ui/src/main/resources/advanced.fxml
similarity index 82%
rename from oce-main/oce-ui/src/main/resources/advanced.fxml
rename to main/ui/src/main/resources/advanced.fxml
index 3ec6bf12d..0bcc1c537 100644
--- a/oce-main/oce-ui/src/main/resources/advanced.fxml
+++ b/main/ui/src/main/resources/advanced.fxml
@@ -14,7 +14,7 @@
 <?import javafx.scene.text.*?>
 
 
-<GridPane fx:id="rootGridPane" fx:controller="de.sebastianstenzel.oce.ui.AdvancedController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
+<GridPane fx:id="rootGridPane" fx:controller="org.cryptomator.ui.AdvancedController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
 	<stylesheets>
 		<URL value="@panels.css" />
 	</stylesheets>
diff --git a/oce-main/oce-ui/src/main/resources/initialize.fxml b/main/ui/src/main/resources/initialize.fxml
similarity index 90%
rename from oce-main/oce-ui/src/main/resources/initialize.fxml
rename to main/ui/src/main/resources/initialize.fxml
index dd3225ae9..17219f511 100644
--- a/oce-main/oce-ui/src/main/resources/initialize.fxml
+++ b/main/ui/src/main/resources/initialize.fxml
@@ -12,10 +12,10 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
-<?import de.sebastianstenzel.oce.ui.controls.*?>
+<?import org.cryptomator.ui.controls.*?>
 
 
-<GridPane fx:id="rootGridPane" fx:controller="de.sebastianstenzel.oce.ui.InitializeController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
+<GridPane fx:id="rootGridPane" fx:controller="org.cryptomator.ui.InitializeController" xmlns:fx="http://javafx.com/fxml" styleClass="root" gridLinesVisible="false" vgap="5" hgap="5" prefWidth="480">
 	<stylesheets>
 		<URL value="@panels.css" />
 	</stylesheets>
diff --git a/oce-main/oce-ui/src/main/resources/localization.properties b/main/ui/src/main/resources/localization.properties
similarity index 100%
rename from oce-main/oce-ui/src/main/resources/localization.properties
rename to main/ui/src/main/resources/localization.properties
diff --git a/oce-main/oce-ui/src/main/resources/main.css b/main/ui/src/main/resources/main.css
similarity index 100%
rename from oce-main/oce-ui/src/main/resources/main.css
rename to main/ui/src/main/resources/main.css
diff --git a/oce-main/oce-ui/src/main/resources/main.fxml b/main/ui/src/main/resources/main.fxml
similarity index 91%
rename from oce-main/oce-ui/src/main/resources/main.fxml
rename to main/ui/src/main/resources/main.fxml
index 2670cc0b1..2b08770b0 100644
--- a/oce-main/oce-ui/src/main/resources/main.fxml
+++ b/main/ui/src/main/resources/main.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>
 
-<VBox fx:id="rootVBox" fx:controller="de.sebastianstenzel.oce.ui.MainController" xmlns:fx="http://javafx.com/fxml">
+<VBox fx:id="rootVBox" fx:controller="org.cryptomator.ui.MainController" xmlns:fx="http://javafx.com/fxml">
 	<stylesheets>
 		<URL value="@main.css" />
 	</stylesheets>
diff --git a/oce-main/oce-ui/src/main/resources/panels.css b/main/ui/src/main/resources/panels.css
similarity index 100%
rename from oce-main/oce-ui/src/main/resources/panels.css
rename to main/ui/src/main/resources/panels.css
diff --git a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecurePasswordField.java b/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecurePasswordField.java
deleted file mode 100644
index 4dcbd6a69..000000000
--- a/oce-main/oce-ui/src/main/java/de/sebastianstenzel/oce/ui/controls/SecurePasswordField.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 Sebastian Stenzel
- * This file is licensed under the terms of the MIT license.
- * See the LICENSE.txt file for more info.
- * 
- * Contributors:
- *     Sebastian Stenzel - initial API and implementation
- ******************************************************************************/
-package de.sebastianstenzel.oce.ui.controls;
-
-import java.nio.CharBuffer;
-import java.util.Arrays;
-
-import javafx.beans.InvalidationListener;
-import javafx.beans.value.ChangeListener;
-import javafx.scene.control.TextInputControl;
-
-import com.sun.javafx.binding.ExpressionHelper;
-
-/**
- * Don't use, won't work.
- * Just an experiment. Will be moved to a separate branch, when I have some time for cleanup stuff.
- */
-@Deprecated
-public class SecurePasswordField extends TextInputControl {
-
-	public SecurePasswordField() {
-		this("");
-	}
-
-	public SecurePasswordField(String text) {
-		super(new SecureContent());
-		getStyleClass().add("password-field");
-		this.setText(text);
-	}
-
-	public void swipe() {
-		final Content content = this.getContent();
-		if (content instanceof SecureContent) {
-			final SecureContent secureContent = (SecureContent) content;
-			secureContent.swipe();
-		}
-	}
-	
-	@Override
-	public void cut() {
-		// No-op
-	}
-	
-	@Override
-	public void copy() {
-		// No-op
-	}
-
-	/**
-	 * Content based on a CharBuffer, whose backing char[] can be swiped on demand.
-	 */
-	private static final class SecureContent implements Content {
-		private static final int INITIAL_BUFFER_LENGTH = 64;
-		private static final int BUFFER_GROWTH_FACTOR = 2;
-
-		private ExpressionHelper<String> helper = null;
-		private CharBuffer buffer = CharBuffer.allocate(INITIAL_BUFFER_LENGTH);
-
-		public void swipe() {
-			assert (buffer.hasArray());
-			Arrays.fill(buffer.array(), (char) 0);
-			buffer.position(0);
-		}
-
-		@Override
-		public String get() {
-			return buffer.toString();
-		}
-
-		@Override
-		public void addListener(ChangeListener<? super String> changeListener) {
-			helper = ExpressionHelper.addListener(helper, this, changeListener);
-
-		}
-
-		@Override
-		public String getValue() {
-			return get();
-		}
-
-		@Override
-		public void removeListener(ChangeListener<? super String> changeListener) {
-			helper = ExpressionHelper.removeListener(helper, changeListener);
-
-		}
-
-		@Override
-		public void addListener(InvalidationListener listener) {
-			helper = ExpressionHelper.addListener(helper, this, listener);
-
-		}
-
-		@Override
-		public void removeListener(InvalidationListener listener) {
-			helper = ExpressionHelper.removeListener(helper, listener);
-
-		}
-
-		@Override
-		public void delete(int start, int end, boolean notifyListeners) {
-			final int delLen = end - start;
-			final int pos = buffer.position();
-			if (delLen <= 0 || end > pos) {
-				return;
-			}
-			final char[] followingChars = new char[pos - end];
-			try {
-				// save follow-up chars:
-				buffer.get(followingChars, end, buffer.position() - end);
-				// close gap:
-				buffer.put(followingChars, start, followingChars.length);
-				// zeroing out freed space at end of buffer
-				final char[] zeros = new char[delLen];
-				buffer.put(zeros, pos - delLen, delLen);
-				// adjust length:
-				buffer.position(pos - delLen);
-				if (notifyListeners) {
-					ExpressionHelper.fireValueChangedEvent(helper);
-				}
-			} finally {
-				// swipe tmp variable
-				Arrays.fill(followingChars, (char) 0);
-			}
-		}
-
-		@Override
-		public String get(int start, int end) {
-			final char[] tmp = new char[end - start];
-			try {
-				buffer.get(tmp, start, end - start);
-				return new String(tmp);
-			} finally {
-				Arrays.fill(tmp, (char) 0);
-			}
-		}
-
-		@Override
-		public void insert(int index, String text, boolean notifyListeners) {
-			if (text.isEmpty()) {
-				return;
-			}
-			final String filteredInput;
-			if (SecurePasswordField.containsIllegalChars(text)) {
-				filteredInput = SecurePasswordField.removeIllegalChars(text);
-			} else {
-				filteredInput = text;
-			}
-			while (filteredInput.length() > buffer.remaining()) {
-				extendBuffer();
-			}
-			final int pos = buffer.position();
-			final char[] followingChars = new char[pos - index];
-			try {
-				// create empty gap for new text:
-				buffer.get(followingChars, index, followingChars.length);
-				// insert text at index:
-				buffer.put(filteredInput, index, filteredInput.length() - index);
-				// insert chars previously at this position afterwards
-				final int posAfterNewText = index + filteredInput.length();
-				buffer.put(followingChars, posAfterNewText, followingChars.length - posAfterNewText);
-				// adjust length:
-				buffer.position(pos + filteredInput.length());
-				if (notifyListeners) {
-					ExpressionHelper.fireValueChangedEvent(helper);
-				}
-			} finally {
-				// swipe tmp variable
-				Arrays.fill(followingChars, (char) 0);
-			}
-		}
-
-		private void extendBuffer() {
-			int currentCapacity = buffer.capacity();
-			buffer = CharBuffer.allocate(currentCapacity * BUFFER_GROWTH_FACTOR);
-		}
-
-		@Override
-		public int length() {
-			return buffer.length();
-		}
-
-	}
-
-	static boolean containsIllegalChars(String string) {
-		for (char c : string.toCharArray()) {
-			if (SecurePasswordField.isIllegalChar(c)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	static String removeIllegalChars(String string) {
-		final StringBuilder sb = new StringBuilder(string.length());
-		for (char c : string.toCharArray()) {
-			if (!SecurePasswordField.isIllegalChar(c)) {
-				sb.append(c);
-			}
-		}
-		return sb.toString();
-	}
-
-	static boolean isIllegalChar(char c) {
-		return (c == 0x7F || c == 0x0A || c == 0x09 || c < 0x20);
-	}
-
-}