Moved commandhandler, added confighandler