Move Command out of the Commands module.
Fix failing specs.