Rearranged the CommandRoute class