Slight modifications to account for directory changes 

Both the Data directories on Trellis machine and Midway are changed accordingly.