Utilities refactoring
Updated ignore files