diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 5f4856ec79..ad79549e5e 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -24,7 +24,7 @@ foreach ($files as $file) {
 }
 
 // get array with updated storage stats (e.g. max file size) after upload
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Lib\Helper::buildFileStorageStatistics($dir);
 
 if ($success) {
 	OCP\JSON::success(array("data" => array_merge(array("dir" => $dir, "files" => $files), $storageStats)));
diff --git a/apps/files/ajax/getstoragestats.php b/apps/files/ajax/getstoragestats.php
index 7a2b642a9b..ace261ba76 100644
--- a/apps/files/ajax/getstoragestats.php
+++ b/apps/files/ajax/getstoragestats.php
@@ -6,4 +6,4 @@ $RUNTIME_APPTYPES = array('filesystem');
 OCP\JSON::checkLoggedIn();
 
 // send back json
-OCP\JSON::success(array('data' => \OCA\files\lib\Helper::buildFileStorageStatistics('/')));
+OCP\JSON::success(array('data' => \OCA\Files\Lib\Helper::buildFileStorageStatistics('/')));
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index f1b713b553..869c9b9e34 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -20,11 +20,11 @@ $doBreadcrumb = isset($_GET['breadcrumb']);
 $data = array();
 $baseUrl = OCP\Util::linkTo('files', 'index.php') . '?dir=';
 
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Lib\Helper::getDirPermissions($dir);
 
 // Make breadcrumb
 if($doBreadcrumb) {
-	$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+	$breadcrumb = \OCA\Files\Lib\Helper::makeBreadcrumb($dir);
 
 	$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 	$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -34,7 +34,7 @@ if($doBreadcrumb) {
 }
 
 // make filelist
-$files = \OCA\files\lib\Helper::getFiles($dir);
+$files = \OCA\Files\Lib\Helper::getFiles($dir);
 
 $list = new OCP\Template("files", "part.list", "");
 $list->assign('files', $files, false);
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 9ccd4cc299..742da4d2da 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -28,7 +28,7 @@ if($mimetypes && !in_array('httpd/unix-directory', $mimetypes)) {
 		$file['directory'] = $dir;
 		$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 		$file["date"] = OCP\Util::formatDate($file["mtime"]);
-		$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+		$file['mimetype_icon'] = \OCA\Files\Lib\Helper::determineIcon($file);
 		$files[] = $file;
 	}
 }
@@ -39,7 +39,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
 			$file['directory'] = $dir;
 			$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 			$file["date"] = OCP\Util::formatDate($file["mtime"]);
-			$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+			$file['mimetype_icon'] = \OCA\Files\Lib\Helper::determineIcon($file);
 			$files[] = $file;
 		}
 	}
@@ -48,7 +48,7 @@ if (is_array($mimetypes) && count($mimetypes)) {
 		$file['directory'] = $dir;
 		$file['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($file['mimetype']);
 		$file["date"] = OCP\Util::formatDate($file["mtime"]);
-		$file['mimetype_icon'] = \OCA\files\lib\Helper::determineIcon($file);
+		$file['mimetype_icon'] = \OCA\Files\Lib\Helper::determineIcon($file);
 		$files[] = $file;
 	}
 }
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 3d5314afc8..e07e2c07f3 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -53,7 +53,7 @@ OCP\JSON::callCheck();
 
 
 // get array with current storage stats (e.g. max file size)
-$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+$storageStats = \OCA\Files\Lib\Helper::buildFileStorageStatistics($dir);
 
 if (!isset($_FILES['files'])) {
 	OCP\JSON::error(array('data' => array_merge(array('message' => $l->t('No file was uploaded. Unknown error')), $storageStats)));
@@ -113,7 +113,7 @@ if (strpos($dir, '..') === false) {
 			if (is_uploaded_file($files['tmp_name'][$i]) and \OC\Files\Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
 				
 				// updated max file size after upload
-				$storageStats = \OCA\files\lib\Helper::buildFileStorageStatistics($dir);
+				$storageStats = \OCA\Files\Lib\Helper::buildFileStorageStatistics($dir);
 				
 				$meta = \OC\Files\Filesystem::getFileInfo($target);
 				if ($meta === false) {
diff --git a/apps/files/index.php b/apps/files/index.php
index 9e54a706c0..32c3e09cd6 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -74,14 +74,14 @@ if (\OC\Files\Cache\Upgrade::needUpgrade($user)) { //dont load anything if we ne
 		$ajaxLoad = true;
 	}
 	else{
-		$files = \OCA\files\lib\Helper::getFiles($dir);
+		$files = \OCA\Files\Lib\Helper::getFiles($dir);
 	}
 	$freeSpace = \OC\Files\Filesystem::free_space($dir);
 	$needUpgrade = false;
 }
 
 // Make breadcrumb
-$breadcrumb = \OCA\files\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files\Lib\Helper::makeBreadcrumb($dir);
 
 // make breadcrumb und filelist markup
 $list = new OCP\Template('files', 'part.list', '');
@@ -93,7 +93,7 @@ $breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb);
 $breadcrumbNav->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=');
 
-$permissions = \OCA\files\lib\Helper::getDirPermissions($dir);
+$permissions = \OCA\Files\Lib\Helper::getDirPermissions($dir);
 
 if ($needUpgrade) {
 	OCP\Util::addscript('files', 'upgrade');
diff --git a/apps/files/lib/helper.php b/apps/files/lib/helper.php
index 3c13b8ea6e..5b454127a7 100644
--- a/apps/files/lib/helper.php
+++ b/apps/files/lib/helper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OCA\files\lib;
+namespace OCA\Files\Lib;
 
 class Helper
 {
@@ -85,11 +85,11 @@ class Helper
 			}
 			$i['directory'] = $dir;
 			$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($i['mimetype']);
-			$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+			$i['icon'] = \OCA\Files\Lib\Helper::determineIcon($i);
 			$files[] = $i;
 		}
 
-		usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+		usort($files, array('\OCA\Files\Lib\Helper', 'fileCmp'));
 
 		return $files;
 	}
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index c997a7950c..02201c16ed 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -22,7 +22,7 @@ function fileCmp($a, $b) {
 function determineIcon($file, $sharingRoot, $sharingToken) {
 	// for folders we simply reuse the files logic
 	if($file['type'] == 'dir') {
-		return \OCA\files\lib\Helper::determineIcon($file);
+		return \OCA\Files\Lib\Helper::determineIcon($file);
 	}
 
 	$relativePath = substr($file['path'], 6);
diff --git a/apps/files_trashbin/ajax/list.php b/apps/files_trashbin/ajax/list.php
index e72e67b01d..c9dc13b784 100644
--- a/apps/files_trashbin/ajax/list.php
+++ b/apps/files_trashbin/ajax/list.php
@@ -15,7 +15,7 @@ $data = array();
 
 // Make breadcrumb
 if($doBreadcrumb) {
-	$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+	$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
 
 	$breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
 	$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
@@ -26,7 +26,7 @@ if($doBreadcrumb) {
 }
 
 // make filelist
-$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
 
 if ($files === null){
 	header("HTTP/1.0 404 Not Found");
diff --git a/apps/files_trashbin/appinfo/app.php b/apps/files_trashbin/appinfo/app.php
index 2c101f0a72..d30a601ef5 100644
--- a/apps/files_trashbin/appinfo/app.php
+++ b/apps/files_trashbin/appinfo/app.php
@@ -1,7 +1,7 @@
 <?php
 
-OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
-OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Hooks'] = 'files_trashbin/lib/hooks.php';
+//OC::$CLASSPATH['OCA\Files_Trashbin\Trashbin'] = 'files_trashbin/lib/trash.php';
 
 // register hooks
 \OCA\Files_Trashbin\Trashbin::registerHooks();
diff --git a/apps/files_trashbin/index.php b/apps/files_trashbin/index.php
index 9f17448a75..d8661e170a 100644
--- a/apps/files_trashbin/index.php
+++ b/apps/files_trashbin/index.php
@@ -36,7 +36,7 @@ if ($isIE8 && isset($_GET['dir'])){
 $ajaxLoad = false;
 
 if (!$isIE8){
-	$files = \OCA\files_trashbin\lib\Helper::getTrashFiles($dir);
+	$files = \OCA\Files_Trashbin\Helper::getTrashFiles($dir);
 }
 else{
 	$files = array();
@@ -54,7 +54,7 @@ if ($dir && $dir !== '/') {
     $dirlisting = true;
 }
 
-$breadcrumb = \OCA\files_trashbin\lib\Helper::makeBreadcrumb($dir);
+$breadcrumb = \OCA\Files_Trashbin\Helper::makeBreadcrumb($dir);
 
 $breadcrumbNav = new OCP\Template('files_trashbin', 'part.breadcrumb', '');
 $breadcrumbNav->assign('breadcrumb', $breadcrumb);
diff --git a/apps/files_trashbin/lib/helper.php b/apps/files_trashbin/lib/helper.php
index 098fc0b54b..1c89eaf2c2 100644
--- a/apps/files_trashbin/lib/helper.php
+++ b/apps/files_trashbin/lib/helper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace OCA\files_trashbin\lib;
+namespace OCA\Files_Trashbin;
 
 class Helper
 {
@@ -62,11 +62,11 @@ class Helper
 			}
 			$i['permissions'] = \OCP\PERMISSION_READ;
 			$i['isPreviewAvailable'] = \OCP\Preview::isMimeSupported($r['mime']);
-			$i['icon'] = \OCA\files\lib\Helper::determineIcon($i);
+			$i['icon'] = \OCA\Files\Lib\Helper::determineIcon($i);
 			$files[] = $i;
 		}
 
-		usort($files, array('\OCA\files\lib\Helper', 'fileCmp'));
+		usort($files, array('\OCA\Files\Lib\Helper', 'fileCmp'));
 
 		return $files;
 	}
diff --git a/apps/files_trashbin/lib/trash.php b/apps/files_trashbin/lib/trashbin.php
similarity index 100%
rename from apps/files_trashbin/lib/trash.php
rename to apps/files_trashbin/lib/trashbin.php