diff --git a/.gitattributes b/.gitattributes
index 4552571..36484a9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -20,10 +20,10 @@ changed_full/461/out/azure/tpl/layout/sidebar.tpl -text
 changed_full/461/out/basic/tpl/_left.tpl -text
 changed_full/461/out/basic/tpl/inc/d3usersonline.tpl -text
 changed_full/461/out/de/d3_usersonline_lang.php -text
-copy_this/core/d3usersonline.php -text
-copy_this/modules/d3usersonline/metadata.php -text
-copy_this/modules/d3usersonline/picture.png -text
-copy_this/modules/d3usersonline/views/d3_oxcmp_utils_usersonline.php -text
+copy_this/modules/d3/d3usersonline/metadata.php -text
+copy_this/modules/d3/d3usersonline/models/d3usersonline.php -text
+copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php -text
+copy_this/modules/d3/d3usersonline/picture.png -text
 setup+doku/Installation.pdf -text
 setup+doku/install.sql -text
 source/Re[!!-~]D3[!!-~]Users[!!-~]Online[!!-~]kit[!!-~]Oxid[!!-~]CE[!!-~]4.7.eml -text
diff --git a/copy_this/modules/d3usersonline/metadata.php b/copy_this/modules/d3/d3usersonline/metadata.php
similarity index 95%
rename from copy_this/modules/d3usersonline/metadata.php
rename to copy_this/modules/d3/d3usersonline/metadata.php
index f92816f..14d4ee0 100644
--- a/copy_this/modules/d3usersonline/metadata.php
+++ b/copy_this/modules/d3/d3usersonline/metadata.php
@@ -1,12 +1,8 @@
 <?php
-/**
- * Metadata version
- */
-$sMetadataVersion = '1.0';
-
 /**
  * Module information
  */
+$sMetadataVersion = '1.0';
 $aModule = array(
     'id'           => 'd3useronline',
     'title'        => oxLang::getInstance()->translateString('D3_USERONLINE_METADATA_TITLE'),
diff --git a/copy_this/core/d3usersonline.php b/copy_this/modules/d3/d3usersonline/models/d3usersonline.php
similarity index 100%
rename from copy_this/core/d3usersonline.php
rename to copy_this/modules/d3/d3usersonline/models/d3usersonline.php
diff --git a/copy_this/modules/d3usersonline/views/d3_oxcmp_utils_usersonline.php b/copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php
similarity index 100%
rename from copy_this/modules/d3usersonline/views/d3_oxcmp_utils_usersonline.php
rename to copy_this/modules/d3/d3usersonline/modules/components/d3_oxcmp_utils_usersonline.php
diff --git a/copy_this/modules/d3usersonline/picture.png b/copy_this/modules/d3/d3usersonline/picture.png
similarity index 100%
rename from copy_this/modules/d3usersonline/picture.png
rename to copy_this/modules/d3/d3usersonline/picture.png