Move C7 specific stuff to its own file