Update README, reorganize stuff