Refactoring - move util classes to a proper package