Changes to get the build working with moved files.