Revert "started metamodel rework"

This reverts commit 9b8e58a6ba4adc87b3a19a3e67646215986752f1.