Move commands.py to classes