Move stuff around and update readme.