Merge pull request #633 from OAI/issue-563

moved reusable definitions under a single element