Updated Paths to work in new folder structure