separating the server
Merge pull request #1 from kang/modularizingServer

separating the server