Reorganized 3rd-party libraries