diff --git a/copy_this/.noencode b/.noencode
similarity index 100%
rename from copy_this/.noencode
rename to .noencode
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..2b13780
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,38 @@
+{
+  "name": "d3/googleservices",
+  "description": "Google Services for OXID eShop.",
+  "type": "oxideshop-module",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "google",
+    "analytics",
+    "adwords",
+    "remarketing"
+  ],
+  "authors": [
+    {
+        "name": "D3 Data Development (Inh. Thomas Dartsch)",
+        "email": "info@shopmodule.com",
+        "homepage": "http://www.d3data.de",
+        "role": "Owner"
+    }
+  ],
+  "homepage": "https://www.oxidmodule.com/",
+  "license": [
+    "GPL3"
+  ],
+  "extra": {
+    "oxideshop": {
+      "source-directory": "/src",
+      "target-directory": "d3/d3_googleanalytics"
+    }
+  },
+  "require": {
+    "php": ">=7.0",
+    "oxid-esales/oxideshop-metapackage-ce": "~6.0.0 || ~6.1.0",
+    "d3/modcfg": "^5.0.0.100"
+  }
+}
\ No newline at end of file
diff --git a/copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php b/src/IntelliSenseHelper.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/IntelliSenseHelper.php
rename to src/IntelliSenseHelper.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php b/src/controllers/admin/d3_cfg_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics.php
rename to src/controllers/admin/d3_cfg_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php b/src/controllers/admin/d3_cfg_googleanalytics_adwords.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_adwords.php
rename to src/controllers/admin/d3_cfg_googleanalytics_adwords.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php b/src/controllers/admin/d3_cfg_googleanalytics_campaigns.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_campaigns.php
rename to src/controllers/admin/d3_cfg_googleanalytics_campaigns.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php b/src/controllers/admin/d3_cfg_googleanalytics_licence.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_licence.php
rename to src/controllers/admin/d3_cfg_googleanalytics_licence.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php b/src/controllers/admin/d3_cfg_googleanalytics_list.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_list.php
rename to src/controllers/admin/d3_cfg_googleanalytics_list.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php b/src/controllers/admin/d3_cfg_googleanalytics_main.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_main.php
rename to src/controllers/admin/d3_cfg_googleanalytics_main.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php b/src/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
rename to src/controllers/admin/d3_cfg_googleanalytics_trustedstore.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php b/src/controllers/admin/d3_cfg_googleanalyticslog.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog.php
rename to src/controllers/admin/d3_cfg_googleanalyticslog.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php b/src/controllers/admin/d3_cfg_googleanalyticslog_list.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/controllers/admin/d3_cfg_googleanalyticslog_list.php
rename to src/controllers/admin/d3_cfg_googleanalyticslog_list.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php b/src/core/smarty/plugins/function.d3getArticleFromOrderArticle.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/core/smarty/plugins/function.d3getArticleFromOrderArticle.php
rename to src/core/smarty/plugins/function.d3getArticleFromOrderArticle.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/menu.xml b/src/menu.xml
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/menu.xml
rename to src/menu.xml
diff --git a/copy_this/modules/d3/d3_googleanalytics/metadata.php b/src/metadata.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/metadata.php
rename to src/metadata.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/models/d3_google_remarketing_articlelister.php b/src/models/d3_google_remarketing_articlelister.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/models/d3_google_remarketing_articlelister.php
rename to src/models/d3_google_remarketing_articlelister.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/models/d3_google_trustedstore_articlelister.php b/src/models/d3_google_trustedstore_articlelister.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/models/d3_google_trustedstore_articlelister.php
rename to src/models/d3_google_trustedstore_articlelister.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php b/src/modules/components/d3_oxcmp_utils_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/components/d3_oxcmp_utils_googleanalytics.php
rename to src/modules/components/d3_oxcmp_utils_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_order_googleanalytics.php b/src/modules/controllers/d3_order_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_order_googleanalytics.php
rename to src/modules/controllers/d3_order_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php b/src/modules/controllers/d3_thankyou_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/controllers/d3_thankyou_googleanalytics.php
rename to src/modules/controllers/d3_thankyou_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalytics.php b/src/modules/core/d3_oxutilsview_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/core/d3_oxutilsview_googleanalytics.php
rename to src/modules/core/d3_oxutilsview_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics.php b/src/modules/models/d3_oxbasket_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasket_googleanalytics.php
rename to src/modules/models/d3_oxbasket_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php b/src/modules/models/d3_oxbasketitem_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxbasketitem_googleanalytics.php
rename to src/modules/models/d3_oxbasketitem_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php b/src/modules/models/d3_oxorder_googleanalytics.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/modules/models/d3_oxorder_googleanalytics.php
rename to src/modules/models/d3_oxorder_googleanalytics.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css b/src/out/src/d3_googleanalytics.css
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics.css
rename to src/out/src/d3_googleanalytics.css
diff --git a/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css b/src/out/src/d3_googleanalytics_mobile.css
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_mobile.css
rename to src/out/src/d3_googleanalytics_mobile.css
diff --git a/copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_test.js b/src/out/src/d3_googleanalytics_test.js
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/out/src/d3_googleanalytics_test.js
rename to src/out/src/d3_googleanalytics_test.js
diff --git a/copy_this/modules/d3/d3_googleanalytics/picture.png b/src/picture.png
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/picture.png
rename to src/picture.png
diff --git a/copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php b/src/setup/d3_googleanalytics_update.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/setup/d3_googleanalytics_update.php
rename to src/setup/d3_googleanalytics_update.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php b/src/translations/de/d3_googleanalytics_lang.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/translations/de/d3_googleanalytics_lang.php
rename to src/translations/de/d3_googleanalytics_lang.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/translations/en/d3_googleanalytics_lang.php b/src/translations/en/d3_googleanalytics_lang.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/translations/en/d3_googleanalytics_lang.php
rename to src/translations/en/d3_googleanalytics_lang.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php b/src/views/admin/de/d3_googleanalytics_lang.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/de/d3_googleanalytics_lang.php
rename to src/views/admin/de/d3_googleanalytics_lang.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php b/src/views/admin/en/d3_googleanalytics_lang.php
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/en/d3_googleanalytics_lang.php
rename to src/views/admin/en/d3_googleanalytics_lang.php
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl b/src/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
rename to src/views/admin/tpl/d3_cfg_googleanalytics_adwords.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl b/src/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
rename to src/views/admin/tpl/d3_cfg_googleanalytics_campaigns.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl b/src/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
rename to src/views/admin/tpl/d3_cfg_googleanalytics_main.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl b/src/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
rename to src/views/admin/tpl/d3_cfg_googleanalytics_trustedstore.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl b/src/views/blocks/layout/d3_base_googleadwordscode.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleadwordscode.tpl
rename to src/views/blocks/layout/d3_base_googleadwordscode.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl b/src/views/blocks/layout/d3_base_googleanalytics.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_googleanalytics.tpl
rename to src/views/blocks/layout/d3_base_googleanalytics.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl b/src/views/blocks/layout/d3_base_optout.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/blocks/layout/d3_base_optout.tpl
rename to src/views/blocks/layout/d3_base_optout.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl b/src/views/tpl/widget/d3_googleanalytics.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3_googleanalytics.tpl
rename to src/views/tpl/widget/d3_googleanalytics.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl b/src/views/tpl/widget/d3ga_universal.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/d3ga_universal.tpl
rename to src/views/tpl/widget/d3ga_universal.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3_googleanalytics.tpl b/src/views/tpl/widget/inc/d3_googleanalytics.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3_googleanalytics.tpl
rename to src/views/tpl/widget/inc/d3_googleanalytics.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal.tpl b/src/views/tpl/widget/inc/d3ga_universal.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal.tpl
rename to src/views/tpl/widget/inc/d3ga_universal.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl b/src/views/tpl/widget/inc/d3ga_universal_adwords.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwords.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_adwords.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl b/src/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_adwordscode.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl b/src/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_campaigncode.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl b/src/views/tpl/widget/inc/d3ga_universal_custom.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_custom.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_custom.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl b/src/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_ecommerce.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl b/src/views/tpl/widget/inc/d3ga_universal_remarketing.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_remarketing.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_remarketing.tpl
diff --git a/copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl b/src/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
similarity index 100%
rename from copy_this/modules/d3/d3_googleanalytics/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl
rename to src/views/tpl/widget/inc/d3ga_universal_trustedstore.tpl