Did a bit of package reordering