Re organize sample

Starting work on #59
Kill the stars