Moved all data files into a reasonable location, and updated code to work accordingly