34 files changed, 26 insertions, 13 deletions
diff --git a/usr/austin/eval/Makefile b/src/pkg/exp/eval/Makefile
index 37f7c02a7..65bedf7ba 100644
--- a/usr/austin/eval/Makefile
+++ b/src/pkg/exp/eval/Makefile
@@ -4,7 +4,7 @@
 
 include $(GOROOT)/src/Make.$(GOARCH)
 
-TARG=eval
+TARG=exp/eval
 GOFILES=\
 	abort.go\
 	bridge.go\
diff --git a/usr/austin/eval/abort.go b/src/pkg/exp/eval/abort.go
index 38ad2bf62..38ad2bf62 100644
--- a/usr/austin/eval/abort.go
+++ b/src/pkg/exp/eval/abort.go
diff --git a/usr/austin/eval/bridge.go b/src/pkg/exp/eval/bridge.go
index da2dd52a9..da2dd52a9 100644
--- a/usr/austin/eval/bridge.go
+++ b/src/pkg/exp/eval/bridge.go
diff --git a/usr/austin/eval/compiler.go b/src/pkg/exp/eval/compiler.go
index f3c962c2b..f3c962c2b 100644
--- a/usr/austin/eval/compiler.go
+++ b/src/pkg/exp/eval/compiler.go
diff --git a/usr/austin/eval/eval_test.go b/src/pkg/exp/eval/eval_test.go
index 192a2e782..192a2e782 100644
--- a/usr/austin/eval/eval_test.go
+++ b/src/pkg/exp/eval/eval_test.go
diff --git a/usr/austin/eval/expr.go b/src/pkg/exp/eval/expr.go
index ea4fc082b..ea4fc082b 100644
--- a/usr/austin/eval/expr.go
+++ b/src/pkg/exp/eval/expr.go
diff --git a/usr/austin/eval/expr1.go b/src/pkg/exp/eval/expr1.go
index 7787a2112..7787a2112 100644
--- a/usr/austin/eval/expr1.go
+++ b/src/pkg/exp/eval/expr1.go
diff --git a/usr/austin/eval/expr_test.go b/src/pkg/exp/eval/expr_test.go
index ea11cf69d..ea11cf69d 100644
--- a/usr/austin/eval/expr_test.go
+++ b/src/pkg/exp/eval/expr_test.go
diff --git a/usr/austin/eval/func.go b/src/pkg/exp/eval/func.go
index 3bf52871d..3bf52871d 100644
--- a/usr/austin/eval/func.go
+++ b/src/pkg/exp/eval/func.go
diff --git a/usr/austin/eval/gen.go b/src/pkg/exp/eval/gen.go
index 06939e58c..06939e58c 100644
--- a/usr/austin/eval/gen.go
+++ b/src/pkg/exp/eval/gen.go
diff --git a/usr/austin/eval/main.go b/src/pkg/exp/eval/main.go
index 2a6d94845..2a6d94845 100644
--- a/usr/austin/eval/main.go
+++ b/src/pkg/exp/eval/main.go
diff --git a/usr/austin/eval/scope.go b/src/pkg/exp/eval/scope.go
index 7ee4a8915..7ee4a8915 100644
--- a/usr/austin/eval/scope.go
+++ b/src/pkg/exp/eval/scope.go
diff --git a/usr/austin/eval/stmt.go b/src/pkg/exp/eval/stmt.go
index 9ec6fb83d..9ec6fb83d 100644
--- a/usr/austin/eval/stmt.go
+++ b/src/pkg/exp/eval/stmt.go
diff --git a/usr/austin/eval/stmt_test.go b/src/pkg/exp/eval/stmt_test.go
index e94adfb60..e94adfb60 100644
--- a/usr/austin/eval/stmt_test.go
+++ b/src/pkg/exp/eval/stmt_test.go
diff --git a/usr/austin/eval/test.bash b/src/pkg/exp/eval/test.bash
index 81f4c3dd1..81f4c3dd1 100755
--- a/usr/austin/eval/test.bash
+++ b/src/pkg/exp/eval/test.bash
diff --git a/usr/austin/eval/type.go b/src/pkg/exp/eval/type.go
index b73f92163..b73f92163 100644
--- a/usr/austin/eval/type.go
+++ b/src/pkg/exp/eval/type.go
diff --git a/usr/austin/eval/typec.go b/src/pkg/exp/eval/typec.go
index bdbe98c4c..bdbe98c4c 100644
--- a/usr/austin/eval/typec.go
+++ b/src/pkg/exp/eval/typec.go
diff --git a/usr/austin/eval/util.go b/src/pkg/exp/eval/util.go
index 9cdf23722..9cdf23722 100644
--- a/usr/austin/eval/util.go
+++ b/src/pkg/exp/eval/util.go
diff --git a/usr/austin/eval/value.go b/src/pkg/exp/eval/value.go
index 1a64a6d96..1a64a6d96 100644
--- a/usr/austin/eval/value.go
+++ b/src/pkg/exp/eval/value.go
diff --git a/usr/austin/eval/world.go b/src/pkg/exp/eval/world.go
index 6d547f6e8..a5e4e6092 100644
--- a/usr/austin/eval/world.go
+++ b/src/pkg/exp/eval/world.go
@@ -2,6 +2,9 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// This package is the beginning of an interpreter for Go.
+// It can run simple Go programs but does not implement
+// interface values or packages.
 package eval
 
 import (
diff --git a/usr/austin/ogle/Makefile b/src/pkg/exp/ogle/Makefile
index 9ea9beabe..31bb9df5c 100644
--- a/usr/austin/ogle/Makefile
+++ b/src/pkg/exp/ogle/Makefile
@@ -4,7 +4,7 @@
 
 include $(GOROOT)/src/Make.$(GOARCH)
 
-TARG=ogle
+TARG=exp/ogle
 GOFILES=\
 	abort.go\
 	arch.go\
diff --git a/usr/austin/ogle/abort.go b/src/pkg/exp/ogle/abort.go
index 087c57b5f..087c57b5f 100644
--- a/usr/austin/ogle/abort.go
+++ b/src/pkg/exp/ogle/abort.go
diff --git a/usr/austin/ogle/arch.go b/src/pkg/exp/ogle/arch.go
index 30a2bcf58..30a2bcf58 100644
--- a/usr/austin/ogle/arch.go
+++ b/src/pkg/exp/ogle/arch.go
diff --git a/usr/austin/ogle/cmd.go b/src/pkg/exp/ogle/cmd.go
index 09767e72f..f60621343 100644
--- a/usr/austin/ogle/cmd.go
+++ b/src/pkg/exp/ogle/cmd.go
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
+// Ogle is the beginning of a debugger for Go.
 package ogle
 
 import (
 	"bufio";
 	"debug/elf";
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"fmt";
 	"go/scanner";
 	"go/token";
diff --git a/usr/austin/ogle/event.go b/src/pkg/exp/ogle/event.go
index 9dc7a8445..9dc7a8445 100644
--- a/usr/austin/ogle/event.go
+++ b/src/pkg/exp/ogle/event.go
diff --git a/usr/austin/ogle/frame.go b/src/pkg/exp/ogle/frame.go
index bf2b39134..bf2b39134 100644
--- a/usr/austin/ogle/frame.go
+++ b/src/pkg/exp/ogle/frame.go
diff --git a/usr/austin/ogle/goroutine.go b/src/pkg/exp/ogle/goroutine.go
index de80c604e..4d458c561 100644
--- a/usr/austin/ogle/goroutine.go
+++ b/src/pkg/exp/ogle/goroutine.go
@@ -6,7 +6,7 @@ package ogle
 
 import (
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"fmt";
 	"os";
 )
diff --git a/usr/austin/ogle/main.go b/src/pkg/exp/ogle/main.go
index 7d94d38cc..88265624a 100644
--- a/usr/austin/ogle/main.go
+++ b/src/pkg/exp/ogle/main.go
@@ -4,7 +4,7 @@
 
 package main
 
-import "ogle"
+import "exp/ogle"
 
 func main() {
 	ogle.Main();
diff --git a/usr/austin/ogle/process.go b/src/pkg/exp/ogle/process.go
index 0a3e9b291..984364f23 100644
--- a/usr/austin/ogle/process.go
+++ b/src/pkg/exp/ogle/process.go
@@ -8,7 +8,7 @@ import (
 	"debug/elf";
 	"debug/gosym";
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"fmt";
 	"log";
 	"os";
diff --git a/usr/austin/ogle/rruntime.go b/src/pkg/exp/ogle/rruntime.go
index 03d1c7980..2af636926 100644
--- a/usr/austin/ogle/rruntime.go
+++ b/src/pkg/exp/ogle/rruntime.go
@@ -6,7 +6,7 @@ package ogle
 
 import (
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"reflect";
 )
 
diff --git a/usr/austin/ogle/rtype.go b/src/pkg/exp/ogle/rtype.go
index 26040f6b8..f70b918c0 100644
--- a/usr/austin/ogle/rtype.go
+++ b/src/pkg/exp/ogle/rtype.go
@@ -6,7 +6,7 @@ package ogle
 
 import (
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"fmt";
 	"log";
 )
diff --git a/usr/austin/ogle/rvalue.go b/src/pkg/exp/ogle/rvalue.go
index 47a54a934..9077e238b 100644
--- a/usr/austin/ogle/rvalue.go
+++ b/src/pkg/exp/ogle/rvalue.go
@@ -6,7 +6,7 @@ package ogle
 
 import (
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"fmt";
 )
 
diff --git a/usr/austin/ogle/vars.go b/src/pkg/exp/ogle/vars.go
index ddfdb0fd8..539b5b345 100644
--- a/usr/austin/ogle/vars.go
+++ b/src/pkg/exp/ogle/vars.go
@@ -7,7 +7,7 @@ package ogle
 import (
 	"debug/gosym";
 	"debug/proc";
-	"eval";
+	"exp/eval";
 	"log";
 	"os";
 )
diff --git a/src/run.bash b/src/run.bash
index 07f2774a1..619ba9b7d 100755
--- a/src/run.bash
+++ b/src/run.bash
@@ -26,12 +26,10 @@ maketest() {
 
 maketest \
 	pkg \
-	../usr/austin/eval \
 
 # all of these are subtly different
 # from what maketest does.
 
-
 (xcd pkg/sync;
 make clean;
 time make
@@ -55,7 +53,18 @@ make clean
 ./test.bash
 ) || exit $?
 
-(xcd ../usr/austin/ogle
+(xcd ../usr/r/rpc
+make clean
+time make
+./chanrun
+) || exit $?
+
+(xcd ../usr/dsymonds/iterable
+make clean
+time make test
+) || exit $?
+
+(xcd pkg/exp/ogle
 make clean
 time make ogle
 ) || exit $?