Moving commands to separate classes