Reorganized the server container setup.