Re organize sample

Starting work on #59
Please don't use star imports.