Moved thirdparty out of lib