Moved utlitity classes to proper package