fix re-structure namespace