Cleaning up package refactoring

server.server packages are now directly located in the server package.