moved more stuff to thirdparty directories