diff --git a/composer.json b/composer.json
index 7f862da..1f8d677 100644
--- a/composer.json
+++ b/composer.json
@@ -21,21 +21,12 @@
     "GPL-3.0-or-later"
   ],
   "require": {
-    "oxid-esales/oxideshop-ce": "^6.2"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json"
-      ],
-      "source-directory": "/src",
-      "target-directory": "d3/removegooglefonts"
-    }
+    "php": "8 - 8.1",
+    "oxid-esales/oxideshop-ce": "7 - 7.0.3"
   },
   "autoload": {
     "psr-4": {
-      "D3\\Removegooglefonts\\": "../../../source/modules/d3/removegooglefonts"
+      "D3\\Removegooglefonts\\": ""
     }
   }
 }
diff --git a/src/metadata.php b/metadata.php
similarity index 54%
rename from src/metadata.php
rename to metadata.php
index 876a25d..4119768 100644
--- a/src/metadata.php
+++ b/metadata.php
@@ -20,9 +20,11 @@
  * Metadata version
  */
 
-$sMetadataVersion = '2.0';
+use D3\Removegooglefonts\Application\Model\Constants as Constants;
 
-$sModuleId = 'removegooglefonts';
+$sMetadataVersion = '2.1';
+$sModuleId = Constants::OXID_MODULE_ID;
+$sLogo = '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em"> ';
 
 /**
  * Module information
@@ -30,25 +32,27 @@ $sModuleId = 'removegooglefonts';
 
 $aModule = [
     'id'          => $sModuleId,
-    'title'       => '<img src="https://logos.oxidmodule.com/d3logo.svg" alt="(D3)" style="height:1em;width:1em"> Google Fonts lokal einbinden',
+    'title'       => $sLogo.' Google Fonts lokal einbinden',
     'description' => [
         'de' => 'Bindet Google Fonts lokal ein',
         'en' => '',
     ],
-    'version'     => '1.0.0.0',
+    'version'     => '2.0.0.0',
     'author'      => 'D&sup3; Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'http://www.oxidmodule.com/',
     'blocks'    => [
         [
-            'template'         => 'layout/base.tpl',
-            'block'            => 'base_style',
-            'file'             => '/Application/views/blocks/layout/d3_base_style.tpl'
+            'template'          => 'layout/base.tpl',
+            'block'             => 'base_style',
+            'file'              => 'views/smarty/blocks/layout/d3_base_style.tpl',
+            'position'          => 10
         ],
         [
-            'template'         => 'layout/base.tpl',
-            'block'            => 'base_fonts',
-            'file'             => '/Application/views/blocks/layout/d3_base_fonts.tpl'
+            'template'          => 'layout/base.tpl',
+            'block'             => 'base_fonts',
+            'file'              => 'views/smarty/blocks/layout/d3_base_fonts.tpl',
+            'position'          => 10
         ]
     ],
 ];
\ No newline at end of file