Rearrangement of external libs