Reorganized JPMML to JPMML-Model