60813854 proper measure folder layout

Maintains Measure's folder layout while properly cleaning up after itself and ignoring the 'tests' folder.