DOC-3182 Restructure (cont)