renaming directory structure to match namespace