diff --git a/wtf_tests/bargraph/bargraph_test.go b/wtf/bargraph_test.go
similarity index 92%
rename from wtf_tests/bargraph/bargraph_test.go
rename to wtf/bargraph_test.go
index eaad50af..6801c286 100644
--- a/wtf_tests/bargraph/bargraph_test.go
+++ b/wtf/bargraph_test.go
@@ -1,10 +1,9 @@
-package bargraph_test
+package wtf
 
 import (
 	"testing"
 
 	. "github.com/stretchr/testify/assert"
-	. "github.com/wtfutil/wtf/wtf"
 )
 
 // MakeData - Create sample data
diff --git a/wtf_tests/colors_test.go b/wtf/colors_test.go
similarity index 84%
rename from wtf_tests/colors_test.go
rename to wtf/colors_test.go
index baec66ac..595bee61 100644
--- a/wtf_tests/colors_test.go
+++ b/wtf/colors_test.go
@@ -1,10 +1,9 @@
-package wtf_tests
+package wtf
 
 import (
 	"testing"
 
 	. "github.com/stretchr/testify/assert"
-	. "github.com/wtfutil/wtf/wtf"
 )
 
 func Test_ASCIItoTviewColors(t *testing.T) {
diff --git a/wtf_tests/datetime_test.go b/wtf/datetime_test.go
similarity index 89%
rename from wtf_tests/datetime_test.go
rename to wtf/datetime_test.go
index 6106e1b1..cfa80380 100644
--- a/wtf_tests/datetime_test.go
+++ b/wtf/datetime_test.go
@@ -1,11 +1,10 @@
-package wtf_tests
+package wtf
 
 import (
 	"testing"
 	"time"
 
 	. "github.com/stretchr/testify/assert"
-	. "github.com/wtfutil/wtf/wtf"
 )
 
 func TestIsToday(t *testing.T) {
diff --git a/wtf_tests/utils_test.go b/wtf/utils_test.go
similarity index 97%
rename from wtf_tests/utils_test.go
rename to wtf/utils_test.go
index e23c9fc6..22a8180f 100644
--- a/wtf_tests/utils_test.go
+++ b/wtf/utils_test.go
@@ -1,10 +1,9 @@
-package wtf_tests
+package wtf
 
 import (
 	"testing"
 
 	. "github.com/stretchr/testify/assert"
-	. "github.com/wtfutil/wtf/wtf"
 )
 
 /* -------------------- CenterText() -------------------- */