diff --git a/internal/models/models.go b/internal/models/objects.go
similarity index 61%
rename from internal/models/models.go
rename to internal/models/objects.go
index 5e675ae..c93af89 100644
--- a/internal/models/models.go
+++ b/internal/models/objects.go
@@ -1,10 +1,6 @@
 package models
 
-import (
-	"time"
-)
-
-//#region Objects
+import "time"
 
 type Role struct {
 	ID   string `json:"id"`
@@ -72,46 +68,3 @@ type Kiroku struct {
 	Alias    Alias     `json:"alias"`
 	Datetime time.Time `json:"datetime"`
 }
-
-//#endregion Objects
-
-//#region Sets
-
-type Pagination struct {
-	Total  int `json:"total"`
-	Offset int `json:"offset"`
-	Limit  int `json:"limit"`
-	Count  int `json:"count"`
-}
-
-type Persons struct {
-	Pagination Pagination    `json:"pagination"`
-	Persons    []PersonBrief `json:"persons"`
-}
-
-type Roles struct {
-	Pagination Pagination `json:"pagination"`
-	Roles      []Role     `json:"roles"`
-}
-
-type Artists struct {
-	Pagination Pagination    `json:"pagination"`
-	Artists    []ArtistBrief `json:"artists"`
-}
-
-type Tracks struct {
-	Pagination Pagination   `json:"pagination"`
-	Tracks     []TrackBrief `json:"tracks"`
-}
-
-type Aliases struct {
-	Pagination Pagination `json:"pagination"`
-	Aliases    []Alias    `json:"aliases"`
-}
-
-type Kirokus struct {
-	Pagination Pagination `json:"pagination"`
-	Kirokus    []Kiroku   `json:"kirokus"`
-}
-
-//#endregion Sets
diff --git a/internal/models/sets.go b/internal/models/sets.go
new file mode 100644
index 0000000..9baaf82
--- /dev/null
+++ b/internal/models/sets.go
@@ -0,0 +1,38 @@
+package models
+
+type Pagination struct {
+	Total  int `json:"total"`
+	Offset int `json:"offset"`
+	Limit  int `json:"limit"`
+	Count  int `json:"count"`
+}
+
+type Persons struct {
+	Pagination Pagination    `json:"pagination"`
+	Persons    []PersonBrief `json:"persons"`
+}
+
+type Roles struct {
+	Pagination Pagination `json:"pagination"`
+	Roles      []Role     `json:"roles"`
+}
+
+type Artists struct {
+	Pagination Pagination    `json:"pagination"`
+	Artists    []ArtistBrief `json:"artists"`
+}
+
+type Tracks struct {
+	Pagination Pagination   `json:"pagination"`
+	Tracks     []TrackBrief `json:"tracks"`
+}
+
+type Aliases struct {
+	Pagination Pagination `json:"pagination"`
+	Aliases    []Alias    `json:"aliases"`
+}
+
+type Kirokus struct {
+	Pagination Pagination `json:"pagination"`
+	Kirokus    []Kiroku   `json:"kirokus"`
+}