Revert previous reorganization.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@5640 c06c8d41-db1a-0410-9941-cceddc491573

Created by  dolorous  on June 9, 2008
HTMZ765OSIVTX2W5JRE6QFYRCLDXII3DZWH3SQNIVXCR6D6AYGXAC
Change contents