vendor libraries reorganised.