Re organize sample

Starting work on #59
This seems like a giant convoluted abstraction fraught with boilerplate on what is otherwise using the `String[]` or `List<String>` directly.