Fixing filenames and modifying code to reflect changes in path.