Move C3 commands to separate file