Re organize sample

Starting work on #59