Some module structure cleanup