Move commands to separate modules