Adopt to the current thirdparty library structure