Minor reorganization on the migration
Minor reorganization on the migration

RJFryman/commontator,tbprojects/commontator,lml/commontator,juanpastas/commontator,tbprojects/commontator,tbprojects/commontator,RJFryman/commontator,lml/commontator,juanpastas/commontator,lml/commontator,juanpastas/commontator,RJFryman/commontator