splitoff server component
refactored due to split off server component
Merge pull request #24 from zelgerj/master

splitoff server component