Move debug

This change moves debug gems into a different group.
Merge remote-tracking branch 'upstream/master'