restructuring namespaced directories