Reworked the file/module layout.