Cleanup, readme organized