diff --git a/apps/files_versions/appinfo/info.xml b/apps/files_versions/appinfo/info.xml
index ad0354a5101..c70e58a12b2 100644
--- a/apps/files_versions/appinfo/info.xml
+++ b/apps/files_versions/appinfo/info.xml
@@ -13,6 +13,7 @@ In addition to the expiry of versions, ownCloud’s versions app makes certain n
 	<types>
 		<filesystem/>
 	</types>
+	<namespace>Files_Versions</namespace>
 	<dependencies>
 		<owncloud min-version="9.1" max-version="9.1" />
 	</dependencies>
diff --git a/apps/files_versions/appinfo/application.php b/apps/files_versions/lib/AppInfo/Application.php
similarity index 100%
rename from apps/files_versions/appinfo/application.php
rename to apps/files_versions/lib/AppInfo/Application.php
diff --git a/apps/files_versions/lib/backgroundjob/expireversions.php b/apps/files_versions/lib/BackgroundJob/ExpireVersions.php
similarity index 100%
rename from apps/files_versions/lib/backgroundjob/expireversions.php
rename to apps/files_versions/lib/BackgroundJob/ExpireVersions.php
diff --git a/apps/files_versions/lib/capabilities.php b/apps/files_versions/lib/Capabilities.php
similarity index 100%
rename from apps/files_versions/lib/capabilities.php
rename to apps/files_versions/lib/Capabilities.php
diff --git a/apps/files_versions/command/cleanup.php b/apps/files_versions/lib/Command/CleanUp.php
similarity index 100%
rename from apps/files_versions/command/cleanup.php
rename to apps/files_versions/lib/Command/CleanUp.php
diff --git a/apps/files_versions/command/expire.php b/apps/files_versions/lib/Command/Expire.php
similarity index 100%
rename from apps/files_versions/command/expire.php
rename to apps/files_versions/lib/Command/Expire.php
diff --git a/apps/files_versions/lib/expiration.php b/apps/files_versions/lib/Expiration.php
similarity index 100%
rename from apps/files_versions/lib/expiration.php
rename to apps/files_versions/lib/Expiration.php
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/Hooks.php
similarity index 100%
rename from apps/files_versions/lib/hooks.php
rename to apps/files_versions/lib/Hooks.php
diff --git a/apps/files_versions/lib/storage.php b/apps/files_versions/lib/Storage.php
similarity index 100%
rename from apps/files_versions/lib/storage.php
rename to apps/files_versions/lib/Storage.php
diff --git a/apps/files_versions/tests/command/cleanuptest.php b/apps/files_versions/tests/Command/CleanupTest.php
similarity index 100%
rename from apps/files_versions/tests/command/cleanuptest.php
rename to apps/files_versions/tests/Command/CleanupTest.php
diff --git a/apps/files_versions/tests/command/expiretest.php b/apps/files_versions/tests/Command/ExpireTest.php
similarity index 100%
rename from apps/files_versions/tests/command/expiretest.php
rename to apps/files_versions/tests/Command/ExpireTest.php
diff --git a/apps/files_versions/tests/expirationtest.php b/apps/files_versions/tests/ExpirationTest.php
similarity index 99%
rename from apps/files_versions/tests/expirationtest.php
rename to apps/files_versions/tests/ExpirationTest.php
index 2dfff19f230..2486b9c85c8 100644
--- a/apps/files_versions/tests/expirationtest.php
+++ b/apps/files_versions/tests/ExpirationTest.php
@@ -24,7 +24,7 @@ namespace OCA\Files_Versions\Tests;
 
 use \OCA\Files_Versions\Expiration;
 
-class Expiration_Test extends \Test\TestCase {
+class ExpirationTest extends \Test\TestCase {
 	const SECONDS_PER_DAY = 86400; //60*60*24
 
 	public function expirationData(){
diff --git a/apps/files_versions/tests/versions.php b/apps/files_versions/tests/VersioningTest.php
similarity index 99%
rename from apps/files_versions/tests/versions.php
rename to apps/files_versions/tests/VersioningTest.php
index b8e68cfadf7..354ff6ee5e9 100644
--- a/apps/files_versions/tests/versions.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -29,6 +29,8 @@
  *
  */
 
+namespace OCA\Files_Versions\Tests;
+
 require_once __DIR__ . '/../appinfo/app.php';
 
 use OC\Files\Storage\Temporary;
@@ -39,7 +41,7 @@ use OC\Files\Storage\Temporary;
  *
  * @group DB
  */
-class Test_Files_Versioning extends \Test\TestCase {
+class VersioningTest extends \Test\TestCase {
 
 	const TEST_VERSIONS_USER = 'test-versions-user';
 	const TEST_VERSIONS_USER2 = 'test-versions-user2';