Re organize sample

Starting work on #59
Undo star import