README cleanup
More fixes and renames as the convert continues