diff --git a/lib/autoloader.php b/lib/autoloader.php
index 01841f831b..7204120011 100644
--- a/lib/autoloader.php
+++ b/lib/autoloader.php
@@ -73,10 +73,10 @@ class Autoloader {
 			}
 		} elseif (strpos($class, 'OC_') === 0) {
 			// first check for legacy classes if underscores are used
-			$paths[] = 'legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
-			$paths[] = strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/legacy/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/' . strtolower(str_replace('_', '/', substr($class, 3)) . '.php');
 		} elseif (strpos($class, 'OC\\') === 0) {
-			$paths[] = strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
+			$paths[] = 'private/' . strtolower(str_replace('\\', '/', substr($class, 3)) . '.php');
 		} elseif (strpos($class, 'OCP\\') === 0) {
 			$paths[] = 'public/' . strtolower(str_replace('\\', '/', substr($class, 4)) . '.php');
 		} elseif (strpos($class, 'OCA\\') === 0) {
diff --git a/lib/base.php b/lib/base.php
index 036051119d..42182c21fb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -164,7 +164,7 @@ class OC {
 
 		// set the right include path
 		set_include_path(
-			OC::$SERVERROOT . '/lib' . PATH_SEPARATOR .
+			OC::$SERVERROOT . '/lib/private' . PATH_SEPARATOR .
 			OC::$SERVERROOT . '/config' . PATH_SEPARATOR .
 			OC::$THIRDPARTYROOT . '/3rdparty' . PATH_SEPARATOR .
 			implode($paths, PATH_SEPARATOR) . PATH_SEPARATOR .
diff --git a/lib/allconfig.php b/lib/private/allconfig.php
similarity index 100%
rename from lib/allconfig.php
rename to lib/private/allconfig.php
diff --git a/lib/api.php b/lib/private/api.php
similarity index 100%
rename from lib/api.php
rename to lib/private/api.php
diff --git a/lib/app.php b/lib/private/app.php
similarity index 100%
rename from lib/app.php
rename to lib/private/app.php
diff --git a/lib/appconfig.php b/lib/private/appconfig.php
similarity index 100%
rename from lib/appconfig.php
rename to lib/private/appconfig.php
diff --git a/lib/appframework/app.php b/lib/private/appframework/app.php
similarity index 100%
rename from lib/appframework/app.php
rename to lib/private/appframework/app.php
diff --git a/lib/appframework/controller/controller.php b/lib/private/appframework/controller/controller.php
similarity index 100%
rename from lib/appframework/controller/controller.php
rename to lib/private/appframework/controller/controller.php
diff --git a/lib/appframework/core/api.php b/lib/private/appframework/core/api.php
similarity index 100%
rename from lib/appframework/core/api.php
rename to lib/private/appframework/core/api.php
diff --git a/lib/appframework/dependencyinjection/dicontainer.php b/lib/private/appframework/dependencyinjection/dicontainer.php
similarity index 100%
rename from lib/appframework/dependencyinjection/dicontainer.php
rename to lib/private/appframework/dependencyinjection/dicontainer.php
diff --git a/lib/appframework/http/dispatcher.php b/lib/private/appframework/http/dispatcher.php
similarity index 100%
rename from lib/appframework/http/dispatcher.php
rename to lib/private/appframework/http/dispatcher.php
diff --git a/lib/appframework/http/downloadresponse.php b/lib/private/appframework/http/downloadresponse.php
similarity index 100%
rename from lib/appframework/http/downloadresponse.php
rename to lib/private/appframework/http/downloadresponse.php
diff --git a/lib/appframework/http/http.php b/lib/private/appframework/http/http.php
similarity index 100%
rename from lib/appframework/http/http.php
rename to lib/private/appframework/http/http.php
diff --git a/lib/appframework/http/redirectresponse.php b/lib/private/appframework/http/redirectresponse.php
similarity index 100%
rename from lib/appframework/http/redirectresponse.php
rename to lib/private/appframework/http/redirectresponse.php
diff --git a/lib/appframework/http/request.php b/lib/private/appframework/http/request.php
similarity index 100%
rename from lib/appframework/http/request.php
rename to lib/private/appframework/http/request.php
diff --git a/lib/appframework/middleware/middleware.php b/lib/private/appframework/middleware/middleware.php
similarity index 100%
rename from lib/appframework/middleware/middleware.php
rename to lib/private/appframework/middleware/middleware.php
diff --git a/lib/appframework/middleware/middlewaredispatcher.php b/lib/private/appframework/middleware/middlewaredispatcher.php
similarity index 100%
rename from lib/appframework/middleware/middlewaredispatcher.php
rename to lib/private/appframework/middleware/middlewaredispatcher.php
diff --git a/lib/appframework/middleware/security/securityexception.php b/lib/private/appframework/middleware/security/securityexception.php
similarity index 100%
rename from lib/appframework/middleware/security/securityexception.php
rename to lib/private/appframework/middleware/security/securityexception.php
diff --git a/lib/appframework/middleware/security/securitymiddleware.php b/lib/private/appframework/middleware/security/securitymiddleware.php
similarity index 100%
rename from lib/appframework/middleware/security/securitymiddleware.php
rename to lib/private/appframework/middleware/security/securitymiddleware.php
diff --git a/lib/appframework/routing/routeactionhandler.php b/lib/private/appframework/routing/routeactionhandler.php
similarity index 100%
rename from lib/appframework/routing/routeactionhandler.php
rename to lib/private/appframework/routing/routeactionhandler.php
diff --git a/lib/appframework/routing/routeconfig.php b/lib/private/appframework/routing/routeconfig.php
similarity index 100%
rename from lib/appframework/routing/routeconfig.php
rename to lib/private/appframework/routing/routeconfig.php
diff --git a/lib/appframework/utility/methodannotationreader.php b/lib/private/appframework/utility/methodannotationreader.php
similarity index 100%
rename from lib/appframework/utility/methodannotationreader.php
rename to lib/private/appframework/utility/methodannotationreader.php
diff --git a/lib/appframework/utility/simplecontainer.php b/lib/private/appframework/utility/simplecontainer.php
similarity index 94%
rename from lib/appframework/utility/simplecontainer.php
rename to lib/private/appframework/utility/simplecontainer.php
index a51ace83a3..7e4db63bde 100644
--- a/lib/appframework/utility/simplecontainer.php
+++ b/lib/private/appframework/utility/simplecontainer.php
@@ -3,7 +3,7 @@
 namespace OC\AppFramework\Utility;
 
 // register 3rdparty autoloaders
-require_once __DIR__ . '/../../../3rdparty/Pimple/Pimple.php';
+require_once __DIR__ . '/../../../../3rdparty/Pimple/Pimple.php';
 
 /**
  * Class SimpleContainer
diff --git a/lib/appframework/utility/timefactory.php b/lib/private/appframework/utility/timefactory.php
similarity index 100%
rename from lib/appframework/utility/timefactory.php
rename to lib/private/appframework/utility/timefactory.php
diff --git a/lib/archive.php b/lib/private/archive.php
similarity index 100%
rename from lib/archive.php
rename to lib/private/archive.php
diff --git a/lib/archive/tar.php b/lib/private/archive/tar.php
similarity index 100%
rename from lib/archive/tar.php
rename to lib/private/archive/tar.php
diff --git a/lib/archive/zip.php b/lib/private/archive/zip.php
similarity index 100%
rename from lib/archive/zip.php
rename to lib/private/archive/zip.php
diff --git a/lib/arrayparser.php b/lib/private/arrayparser.php
similarity index 100%
rename from lib/arrayparser.php
rename to lib/private/arrayparser.php
diff --git a/lib/avatar.php b/lib/private/avatar.php
similarity index 100%
rename from lib/avatar.php
rename to lib/private/avatar.php
diff --git a/lib/backgroundjob.php b/lib/private/backgroundjob.php
similarity index 100%
rename from lib/backgroundjob.php
rename to lib/private/backgroundjob.php
diff --git a/lib/backgroundjob/job.php b/lib/private/backgroundjob/job.php
similarity index 100%
rename from lib/backgroundjob/job.php
rename to lib/private/backgroundjob/job.php
diff --git a/lib/backgroundjob/joblist.php b/lib/private/backgroundjob/joblist.php
similarity index 100%
rename from lib/backgroundjob/joblist.php
rename to lib/private/backgroundjob/joblist.php
diff --git a/lib/backgroundjob/legacy/queuedjob.php b/lib/private/backgroundjob/legacy/queuedjob.php
similarity index 100%
rename from lib/backgroundjob/legacy/queuedjob.php
rename to lib/private/backgroundjob/legacy/queuedjob.php
diff --git a/lib/backgroundjob/legacy/regularjob.php b/lib/private/backgroundjob/legacy/regularjob.php
similarity index 100%
rename from lib/backgroundjob/legacy/regularjob.php
rename to lib/private/backgroundjob/legacy/regularjob.php
diff --git a/lib/backgroundjob/queuedjob.php b/lib/private/backgroundjob/queuedjob.php
similarity index 100%
rename from lib/backgroundjob/queuedjob.php
rename to lib/private/backgroundjob/queuedjob.php
diff --git a/lib/backgroundjob/timedjob.php b/lib/private/backgroundjob/timedjob.php
similarity index 100%
rename from lib/backgroundjob/timedjob.php
rename to lib/private/backgroundjob/timedjob.php
diff --git a/lib/cache.php b/lib/private/cache.php
similarity index 100%
rename from lib/cache.php
rename to lib/private/cache.php
diff --git a/lib/cache/broker.php b/lib/private/cache/broker.php
similarity index 100%
rename from lib/cache/broker.php
rename to lib/private/cache/broker.php
diff --git a/lib/cache/file.php b/lib/private/cache/file.php
similarity index 100%
rename from lib/cache/file.php
rename to lib/private/cache/file.php
diff --git a/lib/cache/fileglobal.php b/lib/private/cache/fileglobal.php
similarity index 100%
rename from lib/cache/fileglobal.php
rename to lib/private/cache/fileglobal.php
diff --git a/lib/cache/fileglobalgc.php b/lib/private/cache/fileglobalgc.php
similarity index 100%
rename from lib/cache/fileglobalgc.php
rename to lib/private/cache/fileglobalgc.php
diff --git a/lib/cache/usercache.php b/lib/private/cache/usercache.php
similarity index 100%
rename from lib/cache/usercache.php
rename to lib/private/cache/usercache.php
diff --git a/lib/config.php b/lib/private/config.php
similarity index 100%
rename from lib/config.php
rename to lib/private/config.php
diff --git a/lib/connector/sabre/ServiceUnavailable.php b/lib/private/connector/sabre/ServiceUnavailable.php
similarity index 100%
rename from lib/connector/sabre/ServiceUnavailable.php
rename to lib/private/connector/sabre/ServiceUnavailable.php
diff --git a/lib/connector/sabre/aborteduploaddetectionplugin.php b/lib/private/connector/sabre/aborteduploaddetectionplugin.php
similarity index 100%
rename from lib/connector/sabre/aborteduploaddetectionplugin.php
rename to lib/private/connector/sabre/aborteduploaddetectionplugin.php
diff --git a/lib/connector/sabre/auth.php b/lib/private/connector/sabre/auth.php
similarity index 100%
rename from lib/connector/sabre/auth.php
rename to lib/private/connector/sabre/auth.php
diff --git a/lib/connector/sabre/directory.php b/lib/private/connector/sabre/directory.php
similarity index 100%
rename from lib/connector/sabre/directory.php
rename to lib/private/connector/sabre/directory.php
diff --git a/lib/connector/sabre/file.php b/lib/private/connector/sabre/file.php
similarity index 100%
rename from lib/connector/sabre/file.php
rename to lib/private/connector/sabre/file.php
diff --git a/lib/connector/sabre/locks.php b/lib/private/connector/sabre/locks.php
similarity index 100%
rename from lib/connector/sabre/locks.php
rename to lib/private/connector/sabre/locks.php
diff --git a/lib/connector/sabre/maintenanceplugin.php b/lib/private/connector/sabre/maintenanceplugin.php
similarity index 100%
rename from lib/connector/sabre/maintenanceplugin.php
rename to lib/private/connector/sabre/maintenanceplugin.php
diff --git a/lib/connector/sabre/node.php b/lib/private/connector/sabre/node.php
similarity index 100%
rename from lib/connector/sabre/node.php
rename to lib/private/connector/sabre/node.php
diff --git a/lib/connector/sabre/objecttree.php b/lib/private/connector/sabre/objecttree.php
similarity index 100%
rename from lib/connector/sabre/objecttree.php
rename to lib/private/connector/sabre/objecttree.php
diff --git a/lib/connector/sabre/principal.php b/lib/private/connector/sabre/principal.php
similarity index 100%
rename from lib/connector/sabre/principal.php
rename to lib/private/connector/sabre/principal.php
diff --git a/lib/connector/sabre/quotaplugin.php b/lib/private/connector/sabre/quotaplugin.php
similarity index 100%
rename from lib/connector/sabre/quotaplugin.php
rename to lib/private/connector/sabre/quotaplugin.php
diff --git a/lib/connector/sabre/request.php b/lib/private/connector/sabre/request.php
similarity index 100%
rename from lib/connector/sabre/request.php
rename to lib/private/connector/sabre/request.php
diff --git a/lib/contactsmanager.php b/lib/private/contactsmanager.php
similarity index 100%
rename from lib/contactsmanager.php
rename to lib/private/contactsmanager.php
diff --git a/lib/db.php b/lib/private/db.php
similarity index 100%
rename from lib/db.php
rename to lib/private/db.php
diff --git a/lib/db/adapter.php b/lib/private/db/adapter.php
similarity index 100%
rename from lib/db/adapter.php
rename to lib/private/db/adapter.php
diff --git a/lib/db/adapteroci8.php b/lib/private/db/adapteroci8.php
similarity index 100%
rename from lib/db/adapteroci8.php
rename to lib/private/db/adapteroci8.php
diff --git a/lib/db/adapterpgsql.php b/lib/private/db/adapterpgsql.php
similarity index 100%
rename from lib/db/adapterpgsql.php
rename to lib/private/db/adapterpgsql.php
diff --git a/lib/db/adaptersqlite.php b/lib/private/db/adaptersqlite.php
similarity index 100%
rename from lib/db/adaptersqlite.php
rename to lib/private/db/adaptersqlite.php
diff --git a/lib/db/adaptersqlsrv.php b/lib/private/db/adaptersqlsrv.php
similarity index 100%
rename from lib/db/adaptersqlsrv.php
rename to lib/private/db/adaptersqlsrv.php
diff --git a/lib/db/connection.php b/lib/private/db/connection.php
similarity index 100%
rename from lib/db/connection.php
rename to lib/private/db/connection.php
diff --git a/lib/db/mdb2schemamanager.php b/lib/private/db/mdb2schemamanager.php
similarity index 100%
rename from lib/db/mdb2schemamanager.php
rename to lib/private/db/mdb2schemamanager.php
diff --git a/lib/db/mdb2schemareader.php b/lib/private/db/mdb2schemareader.php
similarity index 100%
rename from lib/db/mdb2schemareader.php
rename to lib/private/db/mdb2schemareader.php
diff --git a/lib/db/mdb2schemawriter.php b/lib/private/db/mdb2schemawriter.php
similarity index 100%
rename from lib/db/mdb2schemawriter.php
rename to lib/private/db/mdb2schemawriter.php
diff --git a/lib/db/oracleconnection.php b/lib/private/db/oracleconnection.php
similarity index 100%
rename from lib/db/oracleconnection.php
rename to lib/private/db/oracleconnection.php
diff --git a/lib/db/statementwrapper.php b/lib/private/db/statementwrapper.php
similarity index 100%
rename from lib/db/statementwrapper.php
rename to lib/private/db/statementwrapper.php
diff --git a/lib/defaults.php b/lib/private/defaults.php
similarity index 100%
rename from lib/defaults.php
rename to lib/private/defaults.php
diff --git a/lib/eventsource.php b/lib/private/eventsource.php
similarity index 100%
rename from lib/eventsource.php
rename to lib/private/eventsource.php
diff --git a/lib/filechunking.php b/lib/private/filechunking.php
similarity index 100%
rename from lib/filechunking.php
rename to lib/private/filechunking.php
diff --git a/lib/fileproxy.php b/lib/private/fileproxy.php
similarity index 100%
rename from lib/fileproxy.php
rename to lib/private/fileproxy.php
diff --git a/lib/fileproxy/fileoperations.php b/lib/private/fileproxy/fileoperations.php
similarity index 100%
rename from lib/fileproxy/fileoperations.php
rename to lib/private/fileproxy/fileoperations.php
diff --git a/lib/files.php b/lib/private/files.php
similarity index 100%
rename from lib/files.php
rename to lib/private/files.php
diff --git a/lib/files/cache/backgroundwatcher.php b/lib/private/files/cache/backgroundwatcher.php
similarity index 100%
rename from lib/files/cache/backgroundwatcher.php
rename to lib/private/files/cache/backgroundwatcher.php
diff --git a/lib/files/cache/cache.php b/lib/private/files/cache/cache.php
similarity index 100%
rename from lib/files/cache/cache.php
rename to lib/private/files/cache/cache.php
diff --git a/lib/files/cache/legacy.php b/lib/private/files/cache/legacy.php
similarity index 100%
rename from lib/files/cache/legacy.php
rename to lib/private/files/cache/legacy.php
diff --git a/lib/files/cache/permissions.php b/lib/private/files/cache/permissions.php
similarity index 100%
rename from lib/files/cache/permissions.php
rename to lib/private/files/cache/permissions.php
diff --git a/lib/files/cache/scanner.php b/lib/private/files/cache/scanner.php
similarity index 100%
rename from lib/files/cache/scanner.php
rename to lib/private/files/cache/scanner.php
diff --git a/lib/files/cache/storage.php b/lib/private/files/cache/storage.php
similarity index 100%
rename from lib/files/cache/storage.php
rename to lib/private/files/cache/storage.php
diff --git a/lib/files/cache/updater.php b/lib/private/files/cache/updater.php
similarity index 100%
rename from lib/files/cache/updater.php
rename to lib/private/files/cache/updater.php
diff --git a/lib/files/cache/upgrade.php b/lib/private/files/cache/upgrade.php
similarity index 100%
rename from lib/files/cache/upgrade.php
rename to lib/private/files/cache/upgrade.php
diff --git a/lib/files/cache/watcher.php b/lib/private/files/cache/watcher.php
similarity index 100%
rename from lib/files/cache/watcher.php
rename to lib/private/files/cache/watcher.php
diff --git a/lib/files/filesystem.php b/lib/private/files/filesystem.php
similarity index 100%
rename from lib/files/filesystem.php
rename to lib/private/files/filesystem.php
diff --git a/lib/files/mapper.php b/lib/private/files/mapper.php
similarity index 100%
rename from lib/files/mapper.php
rename to lib/private/files/mapper.php
diff --git a/lib/files/mount/manager.php b/lib/private/files/mount/manager.php
similarity index 100%
rename from lib/files/mount/manager.php
rename to lib/private/files/mount/manager.php
diff --git a/lib/files/mount/mount.php b/lib/private/files/mount/mount.php
similarity index 100%
rename from lib/files/mount/mount.php
rename to lib/private/files/mount/mount.php
diff --git a/lib/files/node/file.php b/lib/private/files/node/file.php
similarity index 100%
rename from lib/files/node/file.php
rename to lib/private/files/node/file.php
diff --git a/lib/files/node/folder.php b/lib/private/files/node/folder.php
similarity index 100%
rename from lib/files/node/folder.php
rename to lib/private/files/node/folder.php
diff --git a/lib/files/node/node.php b/lib/private/files/node/node.php
similarity index 100%
rename from lib/files/node/node.php
rename to lib/private/files/node/node.php
diff --git a/lib/files/node/nonexistingfile.php b/lib/private/files/node/nonexistingfile.php
similarity index 100%
rename from lib/files/node/nonexistingfile.php
rename to lib/private/files/node/nonexistingfile.php
diff --git a/lib/files/node/nonexistingfolder.php b/lib/private/files/node/nonexistingfolder.php
similarity index 100%
rename from lib/files/node/nonexistingfolder.php
rename to lib/private/files/node/nonexistingfolder.php
diff --git a/lib/files/node/root.php b/lib/private/files/node/root.php
similarity index 100%
rename from lib/files/node/root.php
rename to lib/private/files/node/root.php
diff --git a/lib/files/storage/common.php b/lib/private/files/storage/common.php
similarity index 100%
rename from lib/files/storage/common.php
rename to lib/private/files/storage/common.php
diff --git a/lib/files/storage/commontest.php b/lib/private/files/storage/commontest.php
similarity index 100%
rename from lib/files/storage/commontest.php
rename to lib/private/files/storage/commontest.php
diff --git a/lib/files/storage/loader.php b/lib/private/files/storage/loader.php
similarity index 100%
rename from lib/files/storage/loader.php
rename to lib/private/files/storage/loader.php
diff --git a/lib/files/storage/local.php b/lib/private/files/storage/local.php
similarity index 100%
rename from lib/files/storage/local.php
rename to lib/private/files/storage/local.php
diff --git a/lib/files/storage/mappedlocal.php b/lib/private/files/storage/mappedlocal.php
similarity index 100%
rename from lib/files/storage/mappedlocal.php
rename to lib/private/files/storage/mappedlocal.php
diff --git a/lib/files/storage/storage.php b/lib/private/files/storage/storage.php
similarity index 100%
rename from lib/files/storage/storage.php
rename to lib/private/files/storage/storage.php
diff --git a/lib/files/storage/temporary.php b/lib/private/files/storage/temporary.php
similarity index 100%
rename from lib/files/storage/temporary.php
rename to lib/private/files/storage/temporary.php
diff --git a/lib/files/storage/wrapper/quota.php b/lib/private/files/storage/wrapper/quota.php
similarity index 100%
rename from lib/files/storage/wrapper/quota.php
rename to lib/private/files/storage/wrapper/quota.php
diff --git a/lib/files/storage/wrapper/wrapper.php b/lib/private/files/storage/wrapper/wrapper.php
similarity index 100%
rename from lib/files/storage/wrapper/wrapper.php
rename to lib/private/files/storage/wrapper/wrapper.php
diff --git a/lib/files/stream/close.php b/lib/private/files/stream/close.php
similarity index 100%
rename from lib/files/stream/close.php
rename to lib/private/files/stream/close.php
diff --git a/lib/files/stream/dir.php b/lib/private/files/stream/dir.php
similarity index 100%
rename from lib/files/stream/dir.php
rename to lib/private/files/stream/dir.php
diff --git a/lib/files/stream/oc.php b/lib/private/files/stream/oc.php
similarity index 100%
rename from lib/files/stream/oc.php
rename to lib/private/files/stream/oc.php
diff --git a/lib/files/stream/quota.php b/lib/private/files/stream/quota.php
similarity index 100%
rename from lib/files/stream/quota.php
rename to lib/private/files/stream/quota.php
diff --git a/lib/files/stream/staticstream.php b/lib/private/files/stream/staticstream.php
similarity index 100%
rename from lib/files/stream/staticstream.php
rename to lib/private/files/stream/staticstream.php
diff --git a/lib/files/type/detection.php b/lib/private/files/type/detection.php
similarity index 100%
rename from lib/files/type/detection.php
rename to lib/private/files/type/detection.php
diff --git a/lib/files/type/templatemanager.php b/lib/private/files/type/templatemanager.php
similarity index 100%
rename from lib/files/type/templatemanager.php
rename to lib/private/files/type/templatemanager.php
diff --git a/lib/files/utils/scanner.php b/lib/private/files/utils/scanner.php
similarity index 100%
rename from lib/files/utils/scanner.php
rename to lib/private/files/utils/scanner.php
diff --git a/lib/files/view.php b/lib/private/files/view.php
similarity index 100%
rename from lib/files/view.php
rename to lib/private/files/view.php
diff --git a/lib/geo.php b/lib/private/geo.php
similarity index 100%
rename from lib/geo.php
rename to lib/private/geo.php
diff --git a/lib/group.php b/lib/private/group.php
similarity index 100%
rename from lib/group.php
rename to lib/private/group.php
diff --git a/lib/group/backend.php b/lib/private/group/backend.php
similarity index 100%
rename from lib/group/backend.php
rename to lib/private/group/backend.php
diff --git a/lib/group/database.php b/lib/private/group/database.php
similarity index 100%
rename from lib/group/database.php
rename to lib/private/group/database.php
diff --git a/lib/group/dummy.php b/lib/private/group/dummy.php
similarity index 100%
rename from lib/group/dummy.php
rename to lib/private/group/dummy.php
diff --git a/lib/group/example.php b/lib/private/group/example.php
similarity index 100%
rename from lib/group/example.php
rename to lib/private/group/example.php
diff --git a/lib/group/group.php b/lib/private/group/group.php
similarity index 100%
rename from lib/group/group.php
rename to lib/private/group/group.php
diff --git a/lib/group/interface.php b/lib/private/group/interface.php
similarity index 100%
rename from lib/group/interface.php
rename to lib/private/group/interface.php
diff --git a/lib/group/manager.php b/lib/private/group/manager.php
similarity index 100%
rename from lib/group/manager.php
rename to lib/private/group/manager.php
diff --git a/lib/helper.php b/lib/private/helper.php
similarity index 100%
rename from lib/helper.php
rename to lib/private/helper.php
diff --git a/lib/hintexception.php b/lib/private/hintexception.php
similarity index 100%
rename from lib/hintexception.php
rename to lib/private/hintexception.php
diff --git a/lib/hook.php b/lib/private/hook.php
similarity index 100%
rename from lib/hook.php
rename to lib/private/hook.php
diff --git a/lib/hooks/basicemitter.php b/lib/private/hooks/basicemitter.php
similarity index 100%
rename from lib/hooks/basicemitter.php
rename to lib/private/hooks/basicemitter.php
diff --git a/lib/hooks/emitter.php b/lib/private/hooks/emitter.php
similarity index 100%
rename from lib/hooks/emitter.php
rename to lib/private/hooks/emitter.php
diff --git a/lib/hooks/forwardingemitter.php b/lib/private/hooks/forwardingemitter.php
similarity index 100%
rename from lib/hooks/forwardingemitter.php
rename to lib/private/hooks/forwardingemitter.php
diff --git a/lib/hooks/legacyemitter.php b/lib/private/hooks/legacyemitter.php
similarity index 100%
rename from lib/hooks/legacyemitter.php
rename to lib/private/hooks/legacyemitter.php
diff --git a/lib/hooks/publicemitter.php b/lib/private/hooks/publicemitter.php
similarity index 100%
rename from lib/hooks/publicemitter.php
rename to lib/private/hooks/publicemitter.php
diff --git a/lib/image.php b/lib/private/image.php
similarity index 100%
rename from lib/image.php
rename to lib/private/image.php
diff --git a/lib/installer.php b/lib/private/installer.php
similarity index 100%
rename from lib/installer.php
rename to lib/private/installer.php
diff --git a/lib/json.php b/lib/private/json.php
similarity index 100%
rename from lib/json.php
rename to lib/private/json.php
diff --git a/lib/l10n.php b/lib/private/l10n.php
similarity index 100%
rename from lib/l10n.php
rename to lib/private/l10n.php
diff --git a/lib/l10n/ach.php b/lib/private/l10n/ach.php
similarity index 100%
rename from lib/l10n/ach.php
rename to lib/private/l10n/ach.php
diff --git a/lib/l10n/af_ZA.php b/lib/private/l10n/af_ZA.php
similarity index 100%
rename from lib/l10n/af_ZA.php
rename to lib/private/l10n/af_ZA.php
diff --git a/lib/l10n/ar.php b/lib/private/l10n/ar.php
similarity index 100%
rename from lib/l10n/ar.php
rename to lib/private/l10n/ar.php
diff --git a/lib/l10n/be.php b/lib/private/l10n/be.php
similarity index 100%
rename from lib/l10n/be.php
rename to lib/private/l10n/be.php
diff --git a/lib/l10n/bg_BG.php b/lib/private/l10n/bg_BG.php
similarity index 100%
rename from lib/l10n/bg_BG.php
rename to lib/private/l10n/bg_BG.php
diff --git a/lib/l10n/bn_BD.php b/lib/private/l10n/bn_BD.php
similarity index 100%
rename from lib/l10n/bn_BD.php
rename to lib/private/l10n/bn_BD.php
diff --git a/lib/l10n/bs.php b/lib/private/l10n/bs.php
similarity index 100%
rename from lib/l10n/bs.php
rename to lib/private/l10n/bs.php
diff --git a/lib/l10n/ca.php b/lib/private/l10n/ca.php
similarity index 100%
rename from lib/l10n/ca.php
rename to lib/private/l10n/ca.php
diff --git a/lib/l10n/cs_CZ.php b/lib/private/l10n/cs_CZ.php
similarity index 100%
rename from lib/l10n/cs_CZ.php
rename to lib/private/l10n/cs_CZ.php
diff --git a/lib/l10n/cy_GB.php b/lib/private/l10n/cy_GB.php
similarity index 100%
rename from lib/l10n/cy_GB.php
rename to lib/private/l10n/cy_GB.php
diff --git a/lib/l10n/da.php b/lib/private/l10n/da.php
similarity index 100%
rename from lib/l10n/da.php
rename to lib/private/l10n/da.php
diff --git a/lib/l10n/de.php b/lib/private/l10n/de.php
similarity index 100%
rename from lib/l10n/de.php
rename to lib/private/l10n/de.php
diff --git a/lib/l10n/de_AT.php b/lib/private/l10n/de_AT.php
similarity index 100%
rename from lib/l10n/de_AT.php
rename to lib/private/l10n/de_AT.php
diff --git a/lib/l10n/de_CH.php b/lib/private/l10n/de_CH.php
similarity index 100%
rename from lib/l10n/de_CH.php
rename to lib/private/l10n/de_CH.php
diff --git a/lib/l10n/de_DE.php b/lib/private/l10n/de_DE.php
similarity index 100%
rename from lib/l10n/de_DE.php
rename to lib/private/l10n/de_DE.php
diff --git a/lib/l10n/el.php b/lib/private/l10n/el.php
similarity index 100%
rename from lib/l10n/el.php
rename to lib/private/l10n/el.php
diff --git a/lib/l10n/en@pirate.php b/lib/private/l10n/en@pirate.php
similarity index 100%
rename from lib/l10n/en@pirate.php
rename to lib/private/l10n/en@pirate.php
diff --git a/lib/l10n/en_GB.php b/lib/private/l10n/en_GB.php
similarity index 100%
rename from lib/l10n/en_GB.php
rename to lib/private/l10n/en_GB.php
diff --git a/lib/l10n/eo.php b/lib/private/l10n/eo.php
similarity index 100%
rename from lib/l10n/eo.php
rename to lib/private/l10n/eo.php
diff --git a/lib/l10n/es.php b/lib/private/l10n/es.php
similarity index 100%
rename from lib/l10n/es.php
rename to lib/private/l10n/es.php
diff --git a/lib/l10n/es_AR.php b/lib/private/l10n/es_AR.php
similarity index 100%
rename from lib/l10n/es_AR.php
rename to lib/private/l10n/es_AR.php
diff --git a/lib/l10n/es_MX.php b/lib/private/l10n/es_MX.php
similarity index 100%
rename from lib/l10n/es_MX.php
rename to lib/private/l10n/es_MX.php
diff --git a/lib/l10n/et_EE.php b/lib/private/l10n/et_EE.php
similarity index 100%
rename from lib/l10n/et_EE.php
rename to lib/private/l10n/et_EE.php
diff --git a/lib/l10n/eu.php b/lib/private/l10n/eu.php
similarity index 100%
rename from lib/l10n/eu.php
rename to lib/private/l10n/eu.php
diff --git a/lib/l10n/fa.php b/lib/private/l10n/fa.php
similarity index 100%
rename from lib/l10n/fa.php
rename to lib/private/l10n/fa.php
diff --git a/lib/l10n/fi.php b/lib/private/l10n/fi.php
similarity index 100%
rename from lib/l10n/fi.php
rename to lib/private/l10n/fi.php
diff --git a/lib/l10n/fi_FI.php b/lib/private/l10n/fi_FI.php
similarity index 100%
rename from lib/l10n/fi_FI.php
rename to lib/private/l10n/fi_FI.php
diff --git a/lib/l10n/fr.php b/lib/private/l10n/fr.php
similarity index 100%
rename from lib/l10n/fr.php
rename to lib/private/l10n/fr.php
diff --git a/lib/l10n/gl.php b/lib/private/l10n/gl.php
similarity index 100%
rename from lib/l10n/gl.php
rename to lib/private/l10n/gl.php
diff --git a/lib/l10n/he.php b/lib/private/l10n/he.php
similarity index 100%
rename from lib/l10n/he.php
rename to lib/private/l10n/he.php
diff --git a/lib/l10n/hi.php b/lib/private/l10n/hi.php
similarity index 100%
rename from lib/l10n/hi.php
rename to lib/private/l10n/hi.php
diff --git a/lib/l10n/hr.php b/lib/private/l10n/hr.php
similarity index 100%
rename from lib/l10n/hr.php
rename to lib/private/l10n/hr.php
diff --git a/lib/l10n/hu_HU.php b/lib/private/l10n/hu_HU.php
similarity index 100%
rename from lib/l10n/hu_HU.php
rename to lib/private/l10n/hu_HU.php
diff --git a/lib/l10n/hy.php b/lib/private/l10n/hy.php
similarity index 100%
rename from lib/l10n/hy.php
rename to lib/private/l10n/hy.php
diff --git a/lib/l10n/ia.php b/lib/private/l10n/ia.php
similarity index 100%
rename from lib/l10n/ia.php
rename to lib/private/l10n/ia.php
diff --git a/lib/l10n/id.php b/lib/private/l10n/id.php
similarity index 100%
rename from lib/l10n/id.php
rename to lib/private/l10n/id.php
diff --git a/lib/l10n/is.php b/lib/private/l10n/is.php
similarity index 100%
rename from lib/l10n/is.php
rename to lib/private/l10n/is.php
diff --git a/lib/l10n/it.php b/lib/private/l10n/it.php
similarity index 100%
rename from lib/l10n/it.php
rename to lib/private/l10n/it.php
diff --git a/lib/l10n/ja_JP.php b/lib/private/l10n/ja_JP.php
similarity index 100%
rename from lib/l10n/ja_JP.php
rename to lib/private/l10n/ja_JP.php
diff --git a/lib/l10n/ka.php b/lib/private/l10n/ka.php
similarity index 100%
rename from lib/l10n/ka.php
rename to lib/private/l10n/ka.php
diff --git a/lib/l10n/ka_GE.php b/lib/private/l10n/ka_GE.php
similarity index 100%
rename from lib/l10n/ka_GE.php
rename to lib/private/l10n/ka_GE.php
diff --git a/lib/l10n/km.php b/lib/private/l10n/km.php
similarity index 100%
rename from lib/l10n/km.php
rename to lib/private/l10n/km.php
diff --git a/lib/l10n/kn.php b/lib/private/l10n/kn.php
similarity index 100%
rename from lib/l10n/kn.php
rename to lib/private/l10n/kn.php
diff --git a/lib/l10n/ko.php b/lib/private/l10n/ko.php
similarity index 100%
rename from lib/l10n/ko.php
rename to lib/private/l10n/ko.php
diff --git a/lib/l10n/ku_IQ.php b/lib/private/l10n/ku_IQ.php
similarity index 100%
rename from lib/l10n/ku_IQ.php
rename to lib/private/l10n/ku_IQ.php
diff --git a/lib/l10n/lb.php b/lib/private/l10n/lb.php
similarity index 100%
rename from lib/l10n/lb.php
rename to lib/private/l10n/lb.php
diff --git a/lib/l10n/lt_LT.php b/lib/private/l10n/lt_LT.php
similarity index 100%
rename from lib/l10n/lt_LT.php
rename to lib/private/l10n/lt_LT.php
diff --git a/lib/l10n/lv.php b/lib/private/l10n/lv.php
similarity index 100%
rename from lib/l10n/lv.php
rename to lib/private/l10n/lv.php
diff --git a/lib/l10n/mk.php b/lib/private/l10n/mk.php
similarity index 100%
rename from lib/l10n/mk.php
rename to lib/private/l10n/mk.php
diff --git a/lib/l10n/ml_IN.php b/lib/private/l10n/ml_IN.php
similarity index 100%
rename from lib/l10n/ml_IN.php
rename to lib/private/l10n/ml_IN.php
diff --git a/lib/l10n/ms_MY.php b/lib/private/l10n/ms_MY.php
similarity index 100%
rename from lib/l10n/ms_MY.php
rename to lib/private/l10n/ms_MY.php
diff --git a/lib/l10n/my_MM.php b/lib/private/l10n/my_MM.php
similarity index 100%
rename from lib/l10n/my_MM.php
rename to lib/private/l10n/my_MM.php
diff --git a/lib/l10n/nb_NO.php b/lib/private/l10n/nb_NO.php
similarity index 100%
rename from lib/l10n/nb_NO.php
rename to lib/private/l10n/nb_NO.php
diff --git a/lib/l10n/ne.php b/lib/private/l10n/ne.php
similarity index 100%
rename from lib/l10n/ne.php
rename to lib/private/l10n/ne.php
diff --git a/lib/l10n/nl.php b/lib/private/l10n/nl.php
similarity index 100%
rename from lib/l10n/nl.php
rename to lib/private/l10n/nl.php
diff --git a/lib/l10n/nn_NO.php b/lib/private/l10n/nn_NO.php
similarity index 100%
rename from lib/l10n/nn_NO.php
rename to lib/private/l10n/nn_NO.php
diff --git a/lib/l10n/nqo.php b/lib/private/l10n/nqo.php
similarity index 100%
rename from lib/l10n/nqo.php
rename to lib/private/l10n/nqo.php
diff --git a/lib/l10n/oc.php b/lib/private/l10n/oc.php
similarity index 100%
rename from lib/l10n/oc.php
rename to lib/private/l10n/oc.php
diff --git a/lib/l10n/pa.php b/lib/private/l10n/pa.php
similarity index 100%
rename from lib/l10n/pa.php
rename to lib/private/l10n/pa.php
diff --git a/lib/l10n/pl.php b/lib/private/l10n/pl.php
similarity index 100%
rename from lib/l10n/pl.php
rename to lib/private/l10n/pl.php
diff --git a/lib/l10n/pl_PL.php b/lib/private/l10n/pl_PL.php
similarity index 100%
rename from lib/l10n/pl_PL.php
rename to lib/private/l10n/pl_PL.php
diff --git a/lib/l10n/pt_BR.php b/lib/private/l10n/pt_BR.php
similarity index 100%
rename from lib/l10n/pt_BR.php
rename to lib/private/l10n/pt_BR.php
diff --git a/lib/l10n/pt_PT.php b/lib/private/l10n/pt_PT.php
similarity index 100%
rename from lib/l10n/pt_PT.php
rename to lib/private/l10n/pt_PT.php
diff --git a/lib/l10n/ro.php b/lib/private/l10n/ro.php
similarity index 100%
rename from lib/l10n/ro.php
rename to lib/private/l10n/ro.php
diff --git a/lib/l10n/ru.php b/lib/private/l10n/ru.php
similarity index 100%
rename from lib/l10n/ru.php
rename to lib/private/l10n/ru.php
diff --git a/lib/l10n/si_LK.php b/lib/private/l10n/si_LK.php
similarity index 100%
rename from lib/l10n/si_LK.php
rename to lib/private/l10n/si_LK.php
diff --git a/lib/l10n/sk.php b/lib/private/l10n/sk.php
similarity index 100%
rename from lib/l10n/sk.php
rename to lib/private/l10n/sk.php
diff --git a/lib/l10n/sk_SK.php b/lib/private/l10n/sk_SK.php
similarity index 100%
rename from lib/l10n/sk_SK.php
rename to lib/private/l10n/sk_SK.php
diff --git a/lib/l10n/sl.php b/lib/private/l10n/sl.php
similarity index 100%
rename from lib/l10n/sl.php
rename to lib/private/l10n/sl.php
diff --git a/lib/l10n/sq.php b/lib/private/l10n/sq.php
similarity index 100%
rename from lib/l10n/sq.php
rename to lib/private/l10n/sq.php
diff --git a/lib/l10n/sr.php b/lib/private/l10n/sr.php
similarity index 100%
rename from lib/l10n/sr.php
rename to lib/private/l10n/sr.php
diff --git a/lib/l10n/sr@latin.php b/lib/private/l10n/sr@latin.php
similarity index 100%
rename from lib/l10n/sr@latin.php
rename to lib/private/l10n/sr@latin.php
diff --git a/lib/l10n/string.php b/lib/private/l10n/string.php
similarity index 100%
rename from lib/l10n/string.php
rename to lib/private/l10n/string.php
diff --git a/lib/l10n/sv.php b/lib/private/l10n/sv.php
similarity index 100%
rename from lib/l10n/sv.php
rename to lib/private/l10n/sv.php
diff --git a/lib/l10n/sw_KE.php b/lib/private/l10n/sw_KE.php
similarity index 100%
rename from lib/l10n/sw_KE.php
rename to lib/private/l10n/sw_KE.php
diff --git a/lib/l10n/ta_LK.php b/lib/private/l10n/ta_LK.php
similarity index 100%
rename from lib/l10n/ta_LK.php
rename to lib/private/l10n/ta_LK.php
diff --git a/lib/l10n/te.php b/lib/private/l10n/te.php
similarity index 100%
rename from lib/l10n/te.php
rename to lib/private/l10n/te.php
diff --git a/lib/l10n/th_TH.php b/lib/private/l10n/th_TH.php
similarity index 100%
rename from lib/l10n/th_TH.php
rename to lib/private/l10n/th_TH.php
diff --git a/lib/l10n/tr.php b/lib/private/l10n/tr.php
similarity index 100%
rename from lib/l10n/tr.php
rename to lib/private/l10n/tr.php
diff --git a/lib/l10n/ug.php b/lib/private/l10n/ug.php
similarity index 100%
rename from lib/l10n/ug.php
rename to lib/private/l10n/ug.php
diff --git a/lib/l10n/uk.php b/lib/private/l10n/uk.php
similarity index 100%
rename from lib/l10n/uk.php
rename to lib/private/l10n/uk.php
diff --git a/lib/l10n/ur_PK.php b/lib/private/l10n/ur_PK.php
similarity index 100%
rename from lib/l10n/ur_PK.php
rename to lib/private/l10n/ur_PK.php
diff --git a/lib/l10n/vi.php b/lib/private/l10n/vi.php
similarity index 100%
rename from lib/l10n/vi.php
rename to lib/private/l10n/vi.php
diff --git a/lib/l10n/zh_CN.php b/lib/private/l10n/zh_CN.php
similarity index 100%
rename from lib/l10n/zh_CN.php
rename to lib/private/l10n/zh_CN.php
diff --git a/lib/l10n/zh_HK.php b/lib/private/l10n/zh_HK.php
similarity index 100%
rename from lib/l10n/zh_HK.php
rename to lib/private/l10n/zh_HK.php
diff --git a/lib/l10n/zh_TW.php b/lib/private/l10n/zh_TW.php
similarity index 100%
rename from lib/l10n/zh_TW.php
rename to lib/private/l10n/zh_TW.php
diff --git a/lib/legacy/cache.php b/lib/private/legacy/cache.php
similarity index 100%
rename from lib/legacy/cache.php
rename to lib/private/legacy/cache.php
diff --git a/lib/legacy/config.php b/lib/private/legacy/config.php
similarity index 100%
rename from lib/legacy/config.php
rename to lib/private/legacy/config.php
diff --git a/lib/legacy/filesystem.php b/lib/private/legacy/filesystem.php
similarity index 100%
rename from lib/legacy/filesystem.php
rename to lib/private/legacy/filesystem.php
diff --git a/lib/legacy/filesystemview.php b/lib/private/legacy/filesystemview.php
similarity index 100%
rename from lib/legacy/filesystemview.php
rename to lib/private/legacy/filesystemview.php
diff --git a/lib/legacy/log.php b/lib/private/legacy/log.php
similarity index 100%
rename from lib/legacy/log.php
rename to lib/private/legacy/log.php
diff --git a/lib/legacy/preferences.php b/lib/private/legacy/preferences.php
similarity index 100%
rename from lib/legacy/preferences.php
rename to lib/private/legacy/preferences.php
diff --git a/lib/legacy/updater.php b/lib/private/legacy/updater.php
similarity index 100%
rename from lib/legacy/updater.php
rename to lib/private/legacy/updater.php
diff --git a/lib/log.php b/lib/private/log.php
similarity index 100%
rename from lib/log.php
rename to lib/private/log.php
diff --git a/lib/log/errorhandler.php b/lib/private/log/errorhandler.php
similarity index 100%
rename from lib/log/errorhandler.php
rename to lib/private/log/errorhandler.php
diff --git a/lib/log/owncloud.php b/lib/private/log/owncloud.php
similarity index 100%
rename from lib/log/owncloud.php
rename to lib/private/log/owncloud.php
diff --git a/lib/log/rotate.php b/lib/private/log/rotate.php
similarity index 100%
rename from lib/log/rotate.php
rename to lib/private/log/rotate.php
diff --git a/lib/log/syslog.php b/lib/private/log/syslog.php
similarity index 100%
rename from lib/log/syslog.php
rename to lib/private/log/syslog.php
diff --git a/lib/mail.php b/lib/private/mail.php
similarity index 100%
rename from lib/mail.php
rename to lib/private/mail.php
diff --git a/lib/memcache/apc.php b/lib/private/memcache/apc.php
similarity index 100%
rename from lib/memcache/apc.php
rename to lib/private/memcache/apc.php
diff --git a/lib/memcache/apcu.php b/lib/private/memcache/apcu.php
similarity index 100%
rename from lib/memcache/apcu.php
rename to lib/private/memcache/apcu.php
diff --git a/lib/memcache/cache.php b/lib/private/memcache/cache.php
similarity index 100%
rename from lib/memcache/cache.php
rename to lib/private/memcache/cache.php
diff --git a/lib/memcache/factory.php b/lib/private/memcache/factory.php
similarity index 100%
rename from lib/memcache/factory.php
rename to lib/private/memcache/factory.php
diff --git a/lib/memcache/memcached.php b/lib/private/memcache/memcached.php
similarity index 100%
rename from lib/memcache/memcached.php
rename to lib/private/memcache/memcached.php
diff --git a/lib/memcache/xcache.php b/lib/private/memcache/xcache.php
similarity index 100%
rename from lib/memcache/xcache.php
rename to lib/private/memcache/xcache.php
diff --git a/lib/migrate.php b/lib/private/migrate.php
similarity index 100%
rename from lib/migrate.php
rename to lib/private/migrate.php
diff --git a/lib/migration/content.php b/lib/private/migration/content.php
similarity index 100%
rename from lib/migration/content.php
rename to lib/private/migration/content.php
diff --git a/lib/migration/provider.php b/lib/private/migration/provider.php
similarity index 100%
rename from lib/migration/provider.php
rename to lib/private/migration/provider.php
diff --git a/lib/mimetypes.list.php b/lib/private/mimetypes.list.php
similarity index 100%
rename from lib/mimetypes.list.php
rename to lib/private/mimetypes.list.php
diff --git a/lib/minimizer.php b/lib/private/minimizer.php
similarity index 100%
rename from lib/minimizer.php
rename to lib/private/minimizer.php
diff --git a/lib/minimizer/css.php b/lib/private/minimizer/css.php
similarity index 100%
rename from lib/minimizer/css.php
rename to lib/private/minimizer/css.php
diff --git a/lib/minimizer/js.php b/lib/private/minimizer/js.php
similarity index 100%
rename from lib/minimizer/js.php
rename to lib/private/minimizer/js.php
diff --git a/lib/navigationmanager.php b/lib/private/navigationmanager.php
similarity index 100%
rename from lib/navigationmanager.php
rename to lib/private/navigationmanager.php
diff --git a/lib/notsquareexception.php b/lib/private/notsquareexception.php
similarity index 100%
rename from lib/notsquareexception.php
rename to lib/private/notsquareexception.php
diff --git a/lib/ocs.php b/lib/private/ocs.php
similarity index 100%
rename from lib/ocs.php
rename to lib/private/ocs.php
diff --git a/lib/ocs/cloud.php b/lib/private/ocs/cloud.php
similarity index 100%
rename from lib/ocs/cloud.php
rename to lib/private/ocs/cloud.php
diff --git a/lib/ocs/config.php b/lib/private/ocs/config.php
similarity index 100%
rename from lib/ocs/config.php
rename to lib/private/ocs/config.php
diff --git a/lib/ocs/person.php b/lib/private/ocs/person.php
similarity index 100%
rename from lib/ocs/person.php
rename to lib/private/ocs/person.php
diff --git a/lib/ocs/privatedata.php b/lib/private/ocs/privatedata.php
similarity index 100%
rename from lib/ocs/privatedata.php
rename to lib/private/ocs/privatedata.php
diff --git a/lib/ocs/result.php b/lib/private/ocs/result.php
similarity index 100%
rename from lib/ocs/result.php
rename to lib/private/ocs/result.php
diff --git a/lib/ocsclient.php b/lib/private/ocsclient.php
similarity index 100%
rename from lib/ocsclient.php
rename to lib/private/ocsclient.php
diff --git a/lib/preferences.php b/lib/private/preferences.php
similarity index 100%
rename from lib/preferences.php
rename to lib/private/preferences.php
diff --git a/lib/preview.php b/lib/private/preview.php
similarity index 100%
rename from lib/preview.php
rename to lib/private/preview.php
diff --git a/lib/preview/image.php b/lib/private/preview/image.php
similarity index 100%
rename from lib/preview/image.php
rename to lib/private/preview/image.php
diff --git a/lib/preview/movies.php b/lib/private/preview/movies.php
similarity index 100%
rename from lib/preview/movies.php
rename to lib/private/preview/movies.php
diff --git a/lib/preview/mp3.php b/lib/private/preview/mp3.php
similarity index 100%
rename from lib/preview/mp3.php
rename to lib/private/preview/mp3.php
diff --git a/lib/preview/office-cl.php b/lib/private/preview/office-cl.php
similarity index 100%
rename from lib/preview/office-cl.php
rename to lib/private/preview/office-cl.php
diff --git a/lib/preview/office-fallback.php b/lib/private/preview/office-fallback.php
similarity index 100%
rename from lib/preview/office-fallback.php
rename to lib/private/preview/office-fallback.php
diff --git a/lib/preview/office.php b/lib/private/preview/office.php
similarity index 100%
rename from lib/preview/office.php
rename to lib/private/preview/office.php
diff --git a/lib/preview/pdf.php b/lib/private/preview/pdf.php
similarity index 100%
rename from lib/preview/pdf.php
rename to lib/private/preview/pdf.php
diff --git a/lib/preview/provider.php b/lib/private/preview/provider.php
similarity index 100%
rename from lib/preview/provider.php
rename to lib/private/preview/provider.php
diff --git a/lib/preview/svg.php b/lib/private/preview/svg.php
similarity index 100%
rename from lib/preview/svg.php
rename to lib/private/preview/svg.php
diff --git a/lib/preview/txt.php b/lib/private/preview/txt.php
similarity index 100%
rename from lib/preview/txt.php
rename to lib/private/preview/txt.php
diff --git a/lib/preview/unknown.php b/lib/private/preview/unknown.php
similarity index 100%
rename from lib/preview/unknown.php
rename to lib/private/preview/unknown.php
diff --git a/lib/previewmanager.php b/lib/private/previewmanager.php
similarity index 100%
rename from lib/previewmanager.php
rename to lib/private/previewmanager.php
diff --git a/lib/request.php b/lib/private/request.php
similarity index 100%
rename from lib/request.php
rename to lib/private/request.php
diff --git a/lib/response.php b/lib/private/response.php
similarity index 100%
rename from lib/response.php
rename to lib/private/response.php
diff --git a/lib/route.php b/lib/private/route.php
similarity index 100%
rename from lib/route.php
rename to lib/private/route.php
diff --git a/lib/router.php b/lib/private/router.php
similarity index 100%
rename from lib/router.php
rename to lib/private/router.php
diff --git a/lib/search.php b/lib/private/search.php
similarity index 100%
rename from lib/search.php
rename to lib/private/search.php
diff --git a/lib/search/provider.php b/lib/private/search/provider.php
similarity index 100%
rename from lib/search/provider.php
rename to lib/private/search/provider.php
diff --git a/lib/search/provider/file.php b/lib/private/search/provider/file.php
similarity index 100%
rename from lib/search/provider/file.php
rename to lib/private/search/provider/file.php
diff --git a/lib/search/result.php b/lib/private/search/result.php
similarity index 100%
rename from lib/search/result.php
rename to lib/private/search/result.php
diff --git a/lib/server.php b/lib/private/server.php
similarity index 100%
rename from lib/server.php
rename to lib/private/server.php
diff --git a/lib/session/internal.php b/lib/private/session/internal.php
similarity index 100%
rename from lib/session/internal.php
rename to lib/private/session/internal.php
diff --git a/lib/session/memory.php b/lib/private/session/memory.php
similarity index 100%
rename from lib/session/memory.php
rename to lib/private/session/memory.php
diff --git a/lib/session/session.php b/lib/private/session/session.php
similarity index 100%
rename from lib/session/session.php
rename to lib/private/session/session.php
diff --git a/lib/setup.php b/lib/private/setup.php
similarity index 100%
rename from lib/setup.php
rename to lib/private/setup.php
diff --git a/lib/setup/abstractdatabase.php b/lib/private/setup/abstractdatabase.php
similarity index 100%
rename from lib/setup/abstractdatabase.php
rename to lib/private/setup/abstractdatabase.php
diff --git a/lib/setup/mssql.php b/lib/private/setup/mssql.php
similarity index 100%
rename from lib/setup/mssql.php
rename to lib/private/setup/mssql.php
diff --git a/lib/setup/mysql.php b/lib/private/setup/mysql.php
similarity index 100%
rename from lib/setup/mysql.php
rename to lib/private/setup/mysql.php
diff --git a/lib/setup/oci.php b/lib/private/setup/oci.php
similarity index 100%
rename from lib/setup/oci.php
rename to lib/private/setup/oci.php
diff --git a/lib/setup/postgresql.php b/lib/private/setup/postgresql.php
similarity index 100%
rename from lib/setup/postgresql.php
rename to lib/private/setup/postgresql.php
diff --git a/lib/setup/sqlite.php b/lib/private/setup/sqlite.php
similarity index 100%
rename from lib/setup/sqlite.php
rename to lib/private/setup/sqlite.php
diff --git a/lib/subadmin.php b/lib/private/subadmin.php
similarity index 100%
rename from lib/subadmin.php
rename to lib/private/subadmin.php
diff --git a/lib/tagmanager.php b/lib/private/tagmanager.php
similarity index 100%
rename from lib/tagmanager.php
rename to lib/private/tagmanager.php
diff --git a/lib/tags.php b/lib/private/tags.php
similarity index 100%
rename from lib/tags.php
rename to lib/private/tags.php
diff --git a/lib/template.php b/lib/private/template.php
similarity index 100%
rename from lib/template.php
rename to lib/private/template.php
diff --git a/lib/template/base.php b/lib/private/template/base.php
similarity index 100%
rename from lib/template/base.php
rename to lib/private/template/base.php
diff --git a/lib/template/cssresourcelocator.php b/lib/private/template/cssresourcelocator.php
similarity index 100%
rename from lib/template/cssresourcelocator.php
rename to lib/private/template/cssresourcelocator.php
diff --git a/lib/template/functions.php b/lib/private/template/functions.php
similarity index 100%
rename from lib/template/functions.php
rename to lib/private/template/functions.php
diff --git a/lib/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php
similarity index 100%
rename from lib/template/jsresourcelocator.php
rename to lib/private/template/jsresourcelocator.php
diff --git a/lib/template/resourcelocator.php b/lib/private/template/resourcelocator.php
similarity index 100%
rename from lib/template/resourcelocator.php
rename to lib/private/template/resourcelocator.php
diff --git a/lib/template/templatefilelocator.php b/lib/private/template/templatefilelocator.php
similarity index 100%
rename from lib/template/templatefilelocator.php
rename to lib/private/template/templatefilelocator.php
diff --git a/lib/templatelayout.php b/lib/private/templatelayout.php
similarity index 100%
rename from lib/templatelayout.php
rename to lib/private/templatelayout.php
diff --git a/lib/updater.php b/lib/private/updater.php
similarity index 100%
rename from lib/updater.php
rename to lib/private/updater.php
diff --git a/lib/user.php b/lib/private/user.php
similarity index 100%
rename from lib/user.php
rename to lib/private/user.php
diff --git a/lib/user/backend.php b/lib/private/user/backend.php
similarity index 100%
rename from lib/user/backend.php
rename to lib/private/user/backend.php
diff --git a/lib/user/database.php b/lib/private/user/database.php
similarity index 100%
rename from lib/user/database.php
rename to lib/private/user/database.php
diff --git a/lib/user/dummy.php b/lib/private/user/dummy.php
similarity index 100%
rename from lib/user/dummy.php
rename to lib/private/user/dummy.php
diff --git a/lib/user/example.php b/lib/private/user/example.php
similarity index 100%
rename from lib/user/example.php
rename to lib/private/user/example.php
diff --git a/lib/user/http.php b/lib/private/user/http.php
similarity index 100%
rename from lib/user/http.php
rename to lib/private/user/http.php
diff --git a/lib/user/interface.php b/lib/private/user/interface.php
similarity index 100%
rename from lib/user/interface.php
rename to lib/private/user/interface.php
diff --git a/lib/user/manager.php b/lib/private/user/manager.php
similarity index 100%
rename from lib/user/manager.php
rename to lib/private/user/manager.php
diff --git a/lib/user/session.php b/lib/private/user/session.php
similarity index 100%
rename from lib/user/session.php
rename to lib/private/user/session.php
diff --git a/lib/user/user.php b/lib/private/user/user.php
similarity index 100%
rename from lib/user/user.php
rename to lib/private/user/user.php
diff --git a/lib/util.php b/lib/private/util.php
similarity index 100%
rename from lib/util.php
rename to lib/private/util.php
diff --git a/lib/vobject.php b/lib/private/vobject.php
similarity index 100%
rename from lib/vobject.php
rename to lib/private/vobject.php
diff --git a/lib/vobject/compoundproperty.php b/lib/private/vobject/compoundproperty.php
similarity index 100%
rename from lib/vobject/compoundproperty.php
rename to lib/private/vobject/compoundproperty.php
diff --git a/lib/vobject/stringproperty.php b/lib/private/vobject/stringproperty.php
similarity index 100%
rename from lib/vobject/stringproperty.php
rename to lib/private/vobject/stringproperty.php
diff --git a/tests/lib/autoloader.php b/tests/lib/autoloader.php
index 0e7d606ccf..b182dc8747 100644
--- a/tests/lib/autoloader.php
+++ b/tests/lib/autoloader.php
@@ -19,15 +19,15 @@ class AutoLoader extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testLeadingSlashOnClassName() {
-		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local'));
+		$this->assertEquals(array('private/files/storage/local.php'), $this->loader->findClass('\OC\Files\Storage\Local'));
 	}
 
 	public function testNoLeadingSlashOnClassName() {
-		$this->assertEquals(array('files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local'));
+		$this->assertEquals(array('private/files/storage/local.php'), $this->loader->findClass('OC\Files\Storage\Local'));
 	}
 
 	public function testLegacyPath() {
-		$this->assertEquals(array('legacy/files.php', 'files.php'), $this->loader->findClass('OC_Files'));
+		$this->assertEquals(array('private/legacy/files.php', 'private/files.php'), $this->loader->findClass('OC_Files'));
 	}
 
 	public function testClassPath() {
@@ -54,11 +54,11 @@ class AutoLoader extends \PHPUnit_Framework_TestCase {
 	}
 
 	public function testLoadCoreNamespace() {
-		$this->assertEquals(array('foo/bar.php'), $this->loader->findClass('OC\Foo\Bar'));
+		$this->assertEquals(array('private/foo/bar.php'), $this->loader->findClass('OC\Foo\Bar'));
 	}
 
 	public function testLoadCore() {
-		$this->assertEquals(array('legacy/foo/bar.php', 'foo/bar.php'), $this->loader->findClass('OC_Foo_Bar'));
+		$this->assertEquals(array('private/legacy/foo/bar.php', 'private/foo/bar.php'), $this->loader->findClass('OC_Foo_Bar'));
 	}
 
 	public function testLoadPublicNamespace() {