Renaming namespaces and rearranged untangle into another folder