Renamed stuff. Updated README