Reorganized file hierarchy and general cleanup of unneeded files. Moved data to the same level as src. Moved tests to own parallel directory. Changed Euclidean and Manhattan tests so that mocking is not used.
Fixed merge conflicts