Modifying the gradle scripts to change dependency structures and other things. Started working on metamodel fixes