Updated readme.
Moved stuff around and removed now-useless code.