Moved stuff around.
Updated readme.