move files to make the next PR easier to read (#3651)

1 file changed