Revert "Final structure"

This reverts commit 60868ed2c8e1ceeab11af12424b17cd376a5d029.
Revert "test"

This reverts commit d486bf6a65544d97ade7344f1c0dad97161c0d8d.
Revert "Restructured"

This reverts commit 09ca3051bed0407f4ad420a21c32960785b737eb.