Moving all to the JNP module