more shuffling and namespacing