renaming and adding server code