Oops
Created server folder.
Move server files to server folder
Merge remote-tracking branch 'upstream/master'
Merge pull request #17 from zephyrz4/master

Reorganization