diff --git a/appinfo/info.xml b/appinfo/info.xml
index 47a89ed0..0b23eba4 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -23,7 +23,7 @@
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-presentation.png</screenshot>
 	<screenshot>https://nextcloud.com/wp-content/themes/next/assets/img/features/collabora-spreadsheet.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="12" max-version="13" />
+		<nextcloud min-version="12" max-version="14" />
 	</dependencies>
 	<settings>
 		<admin>OCA\Richdocuments\Settings\Admin</admin>
diff --git a/lib/appconfig.php b/lib/AppConfig.php
similarity index 100%
rename from lib/appconfig.php
rename to lib/AppConfig.php
diff --git a/appinfo/Application.php b/lib/AppInfo/Application.php
similarity index 72%
rename from appinfo/Application.php
rename to lib/AppInfo/Application.php
index 0a4c0a98..71377008 100644
--- a/appinfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -29,18 +29,5 @@ use OCP\AppFramework\IAppContainer;
 class Application extends App  {
 	public function __construct (array $urlParams = array()) {
 		parent::__construct('richdocuments', $urlParams);
-		$container = $this->getContainer();
-		$container->registerService(
-			DiscoveryManager::class,
-			function(IAppContainer $container) {
-				return new DiscoveryManager(
-					$container->getServer()->getHTTPClientService(),
-					$container->getServer()->getAppDataDir('richdocuments'),
-					$container->getServer()->getConfig(),
-					$container->getServer()->getL10N('richdocuments'),
-					new TimeFactory()
-				);
-			}
-		);
 	}
-}
\ No newline at end of file
+}
diff --git a/lib/db.php b/lib/Db/DbBase.php
similarity index 98%
rename from lib/db.php
rename to lib/Db/DbBase.php
index 11efefb3..ff620ec9 100644
--- a/lib/db.php
+++ b/lib/Db/DbBase.php
@@ -9,13 +9,13 @@
  * later.
  */
 
-namespace OCA\Richdocuments;
+namespace OCA\Richdocuments\Db;
 
 /**
  * Generic DB class
  */
 
-abstract class Db {
+abstract class DbBase {
 
 	protected $data;
 
diff --git a/lib/db/wopi.php b/lib/Db/Wopi.php
similarity index 94%
rename from lib/db/wopi.php
rename to lib/Db/Wopi.php
index 45152f8e..d4b40c12 100644
--- a/lib/db/wopi.php
+++ b/lib/Db/Wopi.php
@@ -11,10 +11,7 @@
 
 namespace OCA\Richdocuments\Db;
 
-use \OCA\Richdocuments\Download;
-use \OCA\Richdocuments\DownloadResponse;
-
-class Wopi extends \OCA\Richdocuments\Db{
+class Wopi extends DbBase {
 
 	const DB_TABLE = '`*PREFIX*richdocuments_wopi`';
 
diff --git a/lib/helper.php b/lib/Helper.php
similarity index 100%
rename from lib/helper.php
rename to lib/Helper.php