General cleanup and fixing issues with the code
Fixed include paths of p2os_driver