namespaces/folders reorg