Moved the libraries to different files, and was able to get the thing to output test data in the form of measurements (+/-)
simplified iterator types to auto, and integrated new merge capability
of measurement class