diff --git a/d2common/d2DebugUtil/d2DebugPrint.go b/d2common/d2debugutil/debug_print.go
similarity index 95%
rename from d2common/d2DebugUtil/d2DebugPrint.go
rename to d2common/d2debugutil/debug_print.go
index a2a3a35c..0c8f4cf1 100644
--- a/d2common/d2DebugUtil/d2DebugPrint.go
+++ b/d2common/d2debugutil/debug_print.go
@@ -1,9 +1,9 @@
-package d2DebugUtil
+package d2debugutil
 
 import (
 	"image"
 
-	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2DebugUtil/internal/assets"
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2debugutil/internal/assets"
 	"github.com/hajimehoshi/ebiten"
 )
 
diff --git a/d2common/d2DebugUtil/internal/assets/d2DebugAssets.go b/d2common/d2debugutil/internal/assets/assets.go
similarity index 100%
rename from d2common/d2DebugUtil/internal/assets/d2DebugAssets.go
rename to d2common/d2debugutil/internal/assets/assets.go
diff --git a/d2common/d2DebugUtil/internal/assets/noto_sans_mono_8x16.bmp b/d2common/d2debugutil/internal/assets/noto_sans_mono_8x16.bmp
similarity index 100%
rename from d2common/d2DebugUtil/internal/assets/noto_sans_mono_8x16.bmp
rename to d2common/d2debugutil/internal/assets/noto_sans_mono_8x16.bmp
diff --git a/d2common/d2DebugUtil/internal/assets/zipbmp.go b/d2common/d2debugutil/internal/assets/zipbmp.go
similarity index 100%
rename from d2common/d2DebugUtil/internal/assets/zipbmp.go
rename to d2common/d2debugutil/internal/assets/zipbmp.go
diff --git a/d2core/d2render/ebiten/ebiten_surface.go b/d2core/d2render/ebiten/ebiten_surface.go
index 38cc32b9..bdbc5368 100644
--- a/d2core/d2render/ebiten/ebiten_surface.go
+++ b/d2core/d2render/ebiten/ebiten_surface.go
@@ -9,7 +9,7 @@ import (
 	"github.com/hajimehoshi/ebiten"
 	"github.com/hajimehoshi/ebiten/ebitenutil"
 
-	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2DebugUtil"
+	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2debugutil"
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2enum"
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2interface"
 )
@@ -174,7 +174,7 @@ func (s *ebitenSurface) RenderSection(sfc d2interface.Surface, bound image.Recta
 
 // DrawTextf renders the string to the surface with the given format string and a set of parameters
 func (s *ebitenSurface) DrawTextf(format string, params ...interface{}) {
-	d2DebugUtil.D2DebugPrintAt(s.image, fmt.Sprintf(format, params...), s.stateCurrent.x, s.stateCurrent.y)
+	d2debugutil.D2DebugPrintAt(s.image, fmt.Sprintf(format, params...), s.stateCurrent.x, s.stateCurrent.y)
 }
 
 // DrawLine draws a line
diff --git a/go.mod b/go.mod
index d6ca4d4f..96911b16 100644
--- a/go.mod
+++ b/go.mod
@@ -11,6 +11,7 @@ require (
 	github.com/pkg/profile v1.5.0
 	github.com/robertkrimen/otto v0.0.0-20191219234010-c382bd3c16ff
 	github.com/satori/go.uuid v1.2.0
+	github.com/stretchr/testify v1.4.0
 	golang.org/x/image v0.0.0-20200618115811-c13761719519
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/sourcemap.v1 v1.0.5 // indirect