Incorporating files, correcting file paths, etc