move thirdparty stuff back
fix include paths
add back in xml parsing