Removing hard coded path names.