module structure cleanup