cleanup: module structure cleanup