restruct namespace