Move server into a module