Remove the src dir in the way

Just a few git mv commands make the deep and flat cases work.