Improve structure of documents on deployment