Reorganization to agree with documents template