1 files changed, 4 insertions, 6 deletions
diff --git a/common/design.h b/common/design.h
index 13c66d4e..cae50904 100644
--- a/common/design.h
+++ b/common/design.h
@@ -70,17 +70,15 @@ struct CellInfo
     std::unordered_map<IdString, IdString> pins;
 };
 
-struct Design
+struct Context : Arch
 {
-    struct Arch chip;
+    std::unordered_map<IdString, NetInfo *> nets;
+    std::unordered_map<IdString, CellInfo *> cells;
 
-    Design(ArchArgs args) : chip(args)
+    Context(ArchArgs args) : Arch(args)
     {
         // ...
     }
-
-    std::unordered_map<IdString, NetInfo *> nets;
-    std::unordered_map<IdString, CellInfo *> cells;
 };
 
 NEXTPNR_NAMESPACE_END