Updated sources to build properly with new directory pathnames