diff --git a/default-templates/cinecturlink2-atom.xml b/default-templates/mustek/cinecturlink2-atom.xml
similarity index 100%
rename from default-templates/cinecturlink2-atom.xml
rename to default-templates/mustek/cinecturlink2-atom.xml
diff --git a/default-templates/cinecturlink2-rss2.xml b/default-templates/mustek/cinecturlink2-rss2.xml
similarity index 100%
rename from default-templates/cinecturlink2-rss2.xml
rename to default-templates/mustek/cinecturlink2-rss2.xml
diff --git a/default-templates/cinecturlink2.html b/default-templates/mustek/cinecturlink2.html
similarity index 100%
rename from default-templates/cinecturlink2.html
rename to default-templates/mustek/cinecturlink2.html
diff --git a/_admin.php b/src/Backend.php
similarity index 100%
rename from _admin.php
rename to src/Backend.php
diff --git a/inc/lib.cinecturlink2.list.php b/src/BackendListingLinks.php
similarity index 100%
rename from inc/lib.cinecturlink2.list.php
rename to src/BackendListingLinks.php
diff --git a/_config.php b/src/Config.php
similarity index 100%
rename from _config.php
rename to src/Config.php
diff --git a/_public.php b/src/Frontend.php
similarity index 100%
rename from _public.php
rename to src/Frontend.php
diff --git a/inc/lib.cinecturlink2.context.php b/src/FrontendContext.php
similarity index 100%
rename from inc/lib.cinecturlink2.context.php
rename to src/FrontendContext.php
diff --git a/_install.php b/src/Install.php
similarity index 100%
rename from _install.php
rename to src/Install.php
diff --git a/index.php b/src/Manage.php
similarity index 100%
rename from index.php
rename to src/Manage.php
diff --git a/inc/lib.cinecturlink2.activityreport.php b/src/PluginActivityReport.php
similarity index 100%
rename from inc/lib.cinecturlink2.activityreport.php
rename to src/PluginActivityReport.php
diff --git a/inc/lib.sitemaps.cinecturlink2.php b/src/PluginSitemaps.php
similarity index 100%
rename from inc/lib.sitemaps.cinecturlink2.php
rename to src/PluginSitemaps.php
diff --git a/_prepend.php b/src/Prepend.php
similarity index 100%
rename from _prepend.php
rename to src/Prepend.php
diff --git a/_uninstall.php b/src/Uninstall.php
similarity index 100%
rename from _uninstall.php
rename to src/Uninstall.php
diff --git a/inc/class.cinecturlink2.php b/src/Utils.php
similarity index 100%
rename from inc/class.cinecturlink2.php
rename to src/Utils.php
diff --git a/_widgets.php b/src/Widgets.php
similarity index 100%
rename from _widgets.php
rename to src/Widgets.php