Reorganized some library dependencies.