Cleanup and rename some stuff
update Readme