More lib split ups