Organise packages better
Rearrange packages again
Merge remote-tracking branch 'origin/master' into schema-2.0
Fix broken import
Work in progress - start debate format builder for XML schema 2.0