Moved zclass packaging to non-generated files.