Fixed typos
Reorganized server file structure
Merge pull request #26 from emiidee/feat/server_layout

Reorganized server file structure