diff --git a/README b/README
index f37e9ba14..14daa6d51 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ This is the PSGI branch of WebGUI8
 
 Currently, the best performance is achieved via:
 
- plackup eg/basic.psgi -E none -s Starman --workers 10
+ plackup -E none -s Starman --workers 10
  
 You can benchmark your server via:
 
diff --git a/TODO b/TODO
index 3ee21a684..4981c66fe 100644
--- a/TODO
+++ b/TODO
@@ -1,10 +1,10 @@
 TODO
 * Deprecate WebGUI::Session::HTTP - replace with WebGUI::Request/Response
 * Turn logger into $self->request->env->{'psgi.errors'}->print(join '', @stuff);
-* Remove WebGUI::Session::Output
 
 DONE
 * $session->request is now a Plack::Request object
 * serverObject gone from WebGUI::Session::open()
 * WebGUI::authen API changed
-* urlHandler API changed - no longer gets server, config
\ No newline at end of file
+* urlHandler API changed - no longer gets server, config
+* Streaming response body
\ No newline at end of file
diff --git a/eg/basic.psgi b/app.psgi
similarity index 100%
rename from eg/basic.psgi
rename to app.psgi
diff --git a/apache.conf b/eg/apache.conf
similarity index 100%
rename from apache.conf
rename to eg/apache.conf
diff --git a/etc/dev.localhost.localdomain.cgi b/eg/dev.localhost.localdomain.cgi
similarity index 100%
rename from etc/dev.localhost.localdomain.cgi
rename to eg/dev.localhost.localdomain.cgi
diff --git a/etc/dev.localhost.localdomain.fcgi b/eg/dev.localhost.localdomain.fcgi
similarity index 100%
rename from etc/dev.localhost.localdomain.fcgi
rename to eg/dev.localhost.localdomain.fcgi
diff --git a/etc/dev.localhost.localdomain.perlbal b/eg/dev.localhost.localdomain.perlbal
similarity index 100%
rename from etc/dev.localhost.localdomain.perlbal
rename to eg/dev.localhost.localdomain.perlbal
diff --git a/lib/WebGUI.pm b/lib/WebGUI.pm
index fe116d57b..344f88aa0 100644
--- a/lib/WebGUI.pm
+++ b/lib/WebGUI.pm
@@ -224,7 +224,7 @@ sub handle {
             
             # "chunked" or "empty" means it took care of its own output needs
             if (defined $output && ( $output eq "chunked" || $output eq "empty" )) {
-#                warn "chunked and empty no longer stream, use session->response->stream() instead";
+                warn "chunked and empty no longer stream, use session->response->stream() instead";
                 if ($session->errorHandler->canShowDebug()) {
                     $session->output->print($session->errorHandler->showDebug(),1);
                 }
diff --git a/lib/WebGUI/Session/Request.pm b/lib/WebGUI/Session/Request.pm
deleted file mode 100644
index 3c1cc87a3..000000000
--- a/lib/WebGUI/Session/Request.pm
+++ /dev/null
@@ -1,40 +0,0 @@
-package WebGUI::Session::Request;
-
-use strict;
-use warnings;
-
-=head1 DESCRIPTION
-
-This class wraps calls to $session->request and logs them as a cute way of seeing
-what Apache2::* methods webgui is calling
-
-=cut
-
-sub new {
-    my $class = shift;
-    bless { @_ }, $class;
-}
-
-our $AUTOLOAD;
-sub AUTOLOAD {
-    my $self = shift;
-    my $what = $AUTOLOAD;
-    $what =~ s/.*:://;
-    my $r = $self->{r};
-    my $session = $self->{session};
-
-    if ( !$r ) {
-        $session->log->error("!!request->$what(@_) but r not defined");
-        return;
-    }
-
-    if ( $what eq 'print' ) {
-        $session->log->error("!!request->$what(print--chomped)");
-    }
-    else {
-        $session->log->error("!!request->$what(@_)");
-    }
-    return $r->$what(@_);
-}
-
-1;