Reorganizing Commands

Signed-off-by: Adam Engebretson <adam@enge.me>