Moved utililty classes into separate package