Refactore package structure. Utility classes in oo-style