Refactoring: split Util.n file into serveral for each macro.
Fix file names.
Cleanup old type aliases.