Split metamodel in different files for a better overview
Bugfixing and Refactoring