diff --git a/composer.json b/composer.json
index 7e652ba..ecd3cbc 100644
--- a/composer.json
+++ b/composer.json
@@ -24,9 +24,6 @@
     },
     "replace": {
         "contao-legacy/extended_checkbox": "self.version"
-    },
-     "autoload":{
-        "classmap":["extended_checkbox/"]
     },
     "extra":{
         "contao": {
diff --git a/extended_checkbox/config/autoload.ini b/config/autoload.ini
similarity index 100%
rename from extended_checkbox/config/autoload.ini
rename to config/autoload.ini
diff --git a/extended_checkbox/config/autoload.php b/config/autoload.php
similarity index 100%
rename from extended_checkbox/config/autoload.php
rename to config/autoload.php
diff --git a/extended_checkbox/config/config.php b/config/config.php
similarity index 100%
rename from extended_checkbox/config/config.php
rename to config/config.php
diff --git a/extended_checkbox/dca/tl_form_field.php b/dca/tl_form_field.php
similarity index 100%
rename from extended_checkbox/dca/tl_form_field.php
rename to dca/tl_form_field.php
diff --git a/extended_checkbox/forms/FormCheckBoxExtended.php b/forms/FormCheckBoxExtended.php
similarity index 100%
rename from extended_checkbox/forms/FormCheckBoxExtended.php
rename to forms/FormCheckBoxExtended.php
diff --git a/extended_checkbox/languages/de/default.php b/languages/de/default.php
similarity index 100%
rename from extended_checkbox/languages/de/default.php
rename to languages/de/default.php
diff --git a/extended_checkbox/languages/de/tl_form_field.php b/languages/de/tl_form_field.php
similarity index 100%
rename from extended_checkbox/languages/de/tl_form_field.php
rename to languages/de/tl_form_field.php
diff --git a/extended_checkbox/languages/en/default.php b/languages/en/default.php
similarity index 100%
rename from extended_checkbox/languages/en/default.php
rename to languages/en/default.php
diff --git a/extended_checkbox/languages/en/tl_form_field.php b/languages/en/tl_form_field.php
similarity index 100%
rename from extended_checkbox/languages/en/tl_form_field.php
rename to languages/en/tl_form_field.php
diff --git a/extended_checkbox/templates/form_widget_extended_checkbox.html5 b/templates/form_widget_extended_checkbox.html5
similarity index 100%
rename from extended_checkbox/templates/form_widget_extended_checkbox.html5
rename to templates/form_widget_extended_checkbox.html5
diff --git a/extended_checkbox/templates/form_widget_extended_checkbox.xhtml b/templates/form_widget_extended_checkbox.xhtml
similarity index 100%
rename from extended_checkbox/templates/form_widget_extended_checkbox.xhtml
rename to templates/form_widget_extended_checkbox.xhtml
diff --git a/extended_checkbox/templates/form_widget_extended_checkbox_without_label.html5 b/templates/form_widget_extended_checkbox_without_label.html5
similarity index 100%
rename from extended_checkbox/templates/form_widget_extended_checkbox_without_label.html5
rename to templates/form_widget_extended_checkbox_without_label.html5
diff --git a/extended_checkbox/templates/form_widget_extended_checkbox_without_label.xhtml b/templates/form_widget_extended_checkbox_without_label.xhtml
similarity index 100%
rename from extended_checkbox/templates/form_widget_extended_checkbox_without_label.xhtml
rename to templates/form_widget_extended_checkbox_without_label.xhtml