refactoring of metadata/classinfo