Re-add pugixml library
Fix up project and source/header files