Reworking the module structure