Reorganized readme
Name changes