DrumSampler: Updated namespaces and split code