Moved NameFix to a seperate sub-package;
Moved NameFixModular to a separate file in said sub-package