refactor / re-org many server files
Merge pull request #13 from brianjscoles/serverRefactor

refactor / re-org many server files