diff --git a/inc/class.zcfsactivityreportbehaviors.php b/src/ActivityReportActions.php
similarity index 100%
rename from inc/class.zcfsactivityreportbehaviors.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/inc/class.zcfsfeedsactions.php b/src/FeedsActions.php
similarity index 100%
rename from inc/class.zcfsfeedsactions.php
rename to src/FeedsActions.php
diff --git a/inc/class.zcfsdefaultfeedsactions.php b/src/FeedsDefaultActions.php
similarity index 100%
rename from inc/class.zcfsdefaultfeedsactions.php
rename to src/FeedsDefaultActions.php
diff --git a/inc/class.zcfsfeedslist.php b/src/FeedsList.php
similarity index 100%
rename from inc/class.zcfsfeedslist.php
rename to src/FeedsList.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/index.php b/src/Manage.php
similarity index 100%
rename from index.php
rename to src/Manage.php
diff --git a/inc/class.zcfspostfilter.php b/src/PostsFilter.php
similarity index 100%
rename from inc/class.zcfspostfilter.php
rename to src/PostsFilter.php
diff --git a/inc/class.zcfsentrieslist.php b/src/PostsList.php
similarity index 100%
rename from inc/class.zcfsentrieslist.php
rename to src/PostsList.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/class.zcfsrsextposts.php b/src/RsExtPosts.php
similarity index 100%
rename from inc/class.zcfsrsextposts.php
rename to src/RsExtPosts.php
diff --git a/inc/class.zcfstemplate.php b/src/Template.php
similarity index 100%
rename from inc/class.zcfstemplate.php
rename to src/Template.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.zcfsupgrade.php b/src/Upgrade.php
similarity index 100%
rename from inc/class.zcfsupgrade.php
rename to src/Upgrade.php
diff --git a/inc/class.zcfsurlhandler.php b/src/UrlHandler.php
similarity index 100%
rename from inc/class.zcfsurlhandler.php
rename to src/UrlHandler.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/class.zoneclearfeedserver.php b/src/ZoneclearFeedsServer.php
similarity index 100%
rename from inc/class.zoneclearfeedserver.php
rename to src/ZoneclearFeedsServer.php