diff --git a/inc/lib.kutrl.activityreport.php b/src/ActivityReportActions.php
similarity index 100%
rename from inc/lib.kutrl.activityreport.php
rename to src/ActivityReportActions.php
diff --git a/_admin.php b/src/Backend.php
similarity index 100%
rename from _admin.php
rename to src/Backend.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/_install.php b/src/Install.php
similarity index 100%
rename from _install.php
rename to src/Install.php
diff --git a/inc/lib.kutrl.lst.php b/src/LinksListing.php
similarity index 100%
rename from inc/lib.kutrl.lst.php
rename to src/LinksListing.php
diff --git a/inc/lib.kutrl.log.php b/src/Logs.php
similarity index 100%
rename from inc/lib.kutrl.log.php
rename to src/Logs.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/_prepend.php b/src/Prepend.php
similarity index 100%
rename from _prepend.php
rename to src/Prepend.php
diff --git a/inc/lib.kutrl.srv.php b/src/Service.php
similarity index 100%
rename from inc/lib.kutrl.srv.php
rename to src/Service.php
diff --git a/inc/services/class.bilbolinks.service.php b/src/Service/ServiceBilbolinks.php
similarity index 100%
rename from inc/services/class.bilbolinks.service.php
rename to src/Service/ServiceBilbolinks.php
diff --git a/inc/services/class.bitly.service.php b/src/Service/ServiceBitly.php
similarity index 100%
rename from inc/services/class.bitly.service.php
rename to src/Service/ServiceBitly.php
diff --git a/inc/services/class.custom.service.php b/src/Service/ServiceCustom.php
similarity index 100%
rename from inc/services/class.custom.service.php
rename to src/Service/ServiceCustom.php
diff --git a/inc/services/class.default.service.php b/src/Service/ServiceDefault.php
similarity index 100%
rename from inc/services/class.default.service.php
rename to src/Service/ServiceDefault.php
diff --git a/inc/services/class.isgd.service.php b/src/Service/ServiceIsgd.php
similarity index 100%
rename from inc/services/class.isgd.service.php
rename to src/Service/ServiceIsgd.php
diff --git a/inc/services/class.local.service.php b/src/Service/ServiceLocal.php
similarity index 100%
rename from inc/services/class.local.service.php
rename to src/Service/ServiceLocal.php
diff --git a/inc/services/class.yourls.service.php b/src/Service/ServiceYourls.php
similarity index 100%
rename from inc/services/class.yourls.service.php
rename to src/Service/ServiceYourls.php
diff --git a/inc/services/class.googl.service.php b/src/Services/ServiceGoogl.php
similarity index 100%
rename from inc/services/class.googl.service.php
rename to src/Services/ServiceGoogl.php
diff --git a/inc/services/class.shortto.service.php b/src/Services/ServiceShortto.php
similarity index 100%
rename from inc/services/class.shortto.service.php
rename to src/Services/ServiceShortto.php
diff --git a/inc/services/class.supr.service.php b/src/Services/ServiceSupr.php
similarity index 100%
rename from inc/services/class.supr.service.php
rename to src/Services/ServiceSupr.php
diff --git a/inc/services/class.trim.service.php b/src/Services/ServiceTrim.php
similarity index 100%
rename from inc/services/class.trim.service.php
rename to src/Services/ServiceTrim.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.kutrl.php b/src/Utils.php
similarity index 100%
rename from inc/class.kutrl.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
diff --git a/inc/lib.wiki.kutrl.php b/src/Wiki.php
similarity index 100%
rename from inc/lib.wiki.kutrl.php
rename to src/Wiki.php