Updated several files to work with new folder name