Revert "Revert "Mnt organization [WIP]""
Merge pull request #42 from NSLS-II/revert-41-revert-40-mnt_organization

Revert "Revert "Mnt organization [WIP]""