Revert move of Aspect class from xjc/outline to xjc/model.