reorder some targets and definitionms so that they are easier to add to/override