Revert "full structure"

This reverts commit ed9473d0c8c7fcbc0ce8ee6e10e12bdcdec86d32.