Move server into lib/server