rearchitecting server
Merge pull request #5 from Pouncealot/master

rearchitecting server