Move Metrics class back to main package
Fixed setting mount names to include args[1]