New structure
Revert "New structure"

This reverts commit 582e9a60e1d704003aa4e0cb113d3c2559994720.