Refactored all static Utils classes into one (using partials).