Changed -> server is now in one package