includes/ directory directory contains about 200 files. It looks like a dump, where it's hard to find something. I propose to move some files to subdirectories (if it won't break something): * includes/specialpages/ (SpecialPage.php and all special pages) * includes/output. (or other name; all functions obviously related to output: HttpFunctions.php, OutputHandler.php, OutputPage.php, WebRequest.php, WebResponse.php, etc.) * includes/database (or db; not sure if there's too many files related)

For API folder (now about 50 files; will be more after merging apiedit): * includes/api/formats (for ApiFormat*) * includes/api/edit (for write API) * includes/api/query/{list,prop,meta} (includes/api/query for ApiQueryBase, subdirectories for API queries)

I hope that it will help to make file layout of MediaWiki cleaner. --VasilievVV