XD-120 - Move top level Main classes to sub-package 'server'
Merge pull request #23 from ghillert/XD-120

* ghillert-XD-120:
  XD-120 - Move top level Main classes to sub-package 'server'