A little tweak to the example, and rearranging of files