restructure fixes for pub server