Remove Coordinate class
Fixed merge conflicts
Fixed merge conflicts