Move ivtoolkit classes to proper packages