Moved everything out of the default package to a new Metrics package