diff --git a/plugins/APCPlugin.php b/plugins/APC/APCPlugin.php
similarity index 100%
rename from plugins/APCPlugin.php
rename to plugins/APC/APCPlugin.php
diff --git a/plugins/BlogspamNetPlugin.php b/plugins/BlogspamNet/BlogspamNetPlugin.php
similarity index 100%
rename from plugins/BlogspamNetPlugin.php
rename to plugins/BlogspamNet/BlogspamNetPlugin.php
diff --git a/plugins/CacheLogPlugin.php b/plugins/CacheLog/CacheLogPlugin.php
similarity index 100%
rename from plugins/CacheLogPlugin.php
rename to plugins/CacheLog/CacheLogPlugin.php
diff --git a/plugins/DiskCachePlugin.php b/plugins/DiskCache/DiskCachePlugin.php
similarity index 100%
rename from plugins/DiskCachePlugin.php
rename to plugins/DiskCache/DiskCachePlugin.php
diff --git a/plugins/DisqusPlugin.php b/plugins/Disqus/DisqusPlugin.php
similarity index 100%
rename from plugins/DisqusPlugin.php
rename to plugins/Disqus/DisqusPlugin.php
diff --git a/plugins/EchoPlugin.php b/plugins/Echo/EchoPlugin.php
similarity index 100%
rename from plugins/EchoPlugin.php
rename to plugins/Echo/EchoPlugin.php
diff --git a/plugins/GeoURLPlugin.php b/plugins/GeoURL/GeoURLPlugin.php
similarity index 100%
rename from plugins/GeoURLPlugin.php
rename to plugins/GeoURL/GeoURLPlugin.php
diff --git a/plugins/GeonamesPlugin.php b/plugins/Geonames/GeonamesPlugin.php
similarity index 100%
rename from plugins/GeonamesPlugin.php
rename to plugins/Geonames/GeonamesPlugin.php
diff --git a/plugins/GoogleAnalyticsPlugin.php b/plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
similarity index 100%
rename from plugins/GoogleAnalyticsPlugin.php
rename to plugins/GoogleAnalytics/GoogleAnalyticsPlugin.php
diff --git a/plugins/LinkbackPlugin.php b/plugins/Linkback/LinkbackPlugin.php
similarity index 100%
rename from plugins/LinkbackPlugin.php
rename to plugins/Linkback/LinkbackPlugin.php
diff --git a/plugins/MemcachePlugin.php b/plugins/Memcache/MemcachePlugin.php
similarity index 100%
rename from plugins/MemcachePlugin.php
rename to plugins/Memcache/MemcachePlugin.php
diff --git a/plugins/MemcachedPlugin.php b/plugins/Memcached/MemcachedPlugin.php
similarity index 100%
rename from plugins/MemcachedPlugin.php
rename to plugins/Memcached/MemcachedPlugin.php
diff --git a/plugins/PiwikAnalyticsPlugin.php b/plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
similarity index 100%
rename from plugins/PiwikAnalyticsPlugin.php
rename to plugins/PiwikAnalytics/PiwikAnalyticsPlugin.php
diff --git a/plugins/SpotifyPlugin.php b/plugins/Spotify/SpotifyPlugin.php
similarity index 100%
rename from plugins/SpotifyPlugin.php
rename to plugins/Spotify/SpotifyPlugin.php
diff --git a/plugins/SubscriptionThrottlePlugin.php b/plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
similarity index 100%
rename from plugins/SubscriptionThrottlePlugin.php
rename to plugins/SubscriptionThrottle/SubscriptionThrottlePlugin.php
diff --git a/plugins/TemplatePlugin.php b/plugins/Template/TemplatePlugin.php
similarity index 100%
rename from plugins/TemplatePlugin.php
rename to plugins/Template/TemplatePlugin.php
diff --git a/plugins/UserLimitPlugin.php b/plugins/UserLimit/UserLimitPlugin.php
similarity index 100%
rename from plugins/UserLimitPlugin.php
rename to plugins/UserLimit/UserLimitPlugin.php
diff --git a/plugins/WikiHashtagsPlugin.php b/plugins/WikiHashtags/WikiHashtagsPlugin.php
similarity index 100%
rename from plugins/WikiHashtagsPlugin.php
rename to plugins/WikiHashtags/WikiHashtagsPlugin.php
diff --git a/plugins/XCachePlugin.php b/plugins/XCache/XCachePlugin.php
similarity index 100%
rename from plugins/XCachePlugin.php
rename to plugins/XCache/XCachePlugin.php