Updated directory structure
Merge branch 'master' of https://github.com/DarkEnergyScienceCollaboration/chroma