Revert "Merge pull request #9 from flamsmark/administrative-reorg"

This reverts commit ff099a0725c6b3f53bee38dfa812a17f9a298757, reversing
changes made to 8c194de9313a64f7d328b97bc9d63b6a19b6e8c6.
Merge pull request #23 from nbdt/revertHouseRules

Revert "Merge pull request #9 from flamsmark/administrative-reorg"