Rearranged some shippable stuff