Remove newer files from old-trains3-branch.
Move old/trains3 to trains3.