re-giggle of directory structure to make more sense