Made some path changes to match new directory structure.