Some package reordering and cleaning