Update and reorder munki tools