cleaned up directory, fixed filepaths