restructure for publish.