Refactored utility classes into separate packages