Move some utility classes to a more proper package