Shuffle things around, update README