Oomodel enhancements

Change structure of OOModel to use Declaration as a separate node