Restructuring of the server project.