Cleaned up headers (up to eval-measure.h)
Refactoring of headers