diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 8bf422a612..7e7e6a5c85 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -1,20 +1,5 @@
 <?php
 
-OC::$CLASSPATH['OCA\Encryption\Crypt'] = 'files_encryption/lib/crypt.php';
-OC::$CLASSPATH['OCA\Encryption\Hooks'] = 'files_encryption/hooks/hooks.php';
-OC::$CLASSPATH['OCA\Encryption\Util'] = 'files_encryption/lib/util.php';
-OC::$CLASSPATH['OCA\Encryption\Keymanager'] = 'files_encryption/lib/keymanager.php';
-OC::$CLASSPATH['OCA\Encryption\Stream'] = 'files_encryption/lib/stream.php';
-OC::$CLASSPATH['OCA\Encryption\Proxy'] = 'files_encryption/lib/proxy.php';
-OC::$CLASSPATH['OCA\Encryption\Session'] = 'files_encryption/lib/session.php';
-OC::$CLASSPATH['OCA\Encryption\Capabilities'] = 'files_encryption/lib/capabilities.php';
-OC::$CLASSPATH['OCA\Encryption\Helper'] = 'files_encryption/lib/helper.php';
-
-// Exceptions
-OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyEncryptException'] = 'files_encryption/exception/multiKeyEncryptException.php';
-OC::$CLASSPATH['OCA\Encryption\Exception\MultiKeyDecryptException'] = 'files_encryption/exception/multiKeyDecryptException.php';
-OC::$CLASSPATH['OCA\Encryption\Exception\EncryptionException'] = 'files_encryption/exception/encryptionException.php';
-
 \OCP\Util::addTranslations('files_encryption');
 \OCP\Util::addscript('files_encryption', 'encryption');
 \OCP\Util::addscript('files_encryption', 'detect-migration');
diff --git a/apps/files_encryption/exception/encryptionException.php b/apps/files_encryption/exception/encryptionexception.php
similarity index 97%
rename from apps/files_encryption/exception/encryptionException.php
rename to apps/files_encryption/exception/encryptionexception.php
index de1f16b4f4..2fb679e91d 100644
--- a/apps/files_encryption/exception/encryptionException.php
+++ b/apps/files_encryption/exception/encryptionexception.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Encryption\Exception;
+namespace OCA\Files_Encryption\Exception;
 
 /**
  * Base class for all encryption exception
diff --git a/apps/files_encryption/exception/multiKeyDecryptException.php b/apps/files_encryption/exception/multikeydecryptexception.php
similarity index 95%
rename from apps/files_encryption/exception/multiKeyDecryptException.php
rename to apps/files_encryption/exception/multikeydecryptexception.php
index c1e40e045e..9ab10fd3e6 100644
--- a/apps/files_encryption/exception/multiKeyDecryptException.php
+++ b/apps/files_encryption/exception/multikeydecryptexception.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Encryption\Exception;
+namespace OCA\Files_Encryption\Exception;
 
 /**
  * Throw this encryption if multi key decryption failed
diff --git a/apps/files_encryption/exception/multiKeyEncryptException.php b/apps/files_encryption/exception/multikeyencryptexception.php
similarity index 95%
rename from apps/files_encryption/exception/multiKeyEncryptException.php
rename to apps/files_encryption/exception/multikeyencryptexception.php
index e3aa7de591..2dc8216aba 100644
--- a/apps/files_encryption/exception/multiKeyEncryptException.php
+++ b/apps/files_encryption/exception/multikeyencryptexception.php
@@ -21,7 +21,7 @@
  *
  */
 
-namespace OCA\Encryption\Exception;
+namespace OCA\Files_Encryption\Exception;
 
 /**
  * Throw this exception if multi key encrytion fails
diff --git a/apps/files_encryption/lib/capabilities.php b/apps/files_encryption/lib/capabilities.php
index ef94c9e086..e6e4ee7d41 100644
--- a/apps/files_encryption/lib/capabilities.php
+++ b/apps/files_encryption/lib/capabilities.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
  
-namespace OCA\Encryption; 
+namespace OCA\Files_Encryption;
 
 class Capabilities {
 	
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index cf915ae27b..34b676dba2 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -25,7 +25,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class for common cryptography functionality
diff --git a/apps/files_encryption/lib/helper.php b/apps/files_encryption/lib/helper.php
index 34deb11279..b1147a0eb5 100644
--- a/apps/files_encryption/lib/helper.php
+++ b/apps/files_encryption/lib/helper.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class to manage registration of hooks an various helper methods
diff --git a/apps/files_encryption/hooks/hooks.php b/apps/files_encryption/lib/hooks.php
similarity index 96%
rename from apps/files_encryption/hooks/hooks.php
rename to apps/files_encryption/lib/hooks.php
index f26eefa30e..a22477fce9 100644
--- a/apps/files_encryption/hooks/hooks.php
+++ b/apps/files_encryption/lib/hooks.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 use OC\Files\Filesystem;
 
diff --git a/apps/files_encryption/lib/keymanager.php b/apps/files_encryption/lib/keymanager.php
index c8de1a73d2..16f0610f01 100644
--- a/apps/files_encryption/lib/keymanager.php
+++ b/apps/files_encryption/lib/keymanager.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class to manage storage and retrieval of encryption keys
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 0e8ca7319f..720b88c3d7 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -30,7 +30,7 @@
  *        webui.
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class Proxy
diff --git a/apps/files_encryption/lib/session.php b/apps/files_encryption/lib/session.php
index 7f1e0664cd..e84befb6ed 100644
--- a/apps/files_encryption/lib/session.php
+++ b/apps/files_encryption/lib/session.php
@@ -22,7 +22,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class for handling encryption related session data
diff --git a/apps/files_encryption/lib/stream.php b/apps/files_encryption/lib/stream.php
index 4038e64134..430bdb595b 100644
--- a/apps/files_encryption/lib/stream.php
+++ b/apps/files_encryption/lib/stream.php
@@ -30,7 +30,7 @@
  * and then fopen('crypt://streams/foo');
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 use OCA\Encryption\Exception\EncryptionException;
 
 /**
diff --git a/apps/files_encryption/lib/util.php b/apps/files_encryption/lib/util.php
index 2b4a50d6e2..2052a976f7 100644
--- a/apps/files_encryption/lib/util.php
+++ b/apps/files_encryption/lib/util.php
@@ -23,7 +23,7 @@
  *
  */
 
-namespace OCA\Encryption;
+namespace OCA\Files_Encryption;
 
 /**
  * Class for utilities relating to encrypted file storage system