Moving runewidth, segdisp and testdraw to internal.

align/align.go

@@ -20,7 +20,7 @@ import (
 	"image"
 	"strings"
 
-	"github.com/mum4k/termdash/cell/runewidth"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // Horizontal indicates the type of horizontal alignment.

cell/cell.go

@@ -23,8 +23,8 @@ import (
 	"fmt"
 	"image"
 
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/area"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // Option is used to provide options for cells on a 2-D terminal.

container/container.go

@@ -31,7 +31,7 @@ import (
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/event"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // Container wraps either sub containers or widgets and positions them on the

container/container_test.go

@@ -24,15 +24,15 @@ import (
 	"github.com/mum4k/termdash/align"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/event"
 	"github.com/mum4k/termdash/internal/event/testevent"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/barchart"
 	"github.com/mum4k/termdash/widgets/fakewidget"
 )

container/draw_test.go

@@ -21,9 +21,9 @@ import (
 	"github.com/mum4k/termdash/align"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
 	"github.com/mum4k/termdash/widgets/fakewidget"
 )

container/focus.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/mum4k/termdash/internal/mouse"
 	"github.com/mum4k/termdash/internal/mouse/button"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // pointCont finds the top-most (on the screen) container whose area contains

container/focus_test.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/internal/event/testevent"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // pointCase is a test case for the pointCont function.

draw/line_style.go

@@ -17,7 +17,7 @@ package draw
 import (
 	"fmt"
 
-	"github.com/mum4k/termdash/cell/runewidth"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // line_style.go contains the Unicode characters used for drawing lines of

draw/text.go

@@ -22,8 +22,8 @@ import (
 	"image"
 
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/canvas"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // OverrunMode represents

internal/canvas/braille/braille.go

@@ -47,7 +47,7 @@ import (
 
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/internal/canvas"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 const (

internal/canvas/canvas.go

@@ -20,9 +20,9 @@ import (
 	"image"
 
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/area"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/internal/runewidth"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // Canvas is where a widget draws its output for display on the terminal.

internal/event/event.go

@@ -22,7 +22,7 @@ import (
 	"sync"
 
 	"github.com/mum4k/termdash/internal/event/eventqueue"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // Callback is a function provided by an event subscriber.

internal/event/event_test.go

@@ -25,7 +25,7 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/internal/event/testevent"
 	"github.com/mum4k/termdash/internal/keyboard"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // receiverMode defines how the receiver behaves.

internal/event/eventqueue/eventqueue.go

@@ -21,7 +21,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // node is a single data item on the queue.

internal/event/eventqueue/eventqueue_test.go

@@ -20,7 +20,7 @@ import (
 	"time"
 
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 func TestQueue(t *testing.T) {

internal/faketerm/faketerm.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/internal/event/eventqueue"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // Option is used to provide options.

internal/mouse/button/button.go

@@ -19,7 +19,7 @@ import (
 	"image"
 
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // State represents the state of the mouse button.

internal/mouse/button/button_test.go

@@ -20,7 +20,7 @@ import (
 	"testing"
 
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // eventTestCase is one mouse event and the output expectation.

internal/segdisp/segment/segment_test.go

@@ -21,11 +21,11 @@ import (
 
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas/braille"
 	"github.com/mum4k/termdash/internal/canvas/braille/testbraille"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 )
 
 func TestHV(t *testing.T) {

internal/segdisp/segment/testsegment/testsegment.go

@@ -19,8 +19,8 @@ import (
 	"fmt"
 	"image"
 
-	"github.com/mum4k/termdash/draw/segdisp/segment"
 	"github.com/mum4k/termdash/internal/canvas/braille"
+	"github.com/mum4k/termdash/internal/segdisp/segment"
 )
 
 // MustHV draws the segment or panics.

internal/segdisp/sixteen/attributes.go

@@ -22,8 +22,8 @@ import (
 	"image"
 	"math"
 
-	"github.com/mum4k/termdash/draw/segdisp/segment"
 	"github.com/mum4k/termdash/internal/numbers"
+	"github.com/mum4k/termdash/internal/segdisp/segment"
 )
 
 // hvSegType maps horizontal and vertical segments to their type.

internal/segdisp/sixteen/sixteen.go

@@ -46,10 +46,10 @@ import (
 	"math"
 
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/draw/segdisp/segment"
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/braille"
+	"github.com/mum4k/termdash/internal/segdisp/segment"
 )
 
 // Segment represents a single segment in the display.

internal/segdisp/sixteen/sixteen_test.go

@@ -21,13 +21,13 @@ import (
 
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/draw/segdisp/segment"
-	"github.com/mum4k/termdash/draw/segdisp/segment/testsegment"
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/braille/testbraille"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/segdisp/segment"
+	"github.com/mum4k/termdash/internal/segdisp/segment/testsegment"
 )
 
 func TestDraw(t *testing.T) {

internal/segdisp/sixteen/testsixteen/testsixteen.go

@@ -18,8 +18,8 @@ package testsixteen
 import (
 	"fmt"
 
-	"github.com/mum4k/termdash/draw/segdisp/sixteen"
 	"github.com/mum4k/termdash/internal/canvas"
+	"github.com/mum4k/termdash/internal/segdisp/sixteen"
 )
 
 // MustSetCharacter sets the character on the display or panics.

internal/widgetapi/widgetapi.go

@@ -19,7 +19,7 @@ import (
 	"image"
 
 	"github.com/mum4k/termdash/internal/canvas"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // KeyScope indicates the scope at which the widget wants to receive keyboard

termdash.go

@@ -32,7 +32,7 @@ import (
 
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/internal/event"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // DefaultRedrawInterval is the default for the RedrawInterval option.

termdash_test.go

@@ -33,7 +33,7 @@ import (
 	"github.com/mum4k/termdash/internal/mouse"
 	"github.com/mum4k/termdash/internal/widgetapi"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/barchart"
 	"github.com/mum4k/termdash/widgets/fakewidget"
 	"github.com/mum4k/termdash/widgets/gauge"

termdashdemo/termdashdemo.go

@@ -30,7 +30,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/barchart"
 	"github.com/mum4k/termdash/widgets/button"
 	"github.com/mum4k/termdash/widgets/donut"

terminal/termbox/color_mode.go

@@ -17,7 +17,7 @@ package termbox
 import (
 	"fmt"
 
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	tbx "github.com/nsf/termbox-go"
 )
 

terminal/termbox/event.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	tbx "github.com/nsf/termbox-go"
 )
 

terminal/termbox/event_test.go

@@ -23,7 +23,7 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 
 	tbx "github.com/nsf/termbox-go"
 )

terminal/termbox/termbox.go

@@ -21,7 +21,7 @@ import (
 
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/internal/event/eventqueue"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	tbx "github.com/nsf/termbox-go"
 )
 

terminal/termbox/termbox_test.go

@@ -18,7 +18,7 @@ import (
 	"testing"
 
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 func TestNewTerminal(t *testing.T) {

widgets/barchart/barchart.go

@@ -28,7 +28,7 @@ import (
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // BarChart displays multiple bars showing relative ratios of values.

widgets/barchart/barchart_test.go

@@ -21,10 +21,10 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
 )
 

widgets/barchart/barchartdemo/barchartdemo.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/barchart"
 )
 

widgets/button/button.go

@@ -29,7 +29,7 @@ import (
 	"github.com/mum4k/termdash/internal/mouse"
 	"github.com/mum4k/termdash/internal/mouse/button"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // CallbackFn is the function called when the button is pressed.

widgets/button/button_test.go

@@ -24,14 +24,14 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // callbackTracker tracks whether callback was called.

widgets/button/buttondemo/buttondemo.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/button"
 	"github.com/mum4k/termdash/widgets/segmentdisplay"
 )

widgets/button/options.go

@@ -21,8 +21,8 @@ import (
 	"time"
 
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/keyboard"
+	"github.com/mum4k/termdash/internal/runewidth"
 	"github.com/mum4k/termdash/internal/widgetapi"
 )
 

widgets/donut/donut.go

@@ -23,13 +23,13 @@ import (
 	"sync"
 
 	"github.com/mum4k/termdash/align"
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/braille"
 	"github.com/mum4k/termdash/internal/numbers"
+	"github.com/mum4k/termdash/internal/runewidth"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // progressType indicates how was the current progress provided by the caller.

widgets/donut/donut_test.go

@@ -21,13 +21,13 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/braille/testbraille"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 func TestDonut(t *testing.T) {

widgets/donut/donutdemo/donutdemo.go

@@ -25,7 +25,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/donut"
 )
 

widgets/fakewidget/fakewidget.go

@@ -27,7 +27,7 @@ import (
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // outputLines are the number of lines written by this plugin.

widgets/fakewidget/fakewidget_test.go

@@ -19,14 +19,14 @@ import (
 	"testing"
 
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // keyEvents are keyboard events to send to the widget.

widgets/gauge/gauge.go

@@ -24,12 +24,12 @@ import (
 
 	"github.com/mum4k/termdash/align"
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas"
+	"github.com/mum4k/termdash/internal/runewidth"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // progressType indicates how was the current progress provided by the caller.

widgets/gauge/gauge_test.go

@@ -22,10 +22,10 @@ import (
 	"github.com/mum4k/termdash/align"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
 )
 

widgets/gauge/gaugedemo/gaugedemo.go

@@ -25,7 +25,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/gauge"
 )
 

widgets/linechart/internal/zoom/zoom.go

@@ -23,7 +23,7 @@ import (
 	"github.com/mum4k/termdash/internal/mouse"
 	"github.com/mum4k/termdash/internal/mouse/button"
 	"github.com/mum4k/termdash/internal/numbers"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/linechart/internal/axes"
 )
 

widgets/linechart/internal/zoom/zoom_test.go

@@ -20,7 +20,7 @@ import (
 
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/internal/mouse"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/linechart/internal/axes"
 )
 

widgets/linechart/linechart.go

@@ -29,7 +29,7 @@ import (
 	"github.com/mum4k/termdash/internal/canvas/braille"
 	"github.com/mum4k/termdash/internal/numbers"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/linechart/internal/axes"
 	"github.com/mum4k/termdash/widgets/linechart/internal/zoom"
 )

widgets/linechart/linechart_test.go

@@ -22,14 +22,14 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/braille/testbraille"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/mouse"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 func TestLineChartDraws(t *testing.T) {

widgets/linechart/linechartdemo/linechartdemo.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/linechart"
 )
 

widgets/segmentdisplay/segment_area.go

@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"image"
 
-	"github.com/mum4k/termdash/draw/segdisp/sixteen"
+	"github.com/mum4k/termdash/internal/segdisp/sixteen"
 )
 
 // segArea contains information about the area that will contain the segments.

widgets/segmentdisplay/segmentdisplay.go

@@ -24,11 +24,11 @@ import (
 	"sync"
 
 	"github.com/mum4k/termdash/align"
-	"github.com/mum4k/termdash/draw/segdisp/sixteen"
 	"github.com/mum4k/termdash/internal/attrrange"
 	"github.com/mum4k/termdash/internal/canvas"
+	"github.com/mum4k/termdash/internal/segdisp/sixteen"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // SegmentDisplay displays ASCII content by simulating a segment display.

widgets/segmentdisplay/segmentdisplay_test.go

@@ -21,13 +21,13 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/align"
 	"github.com/mum4k/termdash/cell"
-	"github.com/mum4k/termdash/draw/segdisp/sixteen"
-	"github.com/mum4k/termdash/draw/segdisp/sixteen/testsixteen"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/segdisp/sixteen"
+	"github.com/mum4k/termdash/internal/segdisp/sixteen/testsixteen"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // mustDrawChar draws the provided character in the area of the canvas or panics.

widgets/segmentdisplay/segmentdisplaydemo/segmentdisplaydemo.go

@@ -25,7 +25,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/segmentdisplay"
 )
 

widgets/sparkline/sparkline.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/internal/area"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // SparkLine draws a graph showing a series of values as vertical bars.

widgets/sparkline/sparkline_test.go

@@ -21,10 +21,10 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
 )
 

widgets/sparkline/sparklinedemo/sparklinedemo.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/sparkline"
 )
 

widgets/sparkline/sparks.go

@@ -20,8 +20,8 @@ package sparkline
 import (
 	"fmt"
 
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/numbers"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // sparks are the characters used to draw the SparkLine.

widgets/text/line_scanner.go

@@ -20,7 +20,7 @@ import (
 	"strings"
 	"text/scanner"
 
-	"github.com/mum4k/termdash/cell/runewidth"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // wrapNeeded returns true if wrapping is needed for the rune at the horizontal

widgets/text/line_trim.go

@@ -18,8 +18,8 @@ import (
 	"fmt"
 	"image"
 
-	"github.com/mum4k/termdash/cell/runewidth"
 	"github.com/mum4k/termdash/internal/canvas"
+	"github.com/mum4k/termdash/internal/runewidth"
 )
 
 // line_trim.go contains code that trims lines that are too long.

widgets/text/line_trim_test.go

@@ -19,10 +19,10 @@ import (
 	"testing"
 
 	"github.com/kylelemons/godebug/pretty"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
+	"github.com/mum4k/termdash/internal/testdraw"
 )
 
 func TestLineTrim(t *testing.T) {

widgets/text/text.go

@@ -26,7 +26,7 @@ import (
 	"github.com/mum4k/termdash/internal/attrrange"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 // Text displays a block of text.

widgets/text/text_test.go

@@ -21,14 +21,14 @@ import (
 	"github.com/kylelemons/godebug/pretty"
 	"github.com/mum4k/termdash/cell"
 	"github.com/mum4k/termdash/draw"
-	"github.com/mum4k/termdash/draw/testdraw"
 	"github.com/mum4k/termdash/internal/canvas"
 	"github.com/mum4k/termdash/internal/canvas/testcanvas"
 	"github.com/mum4k/termdash/internal/faketerm"
 	"github.com/mum4k/termdash/internal/keyboard"
 	"github.com/mum4k/termdash/internal/mouse"
+	"github.com/mum4k/termdash/internal/testdraw"
 	"github.com/mum4k/termdash/internal/widgetapi"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 )
 
 func TestTextDraws(t *testing.T) {

widgets/text/textdemo/textdemo.go

@@ -27,7 +27,7 @@ import (
 	"github.com/mum4k/termdash/container"
 	"github.com/mum4k/termdash/draw"
 	"github.com/mum4k/termdash/terminal/termbox"
-	"github.com/mum4k/termdash/terminalapi"
+	"github.com/mum4k/termdash/terminal/terminalapi"
 	"github.com/mum4k/termdash/widgets/text"
 )