Simplified the module structure