Reorganized files
Fixed the bipartite-matching code to handle floats and fixed a few bugs