diff --git a/main/filesystem-api/pom.xml b/main/filesystem-api/pom.xml
index 6172a7ea9..9625b6ba4 100644
--- a/main/filesystem-api/pom.xml
+++ b/main/filesystem-api/pom.xml
@@ -12,7 +12,7 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-api</artifactId>
-	<name>Cryptomator filesystem API</name>
+	<name>Cryptomator filesystem: API</name>
 
 	<dependencies>
 		<!-- commons -->
diff --git a/main/crypto-layer/.gitignore b/main/filesystem-crypto/.gitignore
similarity index 100%
rename from main/crypto-layer/.gitignore
rename to main/filesystem-crypto/.gitignore
diff --git a/main/crypto-layer/pom.xml b/main/filesystem-crypto/pom.xml
similarity index 92%
rename from main/crypto-layer/pom.xml
rename to main/filesystem-crypto/pom.xml
index ca0a54e35..77656a929 100644
--- a/main/crypto-layer/pom.xml
+++ b/main/filesystem-crypto/pom.xml
@@ -14,8 +14,8 @@
 		<artifactId>main</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>crypto-layer</artifactId>
-	<name>Cryptomator encrypted filesystem layer</name>
+	<artifactId>filesystem-crypto</artifactId>
+	<name>Cryptomator filesystem: Encryption layer</name>
 	
 	<properties>
 		<bouncycastle.version>1.51</bouncycastle.version>
@@ -29,7 +29,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
-			<artifactId>shortening-layer</artifactId>
+			<artifactId>filesystem-nameshortening</artifactId>
 		</dependency>
 		
 		<!-- Crypto -->
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/CryptoException.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/CryptoException.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/CryptoException.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/CryptoException.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/Cryptor.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/Cryptor.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/Cryptor.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/Cryptor.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/FilenameCryptor.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/AesKeyWrap.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/CryptorImpl.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImpl.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/KeyFile.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/TheDestroyer.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/package-info.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/package-info.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/engine/package-info.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/package-info.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFile.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFileSystem.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoFolder.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/CryptoNode.java
diff --git a/main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/package-info.java b/main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java
similarity index 100%
rename from main/crypto-layer/src/main/java/org/cryptomator/crypto/fs/package-info.java
rename to main/filesystem-crypto/src/main/java/org/cryptomator/crypto/fs/package-info.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoCryptor.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/NoFilenameCryptor.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/CryptorImplTest.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/engine/impl/FilenameCryptorImplTest.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/CryptoFileSystemTest.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryPrinter.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/DirectoryWalker.java
diff --git a/main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java b/main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java
similarity index 100%
rename from main/crypto-layer/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java
rename to main/filesystem-crypto/src/test/java/org/cryptomator/crypto/fs/EncryptAndShortenIntegrationTest.java
diff --git a/main/crypto-layer/src/test/resources/log4j2.xml b/main/filesystem-crypto/src/test/resources/log4j2.xml
similarity index 100%
rename from main/crypto-layer/src/test/resources/log4j2.xml
rename to main/filesystem-crypto/src/test/resources/log4j2.xml
diff --git a/main/filesystem-inmemory/pom.xml b/main/filesystem-inmemory/pom.xml
index fc7556c9f..70a27559a 100644
--- a/main/filesystem-inmemory/pom.xml
+++ b/main/filesystem-inmemory/pom.xml
@@ -15,7 +15,7 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-inmemory</artifactId>
-	<name>Cryptomator in-memory filesystem</name>
+	<name>Cryptomator filesystem: In-memory mock</name>
 
 	<dependencies>
 		<dependency>
diff --git a/main/filesystem-inmemory/src/test/resources/log4j2.xml b/main/filesystem-inmemory/src/test/resources/log4j2.xml
new file mode 100644
index 000000000..9b4889392
--- /dev/null
+++ b/main/filesystem-inmemory/src/test/resources/log4j2.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Configuration status="WARN">
+
+	<Appenders>
+		<Console name="Console" target="SYSTEM_OUT">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="DENY" onMismatch="ACCEPT" />
+		</Console>
+		<Console name="StdErr" target="SYSTEM_ERR">
+			<PatternLayout pattern="%16d %-5p [%c{1}:%L] %m%n" />
+			<ThresholdFilter level="WARN" onMatch="ACCEPT" onMismatch="DENY" />
+		</Console>
+	</Appenders>
+
+	<Loggers>
+		<Root level="DEBUG">
+			<AppenderRef ref="Console" />
+			<AppenderRef ref="StdErr" />
+		</Root>
+	</Loggers>
+
+</Configuration>
diff --git a/main/shortening-layer/.gitignore b/main/filesystem-nameshortening/.gitignore
similarity index 100%
rename from main/shortening-layer/.gitignore
rename to main/filesystem-nameshortening/.gitignore
diff --git a/main/shortening-layer/pom.xml b/main/filesystem-nameshortening/pom.xml
similarity index 93%
rename from main/shortening-layer/pom.xml
rename to main/filesystem-nameshortening/pom.xml
index 01cfd1366..cfc639de2 100644
--- a/main/shortening-layer/pom.xml
+++ b/main/filesystem-nameshortening/pom.xml
@@ -14,8 +14,8 @@
 		<artifactId>main</artifactId>
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
-	<artifactId>shortening-layer</artifactId>
-	<name>Cryptomator name shortening filesystem layer</name>
+	<artifactId>filesystem-nameshortening</artifactId>
+	<name>Cryptomator filesystem: Name shortening layer</name>
 
 	<dependencies>
 		<dependency>
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/FilenameShortener.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/FilenameShortener.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/FilenameShortener.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/FilenameShortener.java
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFile.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFile.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFile.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFile.java
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFileSystem.java
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFolder.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFolder.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningFolder.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningFolder.java
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningNode.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningNode.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/ShorteningNode.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/ShorteningNode.java
diff --git a/main/shortening-layer/src/main/java/org/cryptomator/shortening/package-info.java b/main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/package-info.java
similarity index 100%
rename from main/shortening-layer/src/main/java/org/cryptomator/shortening/package-info.java
rename to main/filesystem-nameshortening/src/main/java/org/cryptomator/shortening/package-info.java
diff --git a/main/shortening-layer/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java b/main/filesystem-nameshortening/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java
similarity index 100%
rename from main/shortening-layer/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java
rename to main/filesystem-nameshortening/src/test/java/org/cryptomator/shortening/ShorteningFileSystemTest.java
diff --git a/main/filesystem-nio/pom.xml b/main/filesystem-nio/pom.xml
index cb08b62d7..cdb933926 100644
--- a/main/filesystem-nio/pom.xml
+++ b/main/filesystem-nio/pom.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright (c) 2015 Markus Kreusch This file is licensed under the terms 
-	of the MIT license. See the LICENSE.txt file for more info. -->
-<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">
+<!--
+  Copyright (c) 2015 Markus Kreusch
+  This file is licensed under the terms of the MIT license.
+  See the LICENSE.txt file for more info.
+-->
+<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>org.cryptomator</groupId>
@@ -10,13 +12,15 @@
 		<version>0.11.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>filesystem-nio</artifactId>
+	<name>Cryptomator filesystem: NIO-based physical layer</name>
+	<description>FileSystem implementation to access the real file system of an operating system</description>
 
 	<dependencies>
 		<dependency>
 			<groupId>org.cryptomator</groupId>
 			<artifactId>filesystem-api</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>commons-io</groupId>
 			<artifactId>commons-io</artifactId>
@@ -29,7 +33,7 @@
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-collections4</artifactId>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>
@@ -44,6 +48,4 @@
 			</plugin>
 		</plugins>
 	</build>
-	<description>FileSystem implementation to access the real file system of an operating system</description>
-	<name>Cryptomator NIO Filesystem</name>
 </project>
\ No newline at end of file
diff --git a/main/pom.xml b/main/pom.xml
index ba34e5c5c..f03098771 100644
--- a/main/pom.xml
+++ b/main/pom.xml
@@ -66,12 +66,12 @@
 			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
-				<artifactId>shortening-layer</artifactId>
+				<artifactId>filesystem-nameshortening</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			<dependency>
 				<groupId>org.cryptomator</groupId>
-				<artifactId>crypto-layer</artifactId>
+				<artifactId>filesystem-crypto</artifactId>
 				<version>${project.version}</version>
 			</dependency>
 			
@@ -216,12 +216,12 @@
 		<module>filesystem-api</module>
 		<module>filesystem-inmemory</module>
 		<module>filesystem-nio</module>
-		<module>crypto-layer</module>
+		<module>filesystem-nameshortening</module>
+		<module>filesystem-crypto</module>
 		<module>crypto-api</module>
 		<module>crypto-aes</module>
 		<module>core</module>
 		<module>ui</module>
-		<module>shortening-layer</module>
 	</modules>
 
 	<profiles>