Revert to having origin modules for web services and REST APIs
Improve test suit for the data_drivers and for the origin app