Refactored the api server to be more modular
Merge pull request #1 from martega/modular-refactoring

Refactored the api server to be more modular