Move libraries into packages.