Change the structure of the driver example

Make it more explicit