diff --git a/beautiful-racket-demo/basic-demo/3dplot.bas b/beautiful-racket-demo/basic-demo/3dplot.bas
index 85f0331..042728e 100644
--- a/beautiful-racket-demo/basic-demo/3dplot.bas
+++ b/beautiful-racket-demo/basic-demo/3dplot.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 1 PRINT TAB(32);"3D PLOT"
 2 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
diff --git a/beautiful-racket-demo/basic-demo/aceyducey.bas b/beautiful-racket-demo/basic-demo/aceyducey.bas
index e0ffee9..a24b783 100644
--- a/beautiful-racket-demo/basic-demo/aceyducey.bas
+++ b/beautiful-racket-demo/basic-demo/aceyducey.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 10 PRINT TAB(26);"ACEY DUCEY CARD GAME"
 20 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
 21 PRINT
diff --git a/beautiful-racket-demo/basic-demo/amazing.bas b/beautiful-racket-demo/basic-demo/amazing.bas
index 4a3a300..b9e0d6e 100644
--- a/beautiful-racket-demo/basic-demo/amazing.bas
+++ b/beautiful-racket-demo/basic-demo/amazing.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 10 PRINT TAB(28);"AMAZING PROGRAM"
 20 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
diff --git a/beautiful-racket-demo/basic-demo/bounce.bas b/beautiful-racket-demo/basic-demo/bounce.bas
index 28261c4..655d39b 100644
--- a/beautiful-racket-demo/basic-demo/bounce.bas
+++ b/beautiful-racket-demo/basic-demo/bounce.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 10 PRINT TAB(33);"BOUNCE"
 20 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
diff --git a/beautiful-racket-demo/basic-demo/change.bas b/beautiful-racket-demo/basic-demo/change.bas
index c558b20..4557e28 100644
--- a/beautiful-racket-demo/basic-demo/change.bas
+++ b/beautiful-racket-demo/basic-demo/change.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 2 PRINT TAB(33);"CHANGE"
 4 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
 5 PRINT:PRINT:PRINT
diff --git a/beautiful-racket-demo/basic-demo/chemist.bas b/beautiful-racket-demo/basic-demo/chemist.bas
index 38a5d53..317873f 100644
--- a/beautiful-racket-demo/basic-demo/chemist.bas
+++ b/beautiful-racket-demo/basic-demo/chemist.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 3 print TAB(33);"Chemist"
 6 print TAB(15);"Creative Computing | Morristown, New Jersey"
diff --git a/beautiful-racket-demo/basic-demo/dim.bas b/beautiful-racket-demo/basic-demo/dim.bas
index b6be6eb..dc957f1 100644
--- a/beautiful-racket-demo/basic-demo/dim.bas
+++ b/beautiful-racket-demo/basic-demo/dim.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 5 A=5
 10 DIM A(A)
diff --git a/beautiful-racket-demo/basic-demo/for.bas b/beautiful-racket-demo/basic-demo/for.bas
index 4b00c5e..96797ee 100644
--- a/beautiful-racket-demo/basic-demo/for.bas
+++ b/beautiful-racket-demo/basic-demo/for.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 10 for A=1 to 3 
 20 print A
 21 for B=5 to 8
diff --git a/beautiful-racket-demo/basic-demo/gosub.bas b/beautiful-racket-demo/basic-demo/gosub.bas
index 92c5d30..4f94486 100644
--- a/beautiful-racket-demo/basic-demo/gosub.bas
+++ b/beautiful-racket-demo/basic-demo/gosub.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 10 GOSUB 50
 15 PRINT "2 of 3"
 17 GOSUB 30
diff --git a/beautiful-racket-demo/basic-demo/main.rkt b/beautiful-racket-demo/basic-demo/main.rkt
new file mode 100644
index 0000000..9537fd6
--- /dev/null
+++ b/beautiful-racket-demo/basic-demo/main.rkt
@@ -0,0 +1,4 @@
+#lang br/quicklang
+(module reader br
+  (require "reader.rkt")
+  (provide read-syntax))
diff --git a/beautiful-racket-demo/basic-demo/next-fix.bas b/beautiful-racket-demo/basic-demo/next-fix.bas
index 953acab..701637c 100644
--- a/beautiful-racket-demo/basic-demo/next-fix.bas
+++ b/beautiful-racket-demo/basic-demo/next-fix.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 
 300 B=INT(RND(3*2))
diff --git a/beautiful-racket-demo/basic-demo/on.bas b/beautiful-racket-demo/basic-demo/on.bas
index 454a950..591094d 100644
--- a/beautiful-racket-demo/basic-demo/on.bas
+++ b/beautiful-racket-demo/basic-demo/on.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 10 X = 3
 20 on X gosub 210, 220, 230
 21 print "yay"
diff --git a/beautiful-racket-demo/basic-demo/reader.rkt b/beautiful-racket-demo/basic-demo/reader.rkt
index f48cba5..61e31d4 100644
--- a/beautiful-racket-demo/basic-demo/reader.rkt
+++ b/beautiful-racket-demo/basic-demo/reader.rkt
@@ -2,5 +2,5 @@
 (require br/reader-utils "parser.rkt" "tokenizer.rkt")
 
 (define-read-and-read-syntax (source-path input-port)
-  #`(module bf-mod br/demo/basic/expander
+  #`(module bf-mod basic-demo/expander
       #,(parse source-path (tokenize input-port))))
diff --git a/beautiful-racket-demo/basic-demo/sinewave.bas b/beautiful-racket-demo/basic-demo/sinewave.bas
index cc6b23d..47f9797 100644
--- a/beautiful-racket-demo/basic-demo/sinewave.bas
+++ b/beautiful-racket-demo/basic-demo/sinewave.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 10 PRINT TAB(30);"SINE WAVE"
 20 PRINT TAB(15);"CREATIVE COMPUTING  MORRISTOWN, NEW JERSEY"
diff --git a/beautiful-racket-demo/basic-demo/tabs.bas b/beautiful-racket-demo/basic-demo/tabs.bas
index d3acdbf..10b4f1e 100644
--- a/beautiful-racket-demo/basic-demo/tabs.bas
+++ b/beautiful-racket-demo/basic-demo/tabs.bas
@@ -1,4 +1,4 @@
-#lang br/demo/basic
+#lang basic-demo
 
 5 print 30; "foo"
 10 PRINT TAB(10);"*";
diff --git a/beautiful-racket-demo/basic.rkt b/beautiful-racket-demo/basic.rkt
deleted file mode 100644
index d1fcc19..0000000
--- a/beautiful-racket-demo/basic.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang br
-(module reader br
-  (require "basic/reader.rkt")
-  (provide (all-from-out "basic/reader.rkt")))
diff --git a/beautiful-racket-demo/bf.rkt b/beautiful-racket-demo/bf.rkt
deleted file mode 100644
index bc41356..0000000
--- a/beautiful-racket-demo/bf.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang br
-(module reader br
-  (require (submod "bf/main.rkt" reader))
-  (provide read-syntax))
diff --git a/beautiful-racket-demo/funstacker-demo/funstacker-h2.rkt b/beautiful-racket-demo/funstacker-demo/funstacker-h2.rkt
index 9d8cfcb..0ef63c6 100644
--- a/beautiful-racket-demo/funstacker-demo/funstacker-h2.rkt
+++ b/beautiful-racket-demo/funstacker-demo/funstacker-h2.rkt
@@ -3,7 +3,7 @@
 (define (read-syntax path port)
   (define args (port->lines port))
   (define arg-datums (filter-not void? (format-datums '~a args)))
-  (define module-datum `(module stacker-mod br/demo/funstacker
+  (define module-datum `(module stacker-mod funstacker-demo
                           (nestify null ,@arg-datums)))
   (datum->syntax #f module-datum))
 (provide read-syntax)
diff --git a/beautiful-racket-demo/hdl-demo/And.hdl.rkt b/beautiful-racket-demo/hdl-demo/And.hdl.rkt
index b519f67..e6323f2 100644
--- a/beautiful-racket-demo/hdl-demo/And.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/And.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP And {
           IN a, b;
diff --git a/beautiful-racket-demo/hdl-demo/And.tst.rkt b/beautiful-racket-demo/hdl-demo/And.tst.rkt
index d4e5d6f..46501cb 100755
--- a/beautiful-racket-demo/hdl-demo/And.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/And.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/DMux.hdl.rkt b/beautiful-racket-demo/hdl-demo/DMux.hdl.rkt
index fc3bc99..4d4f8f2 100644
--- a/beautiful-racket-demo/hdl-demo/DMux.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/DMux.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/DMux4Way.tst.rkt b/beautiful-racket-demo/hdl-demo/DMux4Way.tst.rkt
index 848eb79..2a848b5 100644
--- a/beautiful-racket-demo/hdl-demo/DMux4Way.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/DMux4Way.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/Dmux.tst.rkt b/beautiful-racket-demo/hdl-demo/Dmux.tst.rkt
index 5017ecb..fb8eeee 100644
--- a/beautiful-racket-demo/hdl-demo/Dmux.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Dmux.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/Dmux4Way.hdl.rkt b/beautiful-racket-demo/hdl-demo/Dmux4Way.hdl.rkt
index 0095b0c..4fb232b 100644
--- a/beautiful-racket-demo/hdl-demo/Dmux4Way.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Dmux4Way.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/Fanout.hdl.rkt b/beautiful-racket-demo/hdl-demo/Fanout.hdl.rkt
index 0bb6318..7ba493a 100644
--- a/beautiful-racket-demo/hdl-demo/Fanout.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Fanout.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP Fanout {
          IN in;
diff --git a/beautiful-racket-demo/hdl-demo/HalfAdder.hdl.rkt b/beautiful-racket-demo/hdl-demo/HalfAdder.hdl.rkt
index 349550d..35bee45 100644
--- a/beautiful-racket-demo/hdl-demo/HalfAdder.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/HalfAdder.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP HalfAdder {
     IN a, b;    // 1-bit inputs
diff --git a/beautiful-racket-demo/hdl-demo/HalfAdder.tst.rkt b/beautiful-racket-demo/hdl-demo/HalfAdder.tst.rkt
index 62ac533..23fa951 100755
--- a/beautiful-racket-demo/hdl-demo/HalfAdder.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/HalfAdder.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/Mux.hdl.rkt b/beautiful-racket-demo/hdl-demo/Mux.hdl.rkt
index 28c72c1..79281a2 100644
--- a/beautiful-racket-demo/hdl-demo/Mux.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Mux.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/Mux.tst.rkt b/beautiful-racket-demo/hdl-demo/Mux.tst.rkt
index c1b9058..8e8fbc3 100644
--- a/beautiful-racket-demo/hdl-demo/Mux.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Mux.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
 // by Nisan and Schocken, MIT Press.
diff --git a/beautiful-racket-demo/hdl-demo/Nand.tst.rkt b/beautiful-racket-demo/hdl-demo/Nand.tst.rkt
index 3ada897..7bf4e93 100644
--- a/beautiful-racket-demo/hdl-demo/Nand.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Nand.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 /* nand */
 
diff --git a/beautiful-racket-demo/hdl-demo/Not-sexp.rkt b/beautiful-racket-demo/hdl-demo/Not-sexp.rkt
index d930724..dd252e3 100644
--- a/beautiful-racket-demo/hdl-demo/Not-sexp.rkt
+++ b/beautiful-racket-demo/hdl-demo/Not-sexp.rkt
@@ -1,4 +1,4 @@
-#lang s-exp br/demo/hdl/expander
+#lang s-exp hdl-demo/expander
 
 #|
 CHIP Not {
diff --git a/beautiful-racket-demo/hdl-demo/Not.hdl.rkt b/beautiful-racket-demo/hdl-demo/Not.hdl.rkt
index e8034cd..314b234 100644
--- a/beautiful-racket-demo/hdl-demo/Not.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Not.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP Not {
           IN in;
diff --git a/beautiful-racket-demo/hdl-demo/Not.tst-sexp.rkt b/beautiful-racket-demo/hdl-demo/Not.tst-sexp.rkt
index a65dcd4..112a83f 100644
--- a/beautiful-racket-demo/hdl-demo/Not.tst-sexp.rkt
+++ b/beautiful-racket-demo/hdl-demo/Not.tst-sexp.rkt
@@ -1,4 +1,4 @@
-#lang s-exp br/demo/hdl-tst/expander
+#lang s-exp hdl-tst-demo/expander
 
 
 #|
@@ -15,7 +15,7 @@ output;
 
 |#
 
-(require br/demo/hdl-tst/hdlprint rackunit racket/file)
+(require hdl-demo-tst/hdlprint rackunit racket/file)
 (require "Not.hdl.rkt") ; load Not.hdl,
 (define of (open-output-file "Not.out" #:mode 'text #:exists 'replace)) ; output-file Not.out,
 (define (output in out) ; output-list in%B3.1.3 out%B3.1.3;
diff --git a/beautiful-racket-demo/hdl-demo/Not.tst.rkt b/beautiful-racket-demo/hdl-demo/Not.tst.rkt
index d35bf3b..0718d52 100644
--- a/beautiful-racket-demo/hdl-demo/Not.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Not.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 load Not.hdl,
 output-file Not.out,
diff --git a/beautiful-racket-demo/hdl-demo/Or.hdl.rkt b/beautiful-racket-demo/hdl-demo/Or.hdl.rkt
index 36457aa..ae8718e 100644
--- a/beautiful-racket-demo/hdl-demo/Or.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Or.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP Or {
          IN a, b;
diff --git a/beautiful-racket-demo/hdl-demo/Or.tst.rkt b/beautiful-racket-demo/hdl-demo/Or.tst.rkt
index 29ae921..0421899 100644
--- a/beautiful-racket-demo/hdl-demo/Or.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Or.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
 // by Nisan and Schocken, MIT Press.
diff --git a/beautiful-racket-demo/hdl-demo/Toffoli.hdl.rkt b/beautiful-racket-demo/hdl-demo/Toffoli.hdl.rkt
index b519f67..e6323f2 100644
--- a/beautiful-racket-demo/hdl-demo/Toffoli.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Toffoli.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 CHIP And {
           IN a, b;
diff --git a/beautiful-racket-demo/hdl-demo/Xor.hdl.rkt b/beautiful-racket-demo/hdl-demo/Xor.hdl.rkt
index c869652..fa8ec0e 100644
--- a/beautiful-racket-demo/hdl-demo/Xor.hdl.rkt
+++ b/beautiful-racket-demo/hdl-demo/Xor.hdl.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl
+#lang hdl-demo
 
 /* Xor (exclusive or) gate:
 If a<>b out=1 else out=0. */
diff --git a/beautiful-racket-demo/hdl-demo/Xor.tst.rkt b/beautiful-racket-demo/hdl-demo/Xor.tst.rkt
index 2c57c46..003958d 100644
--- a/beautiful-racket-demo/hdl-demo/Xor.tst.rkt
+++ b/beautiful-racket-demo/hdl-demo/Xor.tst.rkt
@@ -1,4 +1,4 @@
-#lang br/demo/hdl-tst
+#lang hdl-tst-demo
 
 // This file is part of www.nand2tetris.org
 // and the book "The Elements of Computing Systems"
diff --git a/beautiful-racket-demo/hdl-demo/main.rkt b/beautiful-racket-demo/hdl-demo/main.rkt
new file mode 100644
index 0000000..9537fd6
--- /dev/null
+++ b/beautiful-racket-demo/hdl-demo/main.rkt
@@ -0,0 +1,4 @@
+#lang br/quicklang
+(module reader br
+  (require "reader.rkt")
+  (provide read-syntax))
diff --git a/beautiful-racket-demo/hdl-demo/reader.rkt b/beautiful-racket-demo/hdl-demo/reader.rkt
index a6bf51f..4348625 100644
--- a/beautiful-racket-demo/hdl-demo/reader.rkt
+++ b/beautiful-racket-demo/hdl-demo/reader.rkt
@@ -2,5 +2,5 @@
 (require br/reader-utils "parser.rkt" "tokenizer.rkt")
 
 (define-read-and-read-syntax (source-path input-port)
-  #`(module hdl-mod br/demo/hdl/expander
+  #`(module hdl-mod hdl-demo/expander
       #,(parse source-path (tokenize input-port))))
diff --git a/beautiful-racket-demo/hdl-tst.rkt b/beautiful-racket-demo/hdl-tst-demo/main.rkt
similarity index 53%
rename from beautiful-racket-demo/hdl-tst.rkt
rename to beautiful-racket-demo/hdl-tst-demo/main.rkt
index eeca7a3..e011c34 100644
--- a/beautiful-racket-demo/hdl-tst.rkt
+++ b/beautiful-racket-demo/hdl-tst-demo/main.rkt
@@ -1,7 +1,7 @@
 #lang br
 
 (module reader br
-  (require br/reader-utils "hdl-tst/parser.rkt" "hdl-tst/tokenizer.rkt")
+  (require br/reader-utils "parser.rkt" "tokenizer.rkt")
   (define-read-and-read-syntax (source-path input-port)
-    #`(module hdl-mod br/demo/hdl-tst/expander
+    #`(module hdl-mod hdl-tst-demo/expander
         #,(parse source-path (tokenize input-port)))))
diff --git a/beautiful-racket-demo/hdl.rkt b/beautiful-racket-demo/hdl.rkt
deleted file mode 100644
index 358fcc7..0000000
--- a/beautiful-racket-demo/hdl.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang br
-
-(module+ reader
-  (require "hdl/reader.rkt")
-  (provide (all-from-out "hdl/reader.rkt")))
diff --git a/beautiful-racket-demo/jsonic-2.rkt b/beautiful-racket-demo/jsonic-2.rkt
deleted file mode 100644
index 04418fd..0000000
--- a/beautiful-racket-demo/jsonic-2.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang br/quicklang
-(module reader br/quicklang
-  (require (submod "jsonic-2/main.rkt" reader))
-  (provide (all-from-out (submod "jsonic-2/main.rkt" reader))))
diff --git a/beautiful-racket-demo/jsonic.rkt b/beautiful-racket-demo/jsonic.rkt
deleted file mode 100644
index 1ec7d36..0000000
--- a/beautiful-racket-demo/jsonic.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang br/quicklang
-(module reader br/quicklang
-  (require (submod "jsonic/main.rkt" reader))
-  (provide (all-from-out (submod "jsonic/main.rkt" reader))))
diff --git a/beautiful-racket-demo/txtadv-demo/expander.rkt b/beautiful-racket-demo/txtadv-demo/expander.rkt
index dcb1277..29c15a6 100644
--- a/beautiful-racket-demo/txtadv-demo/expander.rkt
+++ b/beautiful-racket-demo/txtadv-demo/expander.rkt
@@ -21,9 +21,9 @@
 ;; ============================================================
 ;; Overall module:
 
-(define-macro (module-begin _lines ...)
+(define-macro (module-begin LINES ...)
   #'(#%module-begin
-     _lines ...
+     LINES ...
      
      (provide do-verb do-place)
      (module+ main
diff --git a/beautiful-racket-demo/txtadv-demo/reader.rkt b/beautiful-racket-demo/txtadv-demo/reader.rkt
index 6fc14b9..2dce4f5 100644
--- a/beautiful-racket-demo/txtadv-demo/reader.rkt
+++ b/beautiful-racket-demo/txtadv-demo/reader.rkt
@@ -2,5 +2,5 @@
 
 (require br/reader-utils "parser.rkt" "tokenizer.rkt")
   (define-read-and-read-syntax (source-path input-port)
-    #`(module world br/demo/txtadv/expander
+    #`(module world txtadv-demo/expander
         #,(parse source-path (tokenize input-port))))
diff --git a/beautiful-racket-demo/txtadv.rkt b/beautiful-racket-demo/txtadv.rkt
deleted file mode 100644
index 1793843..0000000
--- a/beautiful-racket-demo/txtadv.rkt
+++ /dev/null
@@ -1,5 +0,0 @@
-#lang br
-
-(module reader br
-  (require "txtadv/reader0.rkt")
-  (provide (all-from-out "txtadv/reader0.rkt")))
diff --git a/beautiful-racket-demo/wires.rkt b/beautiful-racket-demo/wires.rkt
deleted file mode 100644
index a6fc37d..0000000
--- a/beautiful-racket-demo/wires.rkt
+++ /dev/null
@@ -1,4 +0,0 @@
-#lang br/quicklang
-(module reader br/quicklang
-  (require (submod "wires/main.rkt" reader))
-  (provide (all-from-out (submod "wires/main.rkt" reader))))