Move server files to own namespace