Utils classes refactoring in a unique package