Started working on a module-based architecture.