Initial Split of Scanner & Renamer into types