Changed server to follow the same project format as client.