Split Commands into separate classes