Move commands to class constants
Move logos