More doap improvements
Add doap files
refactor