Move Measure and Percentage to separate file