Better example layout for #18
Better file handling for #67