Rename and move of Metrics class...eliminates the nomethoderrors?