restructuring of the documentation schema