Changed source paths to match new file structure.