Changed references to moved files