Refactoring and consolidating third-party libs.