Updating to new file structure and linux paths