Move around some files to match the new approach.