Moving stuff around and writing a bit in the README