Refactor into separate controller/executor classes
Update commands to /arena