Refactor a bit
Samples belong in samples