Update (Server)

- Updats the server code to have the correct package names and put them
the right places, compiles and does not have any errors.
   - This seriously needs to be fixed.