Simplified the module setup.