diff --git a/cmd/dummy/main.go b/cmd/dummy/main.go
new file mode 100644
index 00000000..af2e1fa8
--- /dev/null
+++ b/cmd/dummy/main.go
@@ -0,0 +1,22 @@
+package main
+
+import (
+	. "github.com/tendermint/go-common"
+	"github.com/tendermint/tmsp/example"
+	"github.com/tendermint/tmsp/server"
+)
+
+func main() {
+
+	// Start the listener
+	_, err := server.StartListener("tcp://127.0.0.1:8080", example.NewDummyApplication())
+	if err != nil {
+		Exit(err.Error())
+	}
+
+	// Wait forever
+	TrapSignal(func() {
+		// Cleanup
+	})
+
+}
diff --git a/cmd/cli.go b/cmd/tmsp/cli.go
similarity index 96%
rename from cmd/cli.go
rename to cmd/tmsp/cli.go
index 6ff3109a..1d1359c2 100644
--- a/cmd/cli.go
+++ b/cmd/tmsp/cli.go
@@ -121,6 +121,13 @@ func write(conn net.Conn, req types.Request) (types.Response, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// flush!
+	wire.WriteBinary(types.RequestFlush{}, conn, &n, &err)
+	if err != nil {
+		return nil, err
+	}
+
 	var res types.Response
 	wire.ReadBinaryPtr(&res, conn, 0, &n, &err)
 	return res, err
diff --git a/example/main.go b/example/dummy.go
similarity index 79%
rename from example/main.go
rename to example/dummy.go
index 828ccb1a..b3e9ae43 100644
--- a/example/main.go
+++ b/example/dummy.go
@@ -1,30 +1,12 @@
-package main
+package example
 
 import (
 	. "github.com/tendermint/go-common"
 	"github.com/tendermint/go-merkle"
 	"github.com/tendermint/go-wire"
-	"github.com/tendermint/tmsp/server"
 	"github.com/tendermint/tmsp/types"
 )
 
-func main() {
-
-	// Start the listener
-	_, err := server.StartListener("tcp://127.0.0.1:8080", NewDummyApplication())
-	if err != nil {
-		Exit(err.Error())
-	}
-
-	// Wait forever
-	TrapSignal(func() {
-		// Cleanup
-	})
-
-}
-
-//--------------------------------------------------------------------------------
-
 type DummyApplication struct {
 	state           merkle.Tree
 	lastCommitState merkle.Tree
diff --git a/example/main_test.go b/example/dummy_test.go
similarity index 98%
rename from example/main_test.go
rename to example/dummy_test.go
index a5475240..d0a40d87 100644
--- a/example/main_test.go
+++ b/example/dummy_test.go
@@ -1,4 +1,4 @@
-package main
+package example
 
 import (
 	// "fmt"