Moving back all the JNPServer naming into a jnp module insteadof clustered