Reorganize the package layout

Move all Doodle source code into the src/ subpackage and move the
publicly shareable stuff into lib/, for example lib/ui and lib/render.

This cleans up the git root and helps make the Doodle UI library more
easily publishable as a separate open source project. Currently both
lib/ui and lib/render import one or two things from doodle/src that need
to be broken apart.

cmd/doodad/commands/convert.go

@@ -14,7 +14,7 @@ import (
 	"git.kirsle.net/apps/doodle"
 	"git.kirsle.net/apps/doodle/doodads"
 	"git.kirsle.net/apps/doodle/level"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/urfave/cli"
 	"golang.org/x/image/bmp"
 )

cmd/doodle/main.go

@@ -4,9 +4,9 @@ import (
 	"flag"
 	"runtime"
 
-	"git.kirsle.net/apps/doodle"
+	"git.kirsle.net/apps/doodle/lib/render/sdl"
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/src"
-	"git.kirsle.net/apps/doodle/render/sdl"
+	"git.kirsle.net/apps/doodle/src/balance"
 
 	_ "image/png"
 )

lib/render/interface.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/src/events"
 )
 
 // Engine is the interface for the rendering engine, keeping SDL-specific stuff

lib/render/point_test.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestPointInside(t *testing.T) {

lib/render/rect_test.go

@@ -4,7 +4,7 @@ import (
 	"strconv"
 	"testing"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestIntersection(t *testing.T) {

lib/render/sdl/canvas.go

@@ -2,7 +2,7 @@
 package sdl
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/events.go

@@ -3,7 +3,7 @@ package sdl
 import (
 	"errors"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/src/events" // XXX: break it up
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/sdl.go

@@ -4,8 +4,8 @@ package sdl
 import (
 	"time"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
 	"github.com/veandco/go-sdl2/sdl"
 	"github.com/veandco/go-sdl2/ttf"
 )

lib/render/sdl/text.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
 	"github.com/veandco/go-sdl2/sdl"
 	"github.com/veandco/go-sdl2/ttf"
 )

lib/render/sdl/texture.go

@@ -3,7 +3,7 @@ package sdl
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/render/sdl/utils.go

@@ -1,7 +1,7 @@
 package sdl
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"github.com/veandco/go-sdl2/sdl"
 )
 

lib/ui/README.md

@@ -0,0 +1,8 @@
+# Doodle UI
+
+This is a UI toolkit designed for Doodle but made generally available.
+
+## Ties to Break
+
+lib/ui and lib/render both currently import doodle/src/events as their only
+dependency on Doodle. This module should be moved to a better common location.

lib/ui/button.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // Button is a clickable button.

lib/ui/check_button.go

@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // CheckButton implements a checkbox and radiobox widget. It's based on a

lib/ui/checkbox.go

@@ -1,6 +1,6 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // Checkbox combines a CheckButton with a widget like a Label.
 type Checkbox struct {

lib/ui/frame.go

@@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Frame is a widget that contains other widgets.

lib/ui/frame_pack.go

@@ -1,6 +1,8 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import (
+	"git.kirsle.net/apps/doodle/lib/render"
+)
 
 // Pack provides configuration fields for Frame.Pack().
 type Pack struct {

lib/ui/functions.go

@@ -1,6 +1,6 @@
 package ui
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // AbsolutePosition computes a widget's absolute X,Y position on the
 // window on screen by crawling its parent widget tree.

lib/ui/image.go

@@ -5,7 +5,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // ImageType for supported image formats.

lib/ui/label.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // DefaultFont is the default font settings used for a Label.

lib/ui/supervisor.go

@@ -4,8 +4,8 @@ import (
 	"errors"
 	"sync"
 
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
 )
 
 // Event is a named event that the supervisor will send.

lib/ui/theme/theme.go

@@ -1,6 +1,6 @@
 package theme
 
-import "git.kirsle.net/apps/doodle/render"
+import "git.kirsle.net/apps/doodle/lib/render"
 
 // Color schemes.
 var (

lib/ui/widget.go

@@ -1,8 +1,8 @@
 package ui
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui/theme"
+	"git.kirsle.net/apps/doodle/lib/ui/theme"
 )
 
 // BorderStyle options for widget.SetBorderStyle()

lib/ui/window.go

@@ -3,7 +3,7 @@ package ui
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Window is a frame with a title bar.

pkg/wallpaper/texture.go

@@ -8,7 +8,7 @@ import (
 	"os"
 
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"golang.org/x/image/bmp"
 )
 

pkg/wallpaper/wallpaper.go

@@ -7,7 +7,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Wallpaper is a repeatable background image to go behind levels.

src/balance/debug.go

@@ -5,7 +5,7 @@ import (
 	"strconv"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Debug related variables that can toggle on or off certain features and

src/balance/shell.go

@@ -1,7 +1,7 @@
 package balance
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Shell related variables.

src/balance/theme.go

@@ -1,8 +1,8 @@
 package balance
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/lib/ui"
 )
 
 // Theme and appearance variables.

src/commands.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/enum"
+	"git.kirsle.net/apps/doodle/src/enum"
 )
 
 // Command is a parsed shell command.

src/doodads/actor.go

@@ -1,8 +1,8 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // Actor is a reusable run-time drawing component used in Doodle. Actors are an

src/doodads/collision.go

@@ -1,8 +1,8 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // Collide describes how a collision occurred.

src/doodads/doodad.go

@@ -1,9 +1,9 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // Doodad is a reusable component for Levels that have scripts and graphics.

src/doodads/drawing.go

@@ -1,7 +1,7 @@
 package doodads
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	uuid "github.com/satori/go.uuid"
 )
 

src/doodads/dummy/dummy.go

@@ -1,7 +1,7 @@
 // Package dummy implements a dummy doodads.Drawing.
 package dummy
 
-import "git.kirsle.net/apps/doodle/doodads"
+import "git.kirsle.net/apps/doodle/src/doodads"
 
 // Drawing is a dummy doodads.Drawing that has no data.
 type Drawing struct {

src/doodads/dummy/player.go

@@ -1,7 +1,7 @@
 // Package dummy implements a dummy doodads.Drawing.
 package dummy
 
-import "git.kirsle.net/apps/doodle/doodads"
+import "git.kirsle.net/apps/doodle/src/doodads"
 
 // NewPlayer creates a dummy player object.
 func NewPlayer() *Drawing {

src/doodle.go

@@ -5,11 +5,11 @@ import (
 	"strings"
 	"time"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/enum"
-	"git.kirsle.net/apps/doodle/events"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
+	"git.kirsle.net/apps/doodle/src/enum"
+	"git.kirsle.net/apps/doodle/src/events"
 	"github.com/kirsle/golog"
 )
 

src/draw/line.go

@@ -3,7 +3,7 @@ package draw
 import (
 	"math"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Line is a generator that returns the X,Y coordinates to draw a line.

src/draw/line_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"git.kirsle.net/apps/doodle/draw"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestLine(t *testing.T) {

src/editor_scene.go

@@ -7,12 +7,12 @@ import (
 	"os"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/enum"
-	"git.kirsle.net/apps/doodle/events"
-	"git.kirsle.net/apps/doodle/level"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/doodads"
+	"git.kirsle.net/apps/doodle/src/enum"
+	"git.kirsle.net/apps/doodle/src/events"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // EditorScene manages the "Edit Level" game mode.

src/editor_scene_debug.go

@@ -1,6 +1,6 @@
 package doodle
 
-import "git.kirsle.net/apps/doodle/uix"
+import "git.kirsle.net/apps/doodle/src/uix"
 
 // TODO: build flags to not include this in production builds.
 // This adds accessors for private variables from the dev console.

src/editor_ui.go

@@ -5,15 +5,15 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/enum"
-	"git.kirsle.net/apps/doodle/events"
-	"git.kirsle.net/apps/doodle/level"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/doodads"
-	"git.kirsle.net/apps/doodle/uix"
+	"git.kirsle.net/apps/doodle/src/enum"
+	"git.kirsle.net/apps/doodle/src/events"
+	"git.kirsle.net/apps/doodle/src/level"
+	"git.kirsle.net/apps/doodle/src/uix"
 )
 
 // Width of the panel frame.

src/editor_ui_doodad.go

@@ -7,12 +7,12 @@ package doodle
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/doodads"
-	"git.kirsle.net/apps/doodle/uix"
+	"git.kirsle.net/apps/doodle/src/uix"
 )
 
 // DraggableActor is a Doodad being dragged from the Doodad palette.

src/editor_ui_palette.go

@@ -1,9 +1,9 @@
 package doodle
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/balance"
 )
 
 // setupPaletteFrame configures the Color Palette tab for Edit Mode.

src/fps.go

@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/doodads"
 )
 
 // Frames to cache for FPS calculation.

src/guitest_scene.go

@@ -3,10 +3,10 @@ package doodle
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/lib/ui"
 )
 
 // GUITestScene implements the main menu of Doodle.

src/level/actors.go

@@ -1,7 +1,7 @@
 package level
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 	uuid "github.com/satori/go.uuid"
 )
 

src/level/chunk.go

@@ -7,9 +7,9 @@ import (
 	"math"
 	"os"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
 	"github.com/satori/go.uuid"
 	"golang.org/x/image/bmp"
 )

src/level/chunk_map.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // MapAccessor implements a chunk accessor by using a map of points to their

src/level/chunk_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"git.kirsle.net/apps/doodle/level"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Test the high level Chunker.

src/level/chunker.go

@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"math"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Chunker is the data structure that manages the chunks of a level, and

src/level/chunker_test.go

@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"git.kirsle.net/apps/doodle/level"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 func TestWorldSize(t *testing.T) {

src/level/palette.go

@@ -1,7 +1,7 @@
 package level
 
 import (
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // DefaultPalette returns a sensible default palette.

src/level/swatch.go

@@ -3,7 +3,7 @@ package level
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/render"
 )
 
 // Swatch holds details about a single value in the palette.

src/level/types.go

@@ -4,8 +4,8 @@ import (
 	"encoding/json"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
 )
 
 // Useful variables.

src/main_scene.go

@@ -1,10 +1,10 @@
 package doodle
 
 import (
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/lib/ui"
 )
 
 // MainScene implements the main menu of Doodle.

src/play_scene.go

@@ -4,13 +4,13 @@ import (
 	"fmt"
 	"math"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/doodads/dummy"
+	"git.kirsle.net/apps/doodle/src/doodads"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/src/doodads/dummy"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/src/events"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
-	"git.kirsle.net/apps/doodle/uix"
+	"git.kirsle.net/apps/doodle/src/uix"
 )
 
 // PlayScene manages the "Edit Level" game mode.

src/scene.go

@@ -1,6 +1,8 @@
 package doodle
 
-import "git.kirsle.net/apps/doodle/events"
+import (
+	"git.kirsle.net/apps/doodle/src/events"
+)
 
 // Scene is an abstraction for a game mode in Doodle. The app points to one
 // scene at a time and that scene has control over the main loop, and its own

src/shell.go

@@ -5,10 +5,10 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/events"
 	"github.com/robertkrimen/otto"
 )
 

src/uix/actor.go

@@ -1,9 +1,9 @@
 package uix
 
 import (
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/src/doodads"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
 	uuid "github.com/satori/go.uuid"
 )
 

src/uix/canvas.go

@@ -5,13 +5,13 @@ import (
 	"os"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/events"
-	"git.kirsle.net/apps/doodle/level"
 	"git.kirsle.net/apps/doodle/pkg/wallpaper"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/doodads"
+	"git.kirsle.net/apps/doodle/src/events"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // Canvas is a custom ui.Widget that manages a single drawing.

src/uix/canvas_actors.go

@@ -3,10 +3,10 @@ package uix
 import (
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/doodads"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/level"
 	"git.kirsle.net/apps/doodle/pkg/userdir"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/doodads"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // InstallActors adds external Actors to the canvas to be superimposed on top

src/uix/canvas_editable.go

@@ -1,10 +1,10 @@
 package uix
 
 import (
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // loopEditable handles the Loop() part for editable canvases.

src/uix/canvas_present.go

@@ -4,9 +4,9 @@ import (
 	"fmt"
 	"strings"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/balance"
 )
 
 // Present the canvas.

src/uix/canvas_scrolling.go

@@ -4,11 +4,11 @@ import (
 	"errors"
 	"fmt"
 
-	"git.kirsle.net/apps/doodle/balance"
+	"git.kirsle.net/apps/doodle/lib/render"
-	"git.kirsle.net/apps/doodle/events"
+	"git.kirsle.net/apps/doodle/lib/ui"
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/src/balance"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/events"
-	"git.kirsle.net/apps/doodle/ui"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 /*

src/uix/canvas_wallpaper.go

@@ -1,9 +1,9 @@
 package uix
 
 import (
-	"git.kirsle.net/apps/doodle/level"
+	"git.kirsle.net/apps/doodle/lib/render"
 	"git.kirsle.net/apps/doodle/pkg/wallpaper"
-	"git.kirsle.net/apps/doodle/render"
+	"git.kirsle.net/apps/doodle/src/level"
 )
 
 // Wallpaper configures the wallpaper in a Canvas.