Refactoring util classes to appropriate package.