initial work
work on new measure framework
Merge pull request #179 from sk2/custom-folders

Custom folders