Cleanup the building of directory names in preperation to remove the who...

...le ROOT hack and replace it with something else