consolidating/renaming directory structure