Move step to cmd/ the last of the stepping commands!
Tidy up hook now that all commands are proper commands