reorder targets to give better layering