Refactor utility packages