Clarify custom commands

Move all custom commands to single section for ease of visibility.

Tested-on: thay <28 Jan 2014>