Forgot to remove moved files. No further changes.