diff --git a/contrib/autocomplete.ext.php b/contrib/autocomplete/main.php
similarity index 100%
rename from contrib/autocomplete.ext.php
rename to contrib/autocomplete/main.php
diff --git a/contrib/notes.ext.php b/contrib/notes/main.php
similarity index 100%
rename from contrib/notes.ext.php
rename to contrib/notes/main.php
diff --git a/contrib/rating.ext.php b/contrib/rating/main.php
similarity index 100%
rename from contrib/rating.ext.php
rename to contrib/rating/main.php
diff --git a/contrib/site_description.ext.php b/contrib/site_description/main.php
similarity index 100%
rename from contrib/site_description.ext.php
rename to contrib/site_description/main.php
diff --git a/ext/alias_editor.ext.php b/ext/alias_editor/main.php
similarity index 100%
rename from ext/alias_editor.ext.php
rename to ext/alias_editor/main.php
diff --git a/ext/bulk_add.ext.php b/ext/bulk_add/main.php
similarity index 100%
rename from ext/bulk_add.ext.php
rename to ext/bulk_add/main.php
diff --git a/ext/comment.ext.php b/ext/comment/main.php
similarity index 100%
rename from ext/comment.ext.php
rename to ext/comment/main.php
diff --git a/ext/downtime.ext.php b/ext/downtime/main.php
similarity index 100%
rename from ext/downtime.ext.php
rename to ext/downtime/main.php
diff --git a/ext/et.ext.php b/ext/et/main.php
similarity index 100%
rename from ext/et.ext.php
rename to ext/et/main.php
diff --git a/ext/ipban.ext.php b/ext/ipban/main.php
similarity index 100%
rename from ext/ipban.ext.php
rename to ext/ipban/main.php
diff --git a/ext/news.ext.php b/ext/news/main.php
similarity index 100%
rename from ext/news.ext.php
rename to ext/news/main.php
diff --git a/ext/regen_thumb.ext.php b/ext/regen_thumb/main.php
similarity index 100%
rename from ext/regen_thumb.ext.php
rename to ext/regen_thumb/main.php
diff --git a/ext/rss_images.ext.php b/ext/rss_images/main.php
similarity index 100%
rename from ext/rss_images.ext.php
rename to ext/rss_images/main.php
diff --git a/ext/tag_list.ext.php b/ext/tag_list/main.php
similarity index 100%
rename from ext/tag_list.ext.php
rename to ext/tag_list/main.php
diff --git a/ext/zoom.ext.php b/ext/zoom/main.php
similarity index 100%
rename from ext/zoom.ext.php
rename to ext/zoom/main.php
diff --git a/index.php b/index.php
index 28f5ca12..2d90a631 100644
--- a/index.php
+++ b/index.php
@@ -20,7 +20,7 @@ EOD;
 	exit;
 }
 
-$files = array_merge(glob("core/*.php"), glob("core/*/*.php"), glob("ext/*.php"));
+$files = array_merge(glob("core/*.php"), glob("core/*/*.php"), glob("ext/*/main.php"));
 
 foreach($files as $filename) {
 	require_once $filename;