Moving everything around (and a new sample)

Sorry.