diff --git a/lib/private/files/cache/cache.php b/lib/private/Files/Cache/Cache.php
similarity index 100%
rename from lib/private/files/cache/cache.php
rename to lib/private/Files/Cache/Cache.php
diff --git a/lib/private/files/cache/cacheentry.php b/lib/private/Files/Cache/CacheEntry.php
similarity index 100%
rename from lib/private/files/cache/cacheentry.php
rename to lib/private/Files/Cache/CacheEntry.php
diff --git a/lib/private/files/cache/failedcache.php b/lib/private/Files/Cache/FailedCache.php
similarity index 100%
rename from lib/private/files/cache/failedcache.php
rename to lib/private/Files/Cache/FailedCache.php
diff --git a/lib/private/files/cache/homecache.php b/lib/private/Files/Cache/HomeCache.php
similarity index 100%
rename from lib/private/files/cache/homecache.php
rename to lib/private/Files/Cache/HomeCache.php
diff --git a/lib/private/files/cache/homepropagator.php b/lib/private/Files/Cache/HomePropagator.php
similarity index 100%
rename from lib/private/files/cache/homepropagator.php
rename to lib/private/Files/Cache/HomePropagator.php
diff --git a/lib/private/files/cache/movefromcachetrait.php b/lib/private/Files/Cache/MoveFromCacheTrait.php
similarity index 100%
rename from lib/private/files/cache/movefromcachetrait.php
rename to lib/private/Files/Cache/MoveFromCacheTrait.php
diff --git a/lib/private/files/cache/propagator.php b/lib/private/Files/Cache/Propagator.php
similarity index 100%
rename from lib/private/files/cache/propagator.php
rename to lib/private/Files/Cache/Propagator.php
diff --git a/lib/private/files/cache/scanner.php b/lib/private/Files/Cache/Scanner.php
similarity index 100%
rename from lib/private/files/cache/scanner.php
rename to lib/private/Files/Cache/Scanner.php
diff --git a/lib/private/files/cache/storage.php b/lib/private/Files/Cache/Storage.php
similarity index 100%
rename from lib/private/files/cache/storage.php
rename to lib/private/Files/Cache/Storage.php
diff --git a/lib/private/files/cache/updater.php b/lib/private/Files/Cache/Updater.php
similarity index 100%
rename from lib/private/files/cache/updater.php
rename to lib/private/Files/Cache/Updater.php
diff --git a/lib/private/files/cache/watcher.php b/lib/private/Files/Cache/Watcher.php
similarity index 100%
rename from lib/private/files/cache/watcher.php
rename to lib/private/Files/Cache/Watcher.php
diff --git a/lib/private/files/cache/wrapper/cachejail.php b/lib/private/Files/Cache/Wrapper/CacheJail.php
similarity index 100%
rename from lib/private/files/cache/wrapper/cachejail.php
rename to lib/private/Files/Cache/Wrapper/CacheJail.php
diff --git a/lib/private/files/cache/wrapper/cachepermissionsmask.php b/lib/private/Files/Cache/Wrapper/CachePermissionsMask.php
similarity index 100%
rename from lib/private/files/cache/wrapper/cachepermissionsmask.php
rename to lib/private/Files/Cache/Wrapper/CachePermissionsMask.php
diff --git a/lib/private/files/cache/wrapper/cachewrapper.php b/lib/private/Files/Cache/Wrapper/CacheWrapper.php
similarity index 100%
rename from lib/private/files/cache/wrapper/cachewrapper.php
rename to lib/private/Files/Cache/Wrapper/CacheWrapper.php
diff --git a/lib/private/files/config/cachedmountinfo.php b/lib/private/Files/Config/CachedMountInfo.php
similarity index 100%
rename from lib/private/files/config/cachedmountinfo.php
rename to lib/private/Files/Config/CachedMountInfo.php
diff --git a/lib/private/files/config/lazystoragemountinfo.php b/lib/private/Files/Config/LazyStorageMountInfo.php
similarity index 100%
rename from lib/private/files/config/lazystoragemountinfo.php
rename to lib/private/Files/Config/LazyStorageMountInfo.php
diff --git a/lib/private/files/config/mountprovidercollection.php b/lib/private/Files/Config/MountProviderCollection.php
similarity index 100%
rename from lib/private/files/config/mountprovidercollection.php
rename to lib/private/Files/Config/MountProviderCollection.php
diff --git a/lib/private/files/config/usermountcache.php b/lib/private/Files/Config/UserMountCache.php
similarity index 100%
rename from lib/private/files/config/usermountcache.php
rename to lib/private/Files/Config/UserMountCache.php
diff --git a/lib/private/files/config/usermountcachelistener.php b/lib/private/Files/Config/UserMountCacheListener.php
similarity index 100%
rename from lib/private/files/config/usermountcachelistener.php
rename to lib/private/Files/Config/UserMountCacheListener.php
diff --git a/lib/private/files/fileinfo.php b/lib/private/Files/FileInfo.php
similarity index 100%
rename from lib/private/files/fileinfo.php
rename to lib/private/Files/FileInfo.php
diff --git a/lib/private/files/filesystem.php b/lib/private/Files/Filesystem.php
similarity index 100%
rename from lib/private/files/filesystem.php
rename to lib/private/Files/Filesystem.php
diff --git a/lib/private/files/mount/manager.php b/lib/private/Files/Mount/Manager.php
similarity index 100%
rename from lib/private/files/mount/manager.php
rename to lib/private/Files/Mount/Manager.php
diff --git a/lib/private/files/mount/mountpoint.php b/lib/private/Files/Mount/MountPoint.php
similarity index 100%
rename from lib/private/files/mount/mountpoint.php
rename to lib/private/Files/Mount/MountPoint.php
diff --git a/lib/private/files/mount/moveablemount.php b/lib/private/Files/Mount/MoveableMount.php
similarity index 100%
rename from lib/private/files/mount/moveablemount.php
rename to lib/private/Files/Mount/MoveableMount.php
diff --git a/lib/private/files/node/file.php b/lib/private/Files/Node/File.php
similarity index 100%
rename from lib/private/files/node/file.php
rename to lib/private/Files/Node/File.php
diff --git a/lib/private/files/node/folder.php b/lib/private/Files/Node/Folder.php
similarity index 100%
rename from lib/private/files/node/folder.php
rename to lib/private/Files/Node/Folder.php
diff --git a/lib/private/files/node/hookconnector.php b/lib/private/Files/Node/HookConnector.php
similarity index 100%
rename from lib/private/files/node/hookconnector.php
rename to lib/private/Files/Node/HookConnector.php
diff --git a/lib/private/files/node/lazyroot.php b/lib/private/Files/Node/LazyRoot.php
similarity index 100%
rename from lib/private/files/node/lazyroot.php
rename to lib/private/Files/Node/LazyRoot.php
diff --git a/lib/private/files/node/node.php b/lib/private/Files/Node/Node.php
similarity index 100%
rename from lib/private/files/node/node.php
rename to lib/private/Files/Node/Node.php
diff --git a/lib/private/files/node/nonexistingfile.php b/lib/private/Files/Node/NonExistingFile.php
similarity index 100%
rename from lib/private/files/node/nonexistingfile.php
rename to lib/private/Files/Node/NonExistingFile.php
diff --git a/lib/private/files/node/nonexistingfolder.php b/lib/private/Files/Node/NonExistingFolder.php
similarity index 100%
rename from lib/private/files/node/nonexistingfolder.php
rename to lib/private/Files/Node/NonExistingFolder.php
diff --git a/lib/private/files/node/root.php b/lib/private/Files/Node/Root.php
similarity index 100%
rename from lib/private/files/node/root.php
rename to lib/private/Files/Node/Root.php
diff --git a/lib/private/files/objectstore/homeobjectstorestorage.php b/lib/private/Files/ObjectStore/HomeObjectStoreStorage.php
similarity index 100%
rename from lib/private/files/objectstore/homeobjectstorestorage.php
rename to lib/private/Files/ObjectStore/HomeObjectStoreStorage.php
diff --git a/lib/private/files/objectstore/noopscanner.php b/lib/private/Files/ObjectStore/NoopScanner.php
similarity index 100%
rename from lib/private/files/objectstore/noopscanner.php
rename to lib/private/Files/ObjectStore/NoopScanner.php
diff --git a/lib/private/files/objectstore/objectstorestorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
similarity index 100%
rename from lib/private/files/objectstore/objectstorestorage.php
rename to lib/private/Files/ObjectStore/ObjectStoreStorage.php
diff --git a/lib/private/files/objectstore/swift.php b/lib/private/Files/ObjectStore/Swift.php
similarity index 100%
rename from lib/private/files/objectstore/swift.php
rename to lib/private/Files/ObjectStore/Swift.php
diff --git a/lib/private/files/storage/common.php b/lib/private/Files/Storage/Common.php
similarity index 100%
rename from lib/private/files/storage/common.php
rename to lib/private/Files/Storage/Common.php
diff --git a/lib/private/files/storage/commontest.php b/lib/private/Files/Storage/CommonTest.php
similarity index 100%
rename from lib/private/files/storage/commontest.php
rename to lib/private/Files/Storage/CommonTest.php
diff --git a/lib/private/files/storage/dav.php b/lib/private/Files/Storage/DAV.php
similarity index 100%
rename from lib/private/files/storage/dav.php
rename to lib/private/Files/Storage/DAV.php
diff --git a/lib/private/files/storage/failedstorage.php b/lib/private/Files/Storage/FailedStorage.php
similarity index 100%
rename from lib/private/files/storage/failedstorage.php
rename to lib/private/Files/Storage/FailedStorage.php
diff --git a/lib/private/files/storage/flysystem.php b/lib/private/Files/Storage/Flysystem.php
similarity index 100%
rename from lib/private/files/storage/flysystem.php
rename to lib/private/Files/Storage/Flysystem.php
diff --git a/lib/private/files/storage/home.php b/lib/private/Files/Storage/Home.php
similarity index 100%
rename from lib/private/files/storage/home.php
rename to lib/private/Files/Storage/Home.php
diff --git a/lib/private/files/storage/local.php b/lib/private/Files/Storage/Local.php
similarity index 100%
rename from lib/private/files/storage/local.php
rename to lib/private/Files/Storage/Local.php
diff --git a/lib/private/files/storage/localtempfiletrait.php b/lib/private/Files/Storage/LocalTempFileTrait.php
similarity index 100%
rename from lib/private/files/storage/localtempfiletrait.php
rename to lib/private/Files/Storage/LocalTempFileTrait.php
diff --git a/lib/private/files/storage/polyfill/copydirectory.php b/lib/private/Files/Storage/PolyFill/CopyDirectory.php
similarity index 100%
rename from lib/private/files/storage/polyfill/copydirectory.php
rename to lib/private/Files/Storage/PolyFill/CopyDirectory.php
diff --git a/lib/private/files/storage/storage.php b/lib/private/Files/Storage/Storage.php
similarity index 100%
rename from lib/private/files/storage/storage.php
rename to lib/private/Files/Storage/Storage.php
diff --git a/lib/private/files/storage/storagefactory.php b/lib/private/Files/Storage/StorageFactory.php
similarity index 100%
rename from lib/private/files/storage/storagefactory.php
rename to lib/private/Files/Storage/StorageFactory.php
diff --git a/lib/private/files/storage/temporary.php b/lib/private/Files/Storage/Temporary.php
similarity index 100%
rename from lib/private/files/storage/temporary.php
rename to lib/private/Files/Storage/Temporary.php
diff --git a/lib/private/files/storage/wrapper/availability.php b/lib/private/Files/Storage/Wrapper/Availability.php
similarity index 100%
rename from lib/private/files/storage/wrapper/availability.php
rename to lib/private/Files/Storage/Wrapper/Availability.php
diff --git a/lib/private/files/storage/wrapper/encryption.php b/lib/private/Files/Storage/Wrapper/Encryption.php
similarity index 100%
rename from lib/private/files/storage/wrapper/encryption.php
rename to lib/private/Files/Storage/Wrapper/Encryption.php
diff --git a/lib/private/files/storage/wrapper/jail.php b/lib/private/Files/Storage/Wrapper/Jail.php
similarity index 100%
rename from lib/private/files/storage/wrapper/jail.php
rename to lib/private/Files/Storage/Wrapper/Jail.php
diff --git a/lib/private/files/storage/wrapper/permissionsmask.php b/lib/private/Files/Storage/Wrapper/PermissionsMask.php
similarity index 100%
rename from lib/private/files/storage/wrapper/permissionsmask.php
rename to lib/private/Files/Storage/Wrapper/PermissionsMask.php
diff --git a/lib/private/files/storage/wrapper/quota.php b/lib/private/Files/Storage/Wrapper/Quota.php
similarity index 100%
rename from lib/private/files/storage/wrapper/quota.php
rename to lib/private/Files/Storage/Wrapper/Quota.php
diff --git a/lib/private/files/storage/wrapper/wrapper.php b/lib/private/Files/Storage/Wrapper/Wrapper.php
similarity index 100%
rename from lib/private/files/storage/wrapper/wrapper.php
rename to lib/private/Files/Storage/Wrapper/Wrapper.php
diff --git a/lib/private/files/stream/close.php b/lib/private/Files/Stream/Close.php
similarity index 100%
rename from lib/private/files/stream/close.php
rename to lib/private/Files/Stream/Close.php
diff --git a/lib/private/files/stream/dir.php b/lib/private/Files/Stream/Dir.php
similarity index 100%
rename from lib/private/files/stream/dir.php
rename to lib/private/Files/Stream/Dir.php
diff --git a/lib/private/files/stream/encryption.php b/lib/private/Files/Stream/Encryption.php
similarity index 100%
rename from lib/private/files/stream/encryption.php
rename to lib/private/Files/Stream/Encryption.php
diff --git a/lib/private/files/stream/oc.php b/lib/private/Files/Stream/OC.php
similarity index 100%
rename from lib/private/files/stream/oc.php
rename to lib/private/Files/Stream/OC.php
diff --git a/lib/private/files/stream/quota.php b/lib/private/Files/Stream/Quota.php
similarity index 100%
rename from lib/private/files/stream/quota.php
rename to lib/private/Files/Stream/Quota.php
diff --git a/lib/private/files/stream/staticstream.php b/lib/private/Files/Stream/StaticStream.php
similarity index 100%
rename from lib/private/files/stream/staticstream.php
rename to lib/private/Files/Stream/StaticStream.php
diff --git a/lib/private/files/type/detection.php b/lib/private/Files/Type/Detection.php
similarity index 100%
rename from lib/private/files/type/detection.php
rename to lib/private/Files/Type/Detection.php
diff --git a/lib/private/files/type/loader.php b/lib/private/Files/Type/Loader.php
similarity index 100%
rename from lib/private/files/type/loader.php
rename to lib/private/Files/Type/Loader.php
diff --git a/lib/private/files/type/templatemanager.php b/lib/private/Files/Type/TemplateManager.php
similarity index 100%
rename from lib/private/files/type/templatemanager.php
rename to lib/private/Files/Type/TemplateManager.php
diff --git a/lib/private/files/utils/scanner.php b/lib/private/Files/Utils/Scanner.php
similarity index 100%
rename from lib/private/files/utils/scanner.php
rename to lib/private/Files/Utils/Scanner.php
diff --git a/lib/private/files/view.php b/lib/private/Files/View.php
similarity index 100%
rename from lib/private/files/view.php
rename to lib/private/Files/View.php