Refactoring modules

Still planning on reworking how modules are booted.