Move commands to single file