Revert "changed the architecture"

This reverts commit f9ea9a77a3525378b58de91c08eba4c4c6860f8e.