Moving stuff around, updating readme