Move package instantiations for tools out of Markup hierarchy