Revert "basic architecture"

This reverts commit 037cd091fdd59eef930747f99d5607dacb226472.