Moved location data to raw data

Also added data type so graph plots can be distinguished