many updates to reorganize the server stack