Move data/samples to samples, and fix everything