Fix build - some files moved around.