Cleaned up some files for working with a different data file directory structure