Revert "Moved code from the command listener into seperate classes."

This reverts commit fd74a0d8e364c0998ffaad563951685d72286c50.
Moved code from commandhandler to seperate classes.