Moving InstanceInfo related classes to a new package
Fix integTest shutdown