small changes to the module structure