Revert "Simplify structure"

This reverts commit d1e9d5ff596fb8fdec04ab58a86f2fc470499301.
Simplify structure

(Deleted the wrong local files earlier)