Initial Split of Renamer & Scanner