Improve build system
Add server code