Remove extra decorator files. Merge dec_for_both.
Move decorators into drafts.
Rename grub black manage, and osc.
Be consitent with naming.
Fix formatting on gbm.