Put document structure in nicer location