More document restructuring