updated readme and done some renaming