Move server code to separate package
Update makefile