Removed YAML definitions
Started the definition refactoring for 4.0
Definition refactoring
Fixing tests
Fixing tests