Some more repackaging
Reorder priorities