Move c coupling to the correct class (#4300)