move commands to seperate module