Minor restructuring(util moved out) and changes to rawDataUpload.py and rawDataUploader.py