Move generators to JCPI