reorg src and samples (sorry)