redesign (module name, API)