diff --git a/d2s.go b/d2s.go
index 03b6625..ee435a0 100644
--- a/d2s.go
+++ b/d2s.go
@@ -8,6 +8,7 @@ import (
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2datautils"
 
 	"github.com/gucio321/d2d2s/d2scorpse"
+	"github.com/gucio321/d2d2s/d2sdifficulty"
 	"github.com/gucio321/d2d2s/d2senums"
 	"github.com/gucio321/d2d2s/d2sitems"
 	"github.com/gucio321/d2d2s/datautils"
@@ -49,7 +50,7 @@ type D2S struct {
 	LeftSkillSwitch,
 	RightSkillSwitch SkillID
 	unknown6   [unknown6BytesCount]byte // probably character apperence in char select menu
-	Difficulty *Difficulty
+	Difficulty *d2sdifficulty.Difficulty
 	MapID      uint32
 	unknown7   uint16
 	Mercenary  mercenary
@@ -70,7 +71,7 @@ func New() *D2S {
 	result := &D2S{
 		Status:     &Status{},
 		Hotkeys:    make(hotkeys),
-		Difficulty: NewDifficulty(),
+		Difficulty: d2sdifficulty.New(),
 		Quests:     NewQuests(),
 		Waypoints:  NewWaypoints(),
 		NPC:        &NPC{},
diff --git a/difficulty.go b/d2sdifficulty/difficulty.go
similarity index 95%
rename from difficulty.go
rename to d2sdifficulty/difficulty.go
index af6d4b4..6868b55 100644
--- a/difficulty.go
+++ b/d2sdifficulty/difficulty.go
@@ -1,4 +1,4 @@
-package d2d2s
+package d2sdifficulty
 
 import (
 	"github.com/OpenDiablo2/OpenDiablo2/d2common/d2datautils"
@@ -11,8 +11,8 @@ const (
 	actBitsCount = 3
 )
 
-// NewDifficulty creates a new Difficulty
-func NewDifficulty() *Difficulty {
+// New creates a new Difficulty
+func New() *Difficulty {
 	result := &Difficulty{}
 	*result = make(Difficulty)
 
diff --git a/d2sdifficulty/doc.go b/d2sdifficulty/doc.go
new file mode 100644
index 0000000..3ba70cf
--- /dev/null
+++ b/d2sdifficulty/doc.go
@@ -0,0 +1,3 @@
+// Package d2sdifficulty provides structure used for storing
+// difficulty levels status
+package d2sdifficulty
diff --git a/d2senums/doc.go b/d2senums/doc.go
index e15aac2..c07a240 100644
--- a/d2senums/doc.go
+++ b/d2senums/doc.go
@@ -1,2 +1,2 @@
-// Package enums contains enumerations used in project
+// Package d2senums contains enumerations used in project
 package d2senums