sorvell Reorganize modules.

Users who have contributed to this file

• sorvell
• azakus
• sjmiles