Switch to module based architecture.