Changed Command structure again

> abstract (again!)
> Extracted simpler commands