diff --git a/examples/tone-player/main.go b/examples/tone-player/main.go
index 06c2006..9270a9c 100644
--- a/examples/tone-player/main.go
+++ b/examples/tone-player/main.go
@@ -1,18 +1,15 @@
 package main
 
 import "os"
-import "fmt"
-import "github.com/faiface/beep"
+import "github.com/faiface/beep/generators"
 import "github.com/faiface/beep/speaker"
+import "github.com/faiface/beep"
 import "strconv"
 
 func main() {
 f,_ := strconv.Atoi(os.Args[1])
 speaker.Init(beep.SampleRate(48000), 4800)
-s := beep.SinTone(beep.SampleRate(48000), f)
-rb := make([][2]float64,20)
-s.Stream(rb)
-fmt.Println(rb)
+s := generators.SinTone(beep.SampleRate(48000), f)
 speaker.Play(s)
 for {
 
diff --git a/toner.go b/generators/toner.go
similarity index 94%
rename from toner.go
rename to generators/toner.go
index 090efe5..2283990 100644
--- a/toner.go
+++ b/generators/toner.go
@@ -1,9 +1,10 @@
 // tones generator
 
 
-package beep
+package generators
 
 import "math"
+import . "github.com/faiface/beep"
 
 // simple sinusoid tone generator
 type toneStreamer struct {