Re organize sample

Starting work on #59
Death to stars!