Change the example structure to be more logical