A little file-moving cleanup