Architecture redone
Revert "Architecture redone"

This reverts commit 1460caa7d05960193c731038406f6bcc885b6ccb.
Architecture redone