Tidied up markup for maintainability & moved snippets into own folder