diff --git a/assert/assert.go b/assert/assert.go
index 3192165..243d77a 100644
--- a/assert/assert.go
+++ b/assert/assert.go
@@ -1,4 +1,4 @@
-package assert
+package Assert
 
 import (
 	"fmt"
diff --git a/logger/ConsoleLogger.go b/logger/consolelogger.go
similarity index 99%
rename from logger/ConsoleLogger.go
rename to logger/consolelogger.go
index 59f48a2..bcaeec6 100644
--- a/logger/ConsoleLogger.go
+++ b/logger/consolelogger.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 import (
 	"fmt"
diff --git a/logger/FileLogger.go b/logger/filelogger.go
similarity index 99%
rename from logger/FileLogger.go
rename to logger/filelogger.go
index ea9e663..63b4b2b 100644
--- a/logger/FileLogger.go
+++ b/logger/filelogger.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 import (
 	"fmt"
diff --git a/logger/interfaces.go b/logger/interfaces.go
index 63cfd98..4cdba60 100644
--- a/logger/interfaces.go
+++ b/logger/interfaces.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 // Message format(s)
 //
diff --git a/logger/Logger.go b/logger/logger.go
similarity index 98%
rename from logger/Logger.go
rename to logger/logger.go
index 797d4b6..65ebeb9 100644
--- a/logger/Logger.go
+++ b/logger/logger.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 import (
 	"encoding/json"
diff --git a/logger/NullLogger.go b/logger/nulllogger.go
similarity index 98%
rename from logger/NullLogger.go
rename to logger/nulllogger.go
index 8186055..720af23 100644
--- a/logger/NullLogger.go
+++ b/logger/nulllogger.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 func (lgr *NullLoggerImpl) init() {}
 
diff --git a/logger/types.go b/logger/types.go
index d9460c9..ace5cfa 100644
--- a/logger/types.go
+++ b/logger/types.go
@@ -1,4 +1,4 @@
-package logger
+package Logger
 
 import (
 	"os"
diff --git a/testing/testing.go b/testing/testing.go
index 2662f4c..4fad544 100644
--- a/testing/testing.go
+++ b/testing/testing.go
@@ -1,4 +1,4 @@
-package testing
+package Testing
 
 import "testing"
 
diff --git a/typeutils/interfaces.go b/type/interfaces.go
similarity index 98%
rename from typeutils/interfaces.go
rename to type/interfaces.go
index 65460c5..f33962e 100644
--- a/typeutils/interfaces.go
+++ b/type/interfaces.go
@@ -1,4 +1,4 @@
-package typeutils
+package Type
 
 // Created to abstract over Is_some and Is_ok
 type ValueContainer interface {
diff --git a/typeutils/optional.go b/type/optional.go
similarity index 94%
rename from typeutils/optional.go
rename to type/optional.go
index 782cbb1..afc6d46 100644
--- a/typeutils/optional.go
+++ b/type/optional.go
@@ -1,6 +1,6 @@
-package typeutils
+package Type
 
-import "github.com/lbatuska/goutils/assert"
+import Assert "github.com/lbatuska/goutils/assert"
 
 // CTORS BEGIN
 func Some[T any](value T) Optional[T] {
@@ -41,7 +41,7 @@ func (opt *Optional[T]) HasValue() bool {
 
 // UNWRAPPABLE INTERFACE BEGIN
 func (opt *Optional[T]) Expect(msg string) T {
-	assert.NotNil(opt)
+	Assert.NotNil(opt)
 	if opt.present {
 		return opt.value
 	}
@@ -49,7 +49,7 @@ func (opt *Optional[T]) Expect(msg string) T {
 }
 
 func (opt *Optional[T]) Unwrap() T {
-	assert.NotNil(opt)
+	Assert.NotNil(opt)
 	if opt.present {
 		return opt.value
 	}
diff --git a/typeutils/result.go b/type/result.go
similarity index 96%
rename from typeutils/result.go
rename to type/result.go
index 3af51d9..71acae3 100644
--- a/typeutils/result.go
+++ b/type/result.go
@@ -1,9 +1,9 @@
-package typeutils
+package Type
 
 import (
 	"errors"
 
-	"github.com/lbatuska/goutils/assert"
+	Assert "github.com/lbatuska/goutils/assert"
 )
 
 // CTORS BEGIN
@@ -44,7 +44,7 @@ func (res *Result[T]) HasValue() bool {
 
 // UNWRAPPABLE INTERFACE
 func (res *Result[T]) Expect(msg string) T {
-	assert.NotNil(res)
+	Assert.NotNil(res)
 	if res.err == nil {
 		return res.value
 	}
@@ -52,7 +52,7 @@ func (res *Result[T]) Expect(msg string) T {
 }
 
 func (res *Result[T]) Unwrap() T {
-	assert.NotNil(res)
+	Assert.NotNil(res)
 	if res.err == nil {
 		return res.value
 	}
diff --git a/typeutils/types.go b/type/types.go
similarity index 86%
rename from typeutils/types.go
rename to type/types.go
index 9dfde38..9284d16 100644
--- a/typeutils/types.go
+++ b/type/types.go
@@ -1,4 +1,4 @@
-package typeutils
+package Type
 
 type Optional[T any] struct {
 	value   T
diff --git a/typeutils/utils.go b/type/utils.go
similarity index 97%
rename from typeutils/utils.go
rename to type/utils.go
index 6cc0fcb..9f0ac61 100644
--- a/typeutils/utils.go
+++ b/type/utils.go
@@ -1,4 +1,4 @@
-package typeutils
+package Type
 
 func Expect[T any](val Unwrappable[T], msg string) T {
 	return val.Expect(msg)