Revert "Structure"

This reverts commit d44b588b04c551ce56bfbbac0f07097ea0410ad0.