Changing to new location format and updated readme