Changed module structure.