Large refactoring to make some more sense of the package structure and to remove redundant utility classes. Functionality of those utilities is now found straight from the classes that are modified by them.