moved files around and handle missing file issue