Breaking up the distance metrics into own files
Adding files missing from last commit
Adding more missing changes