organized directories and updated filepaths