diff --git a/beautiful-racket/br/demo/wires/expander.rkt b/beautiful-racket/br/demo/wires/expander.rkt
deleted file mode 100644
index 58f2253..0000000
--- a/beautiful-racket/br/demo/wires/expander.rkt
+++ /dev/null
@@ -1,35 +0,0 @@
-#lang br/quicklang
-(provide #%module-begin wire
-         AND OR LSHIFT RSHIFT NOT)
-
-(define-macro-cases wire
-  [(wire ARG -> ID) #'(define/display (ID)
-                        (val ARG))]
-  [(wire OP ARG -> ID) #'(define/display (ID)
-                           (OP (val ARG)))]
-  [(wire ARG1 OP ARG2 -> ID) #'(define/display (ID)
-                                 (OP (val ARG1) (val ARG2)))]
-  [else #'(void)])
-
-(define-macro (define/display (ID) BODY)
-  #'(begin
-      (define (ID) BODY)
-      (module+ main
-        (displayln (format "~a: ~a" 'ID (ID))))))
-
-(define val
-  (let ([wire-cache (make-hash)])
-    (λ (num-or-wire)
-      (if (number? num-or-wire)
-          num-or-wire
-          (hash-ref! wire-cache num-or-wire num-or-wire)))))
-
-(define 16bit-max (expt 2 16))
-(define-macro (define-16bit ID+ARGS BODY)
-  #'(define ID+ARGS (modulo BODY 16bit-max)))
-
-(define-16bit (AND x y) (bitwise-and x y))
-(define-16bit (OR x y) (bitwise-ior x y))
-(define-16bit (LSHIFT x y) (arithmetic-shift x y))
-(define-16bit (RSHIFT x y) (LSHIFT x (- y)))
-(define-16bit (NOT arg) (bitwise-not arg))
\ No newline at end of file
diff --git a/beautiful-racket/br/demo/wires/main.rkt b/beautiful-racket/br/demo/wires/main.rkt
index 8e643ca..7e64b6a 100644
--- a/beautiful-racket/br/demo/wires/main.rkt
+++ b/beautiful-racket/br/demo/wires/main.rkt
@@ -1,4 +1,7 @@
 #lang br/quicklang
+(provide #%module-begin wire
+         AND OR LSHIFT RSHIFT NOT)
+
 (module+ reader
   (provide read-syntax))
 
@@ -7,5 +10,37 @@
     (for/list ([wire-str (in-lines port)])
               (format-datum '(wire ~a) wire-str)))
   (strip-context
-   #`(module wires-mod br/demo/wires/expander
-       #,@wire-datums)))
\ No newline at end of file
+   #`(module wires-mod br/demo/wires/main
+       #,@wire-datums)))
+
+(define-macro-cases wire
+  [(wire ARG -> ID) #'(define/display (ID)
+                        (val ARG))]
+  [(wire OP ARG -> ID) #'(define/display (ID)
+                           (OP (val ARG)))]
+  [(wire ARG1 OP ARG2 -> ID) #'(define/display (ID)
+                                 (OP (val ARG1) (val ARG2)))]
+  [else #'(void)])
+
+(define-macro (define/display (ID) BODY)
+  #'(begin
+      (define (ID) BODY)
+      (module+ main
+        (displayln (format "~a: ~a" 'ID (ID))))))
+
+(define val
+  (let ([wire-cache (make-hash)])
+    (λ (num-or-wire)
+      (if (number? num-or-wire)
+          num-or-wire
+          (hash-ref! wire-cache num-or-wire num-or-wire)))))
+
+(define 16bit-max (expt 2 16))
+(define-macro (define-16bit ID+ARGS BODY)
+  #'(define ID+ARGS (modulo BODY 16bit-max)))
+
+(define-16bit (AND x y) (bitwise-and x y))
+(define-16bit (OR x y) (bitwise-ior x y))
+(define-16bit (LSHIFT x y) (arithmetic-shift x y))
+(define-16bit (RSHIFT x y) (LSHIFT x (- y)))
+(define-16bit (NOT arg) (bitwise-not arg))
\ No newline at end of file