More sketch of new module structure