diff --git a/pkg/collaborators/middleware/caching_middleware.go b/pkg/collaborators/middleware/caching_middleware.go
index f57995acf8387c80edc622313ba4729ae11bc6f6..ea595919431cd653e74ca0ffe24b62ff3b2d0a10 100644
--- a/pkg/collaborators/middleware/caching_middleware.go
+++ b/pkg/collaborators/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/collaborators/middleware/caching_middleware_test.go b/pkg/collaborators/middleware/caching_middleware_test.go
index da1d6e842f542e1c664f988f38c4797ea31c38f1..b7dc09281a9f972e9eafde3dd87ce628b0ea2fae 100644
--- a/pkg/collaborators/middleware/caching_middleware_test.go
+++ b/pkg/collaborators/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/collaborators/middleware/error_logging_middleware.go b/pkg/collaborators/middleware/error_logging_middleware.go
index a45dfd8053e1718fdc139f1792a9f0b1547c08d1..b0bc4518dad30925e41562f334e1891e2c4fb633 100644
--- a/pkg/collaborators/middleware/error_logging_middleware.go
+++ b/pkg/collaborators/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/collaborators/middleware/logging_middleware.go b/pkg/collaborators/middleware/logging_middleware.go
index 757d98c7027712c85be55f7314b917027f028f6e..4b4569a48b0900027cf1453779913996b5146525 100644
--- a/pkg/collaborators/middleware/logging_middleware.go
+++ b/pkg/collaborators/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/collaborators/middleware/middleware.go b/pkg/collaborators/middleware/middleware.go
index 682fd963ae290298adaec9001b7f60215c80d4db..60931c8494b76be2fe0657ec0d204377e58e0c11 100644
--- a/pkg/collaborators/middleware/middleware.go
+++ b/pkg/collaborators/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/collaborators -i Collaborators -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/collaborators/middleware/recovering_middleware.go b/pkg/collaborators/middleware/recovering_middleware.go
index 84e9dfb59514b1a146c96f0239cd3c8e83d8e7ba..0521cce7a30c9b86cb0fe0a04d058c70a9c48cf4 100644
--- a/pkg/collaborators/middleware/recovering_middleware.go
+++ b/pkg/collaborators/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/collaborators -i Collaborators -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/collections/middleware/caching_middleware.go b/pkg/collections/middleware/caching_middleware.go
index 0bb41c9e28027e8d9c4cfa5e305b91ac76f44165..469c39df98e1edb80495257999b6fecf81011247 100644
--- a/pkg/collections/middleware/caching_middleware.go
+++ b/pkg/collections/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/collections/middleware/caching_middleware_test.go b/pkg/collections/middleware/caching_middleware_test.go
index 967a75bce7fa7d933918edc9f05600f75a6c0ff5..c9e58b6886e121bf6b1f2edd37d9f4d9a69c9319 100644
--- a/pkg/collections/middleware/caching_middleware_test.go
+++ b/pkg/collections/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/collections/middleware/error_logging_middleware.go b/pkg/collections/middleware/error_logging_middleware.go
index d1be7f66c8564cc162d93a926652c63d0a670e1d..0491250639063a0e4d229c711c19b36223b9b2e4 100644
--- a/pkg/collections/middleware/error_logging_middleware.go
+++ b/pkg/collections/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/collections/middleware/logging_middleware.go b/pkg/collections/middleware/logging_middleware.go
index a420f16e1c7d94c42838c6e5758e381f6cc33d95..bc3e41070fc56e0a4ec2a75f073f9696a88560fb 100644
--- a/pkg/collections/middleware/logging_middleware.go
+++ b/pkg/collections/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/collections/middleware/middleware.go b/pkg/collections/middleware/middleware.go
index 911368f0f1df019e0e9b4b22afac9863cd4e523b..b581ce74b6071c707cc96fe9f11656bece37eb99 100644
--- a/pkg/collections/middleware/middleware.go
+++ b/pkg/collections/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/collections -i Collections -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/collections/middleware/recovering_middleware.go b/pkg/collections/middleware/recovering_middleware.go
index fb61326fd05df2473219bccacea776246a68376e..6f5594bcfd097d8ffa9132768f7f9538f6edf9da 100644
--- a/pkg/collections/middleware/recovering_middleware.go
+++ b/pkg/collections/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/collections -i Collections -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/environments/middleware/caching_middleware.go b/pkg/environments/middleware/caching_middleware.go
index 18b594bc3a193d962d63ef3d5eae6217408d61bd..dfe5b927117bfecdb56d11ab0e14582e43ef75b7 100644
--- a/pkg/environments/middleware/caching_middleware.go
+++ b/pkg/environments/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/environments/middleware/caching_middleware_test.go b/pkg/environments/middleware/caching_middleware_test.go
index f5bfa7a9b5d207ed0c00d60cd126950a6da5aba0..2e1b73a8366873dfb31b8d9fd24d31ac894025ee 100644
--- a/pkg/environments/middleware/caching_middleware_test.go
+++ b/pkg/environments/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/environments/middleware/error_logging_middleware.go b/pkg/environments/middleware/error_logging_middleware.go
index 6d6cb544f129f2925d33be91f6666dcf8ebb8936..91ff984763f696cde9f8c152f96842ae995a411e 100644
--- a/pkg/environments/middleware/error_logging_middleware.go
+++ b/pkg/environments/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/environments/middleware/logging_middleware.go b/pkg/environments/middleware/logging_middleware.go
index 21c0abf2d28b9123c19826de5cabb56b92552907..74692e333c12a3230a03b0cf584010745fb52329 100644
--- a/pkg/environments/middleware/logging_middleware.go
+++ b/pkg/environments/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/environments/middleware/middleware.go b/pkg/environments/middleware/middleware.go
index b5e29a99db170df7d2cc5003b2d9a206a423fef2..cfc89b98b7b17b5335afb81ea3dc5d686a9c892b 100644
--- a/pkg/environments/middleware/middleware.go
+++ b/pkg/environments/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/environments/middleware/recovering_middleware.go b/pkg/environments/middleware/recovering_middleware.go
index bf4bec7d46fa8b3e963c65330c6883c9c7fb0c20..57a59406a38b7051e2ff65d7ca6e41f198e562a6 100644
--- a/pkg/environments/middleware/recovering_middleware.go
+++ b/pkg/environments/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/environments -i Environments -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/invitations/middleware/caching_middleware.go b/pkg/invitations/middleware/caching_middleware.go
index 97a1bcb3367fa0cf0ab0f1bc7c638191cb72911c..651514a530039e7859fe146bd921c9d82e9ebd01 100644
--- a/pkg/invitations/middleware/caching_middleware.go
+++ b/pkg/invitations/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/invitations/middleware/caching_middleware_test.go b/pkg/invitations/middleware/caching_middleware_test.go
index b635ee0cd09b28245a8f29c67d7902a08392eba7..8c83d76ec0a35f1fa06e1065da3624ab3f7198e3 100644
--- a/pkg/invitations/middleware/caching_middleware_test.go
+++ b/pkg/invitations/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/invitations/middleware/error_logging_middleware.go b/pkg/invitations/middleware/error_logging_middleware.go
index 39c823ae6fdf7fb7cb5c181c42099ca16c1a2bad..ab0a2122f23c660281716d5dbc697cc6e13de3fe 100644
--- a/pkg/invitations/middleware/error_logging_middleware.go
+++ b/pkg/invitations/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/invitations/middleware/logging_middleware.go b/pkg/invitations/middleware/logging_middleware.go
index 133ecf51350c710e1aebd8abe9cd787d65e2793c..ac358b3e1e635bc7f410d5b6a318b4eddc231d38 100644
--- a/pkg/invitations/middleware/logging_middleware.go
+++ b/pkg/invitations/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/invitations/middleware/middleware.go b/pkg/invitations/middleware/middleware.go
index 1c054d8ae96ab5d45f1dd83af9bb440b3d429817..d4a336ba62cdbef2da5a06e4d71ecdf20491fe49 100644
--- a/pkg/invitations/middleware/middleware.go
+++ b/pkg/invitations/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/invitations/middleware/recovering_middleware.go b/pkg/invitations/middleware/recovering_middleware.go
index 195933ecce0d9766d8a92bbe1e52df6dc4d7064e..512daa46447e0782093d646457dee609359a7a14 100644
--- a/pkg/invitations/middleware/recovering_middleware.go
+++ b/pkg/invitations/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/invitations -i Invitations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/items/middleware/caching_middleware.go b/pkg/items/middleware/caching_middleware.go
index 0455cb276c5ccae86aeb27619fe55369a735550a..65351dae6da57811608d27eaf46dde6a5f9da04a 100644
--- a/pkg/items/middleware/caching_middleware.go
+++ b/pkg/items/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/items/middleware/caching_middleware_test.go b/pkg/items/middleware/caching_middleware_test.go
index 9e02b49beb80507ef7fbf25d3c67d5c8a022ce1b..a5ff1a95bc448b0df4c1b6498ce9ae0f25a55d19 100644
--- a/pkg/items/middleware/caching_middleware_test.go
+++ b/pkg/items/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/items/middleware/client_encode_middleware.go b/pkg/items/middleware/client_encode_middleware.go
index 3aaa6b94badd9726e74d1cb3b0abbd02893f5838..59d351864f52b76a64c3141c5b5c796d1614bf0e 100644
--- a/pkg/items/middleware/client_encode_middleware.go
+++ b/pkg/items/middleware/client_encode_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/items/middleware/error_logging_middleware.go b/pkg/items/middleware/error_logging_middleware.go
index 97967808d150cf951f3fb22b16b2836765fc611f..7c029b3822725b31ee019a7de1f48a23a3da3b93 100644
--- a/pkg/items/middleware/error_logging_middleware.go
+++ b/pkg/items/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/items/middleware/logging_middleware.go b/pkg/items/middleware/logging_middleware.go
index 8fbcc10ef739e12c5d64e60a74b83ac3b7a0221f..26dffe7787261cb98e1a87a3543c96709428d723 100644
--- a/pkg/items/middleware/logging_middleware.go
+++ b/pkg/items/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/items/middleware/middleware.go b/pkg/items/middleware/middleware.go
index a1090fe5ad072cd42682c1a4fad8504f22136926..52a1c1218d1605dc52ae80342684bb0339e63103 100644
--- a/pkg/items/middleware/middleware.go
+++ b/pkg/items/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/items/middleware/recovering_middleware.go b/pkg/items/middleware/recovering_middleware.go
index 244fc8a0638fa9ad812afeb3f919907171fb9b1e..21f823bc4352747a0a839a02afa3e84be155df10 100644
--- a/pkg/items/middleware/recovering_middleware.go
+++ b/pkg/items/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/items -i Items -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/locales/middleware/caching_middleware.go b/pkg/locales/middleware/caching_middleware.go
index 8b4635ab4a0214f99407b67020737724ebf3c841..9d1624950aab3d798070844ed2e9d89142430c2c 100644
--- a/pkg/locales/middleware/caching_middleware.go
+++ b/pkg/locales/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/locales/middleware/caching_middleware_test.go b/pkg/locales/middleware/caching_middleware_test.go
index de5e7a9f742b6336ecd5a67d529ed468236838f4..d39e78d78e487c7c2c90f906559dee400aaa414b 100644
--- a/pkg/locales/middleware/caching_middleware_test.go
+++ b/pkg/locales/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/locales/middleware/error_logging_middleware.go b/pkg/locales/middleware/error_logging_middleware.go
index 695c91128d6f093d93f022468d464bedbd571e04..3251fc7c972217ca4480ecbc26cb65cc055504ea 100644
--- a/pkg/locales/middleware/error_logging_middleware.go
+++ b/pkg/locales/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/locales/middleware/logging_middleware.go b/pkg/locales/middleware/logging_middleware.go
index 2d466633af466f7b0bb1d09e99de66411861ffa5..2db3ef39beb37cabf73adbfb9a3e1122f9e85387 100644
--- a/pkg/locales/middleware/logging_middleware.go
+++ b/pkg/locales/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/locales/middleware/middleware.go b/pkg/locales/middleware/middleware.go
index 726b535247256a109f0fc5aa100e0a61cc928555..721829405e98efc0c47e75f8670f4e74b784998d 100644
--- a/pkg/locales/middleware/middleware.go
+++ b/pkg/locales/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/locales/middleware/recovering_middleware.go b/pkg/locales/middleware/recovering_middleware.go
index 44b198550418034e1963fec5ccbd405e0ea12ef4..3229e52394d207361d608744b5dcf73585142958 100644
--- a/pkg/locales/middleware/recovering_middleware.go
+++ b/pkg/locales/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/locales -i Locales -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/members/middleware/caching_middleware.go b/pkg/members/middleware/caching_middleware.go
index 2faa5ce433281d8d396bb5c912e4e91cfaff727f..cffbc7c46a35da518eee412044cc18c1e2aa9970 100644
--- a/pkg/members/middleware/caching_middleware.go
+++ b/pkg/members/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/members/middleware/caching_middleware_test.go b/pkg/members/middleware/caching_middleware_test.go
index 1844dc58ebb97b228800a95f9c9cb8b142407fb4..4564dbe41a1fb943e86ad247a171497cffe01c18 100644
--- a/pkg/members/middleware/caching_middleware_test.go
+++ b/pkg/members/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/members/middleware/error_logging_middleware.go b/pkg/members/middleware/error_logging_middleware.go
index 08d2814bf4fc8f16f0df57462770342a93e191c8..79a92a1f2ac6f3d5854fcdf6c1f709e21ee160a7 100644
--- a/pkg/members/middleware/error_logging_middleware.go
+++ b/pkg/members/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/members/middleware/logging_middleware.go b/pkg/members/middleware/logging_middleware.go
index 49d5f5040aa2af21f32f72fcd24a4638c625674e..3136597a451cc8938c4dc326b01b9e022658293e 100644
--- a/pkg/members/middleware/logging_middleware.go
+++ b/pkg/members/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/members/middleware/middleware.go b/pkg/members/middleware/middleware.go
index 1aa0cfbe798f5688587ab8e4f5d4e166383d8d92..517bfa624a35e247d1e93f44db75a5eccaf0c721 100644
--- a/pkg/members/middleware/middleware.go
+++ b/pkg/members/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/members -i Members -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/members/middleware/recovering_middleware.go b/pkg/members/middleware/recovering_middleware.go
index ec6db9f480d35215c47bff6fceef8c0e01a77447..0b3104e17b3a0571fad94aa582d45ff51c447cc4 100644
--- a/pkg/members/middleware/recovering_middleware.go
+++ b/pkg/members/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/members -i Members -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/organizations/middleware/caching_middleware.go b/pkg/organizations/middleware/caching_middleware.go
index 2017c9913b41ae8fbeb05e116abdda037fb5667e..8350fb9275f51461165062d1f5d759bd5a17241a 100644
--- a/pkg/organizations/middleware/caching_middleware.go
+++ b/pkg/organizations/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/organizations/middleware/caching_middleware_test.go b/pkg/organizations/middleware/caching_middleware_test.go
index 59248ded4d85f904bf67e21956ad2df355706cdf..f468baf0d6d3653e54f90856bf8731c2626ddc65 100644
--- a/pkg/organizations/middleware/caching_middleware_test.go
+++ b/pkg/organizations/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/organizations/middleware/error_logging_middleware.go b/pkg/organizations/middleware/error_logging_middleware.go
index c9631f9144db6244044379219250ca334893d0d6..1ededdd2a8f391c56909cc33ec799175380a939a 100644
--- a/pkg/organizations/middleware/error_logging_middleware.go
+++ b/pkg/organizations/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/organizations/middleware/logging_middleware.go b/pkg/organizations/middleware/logging_middleware.go
index 854369eddb8135e0ca02ef8de2c7d28a62fcf53c..b1e6bc3b914ea49d0781d7ae39ddcc5c795fff45 100644
--- a/pkg/organizations/middleware/logging_middleware.go
+++ b/pkg/organizations/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/organizations/middleware/middleware.go b/pkg/organizations/middleware/middleware.go
index fe3c3d645e19cc9a0c46742be61edec6bda3882e..f6cf5c5527ede8c7d285cc280642ca6aa420970c 100644
--- a/pkg/organizations/middleware/middleware.go
+++ b/pkg/organizations/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/organizations/middleware/recovering_middleware.go b/pkg/organizations/middleware/recovering_middleware.go
index 35f3a6c5f7333f7fa3664c7101d31b72be270d33..d598f1da65414b4088c712944bbad71083e0def8 100644
--- a/pkg/organizations/middleware/recovering_middleware.go
+++ b/pkg/organizations/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/organizations -i Organizations -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/references/middleware/client_encode_middleware.go b/pkg/references/middleware/client_encode_middleware.go
index 1cd9cb2f22340a5d90feb95bd00accb1bae39e0f..b37e3ff95fc901061440f3bd34159739004d1c56 100644
--- a/pkg/references/middleware/client_encode_middleware.go
+++ b/pkg/references/middleware/client_encode_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/references/middleware/error_logging_middleware.go b/pkg/references/middleware/error_logging_middleware.go
index 9a62947f240842c6afb099a9b03cc966d9bd99b5..b5bae4d8eb4e5904be12a90b54e03f83a0002916 100644
--- a/pkg/references/middleware/error_logging_middleware.go
+++ b/pkg/references/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/references/middleware/logging_middleware.go b/pkg/references/middleware/logging_middleware.go
index 4b0a7a02b3deda9ac8b126800e9cfb3e0d08ca3b..7c64ad139203ddf5f5923199865b98e66d2f71a7 100644
--- a/pkg/references/middleware/logging_middleware.go
+++ b/pkg/references/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/references/middleware/middleware.go b/pkg/references/middleware/middleware.go
index dfed8dc0c821998df97d414876b6839a9961f6b0..3037ea954cd583a69e2e3604cffe1d4602a6536a 100644
--- a/pkg/references/middleware/middleware.go
+++ b/pkg/references/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/references/middleware/recovering_middleware.go b/pkg/references/middleware/recovering_middleware.go
index b1a4eb6b629e5a48f7508edbe34f5450d5f52b10..8028c14e805ef57531efd1c1d06af14167548738 100644
--- a/pkg/references/middleware/recovering_middleware.go
+++ b/pkg/references/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/references -i References -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/roles/middleware/caching_middleware.go b/pkg/roles/middleware/caching_middleware.go
index 19bdfe6b890806a98ac4aed81485f2f5314020b6..86725074b2d211f916c8ec126ad866ca89a0cc56 100644
--- a/pkg/roles/middleware/caching_middleware.go
+++ b/pkg/roles/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/roles/middleware/caching_middleware_test.go b/pkg/roles/middleware/caching_middleware_test.go
index bb5496b55fae164ea3681e644c7625ab9a2b9407..ff0165f8e9234d70d084a934d923b4e0b721ee0e 100644
--- a/pkg/roles/middleware/caching_middleware_test.go
+++ b/pkg/roles/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/roles/middleware/error_logging_middleware.go b/pkg/roles/middleware/error_logging_middleware.go
index 7afe8f1f1003031ddedb437d0422dfb4123d4526..48f12c3d6416ade72e1567c976e78b6237a3d323 100644
--- a/pkg/roles/middleware/error_logging_middleware.go
+++ b/pkg/roles/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/roles/middleware/logging_middleware.go b/pkg/roles/middleware/logging_middleware.go
index 3aa200d2971336eebd39fb0ec83b053c66fbf6e6..31d9d49245bd64eb0e2ba542e54e32f01805d007 100644
--- a/pkg/roles/middleware/logging_middleware.go
+++ b/pkg/roles/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/roles/middleware/middleware.go b/pkg/roles/middleware/middleware.go
index 0a5198110dfc463b80274230a7d1cbc65283debd..6b1a8b16e0178a22a57a6f44226aa32c6dacf4eb 100644
--- a/pkg/roles/middleware/middleware.go
+++ b/pkg/roles/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/roles/middleware/recovering_middleware.go b/pkg/roles/middleware/recovering_middleware.go
index 0c0f023b6fa4ccb6f8dc4dadbf59a58bf024a6cb..cb30a49b624712d6f37de4cd8c74ee65f9f71358 100644
--- a/pkg/roles/middleware/recovering_middleware.go
+++ b/pkg/roles/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/roles -i Roles -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/spaces/middleware/caching_middleware.go b/pkg/spaces/middleware/caching_middleware.go
index 62396fc8f1e9101f92885330a50797e26dbdebe2..720347d6138fc4a24e74785781f3097bc97fbf04 100644
--- a/pkg/spaces/middleware/caching_middleware.go
+++ b/pkg/spaces/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/spaces/middleware/caching_middleware_test.go b/pkg/spaces/middleware/caching_middleware_test.go
index 2cfaf98db8713081225b3f01f39782f487292161..a79a136f41690d0a6c6a16709bb9a591e5688735 100644
--- a/pkg/spaces/middleware/caching_middleware_test.go
+++ b/pkg/spaces/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/spaces/middleware/error_logging_middleware.go b/pkg/spaces/middleware/error_logging_middleware.go
index 85b629ba32abe38e5030077e8fe81b04206650b0..4f3524766e325d27131a4a2d07bee0c6f3a7623c 100644
--- a/pkg/spaces/middleware/error_logging_middleware.go
+++ b/pkg/spaces/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/spaces/middleware/logging_middleware.go b/pkg/spaces/middleware/logging_middleware.go
index 6720f61f53ea031e855527047760ca73f8e6daf0..9a379099338b6d4efea97ea590b201efebfa2a24 100644
--- a/pkg/spaces/middleware/logging_middleware.go
+++ b/pkg/spaces/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/spaces/middleware/middleware.go b/pkg/spaces/middleware/middleware.go
index 9d9d2243026f6c1152f7625e4c15bd26b5b7b5fc..7379b4ae182293f7750504663e59005551e3a63d 100644
--- a/pkg/spaces/middleware/middleware.go
+++ b/pkg/spaces/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/spaces/middleware/recovering_middleware.go b/pkg/spaces/middleware/recovering_middleware.go
index 5ca795bf5c188603794603ec11fc0c8a79479524..cb983bdbe2dc508fd49cb87fa4bc3c435bd94cfd 100644
--- a/pkg/spaces/middleware/recovering_middleware.go
+++ b/pkg/spaces/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/spaces -i Spaces -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""
 
diff --git a/pkg/users/middleware/caching_middleware.go b/pkg/users/middleware/caching_middleware.go
index 6dc04868c75edcd77ba9bb2b3adda3f1ff3022f0..c5674b82f0a1176304dc2efc0b60b7458839e347 100644
--- a/pkg/users/middleware/caching_middleware.go
+++ b/pkg/users/middleware/caching_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/users/middleware/caching_middleware_test.go b/pkg/users/middleware/caching_middleware_test.go
index 7ad09b52fdc003eac069005a8cdb956dd58949a7..fde23379bebd1957e7084fb7dc51ac45be467b59 100644
--- a/pkg/users/middleware/caching_middleware_test.go
+++ b/pkg/users/middleware/caching_middleware_test.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 import (
 	"context"
diff --git a/pkg/users/middleware/error_logging_middleware.go b/pkg/users/middleware/error_logging_middleware.go
index a9084fa7a05608e45f7c5436934b5738c685a0e9..688083dac93de779db6cdabd02002836901a0883 100644
--- a/pkg/users/middleware/error_logging_middleware.go
+++ b/pkg/users/middleware/error_logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/error_log
diff --git a/pkg/users/middleware/logging_middleware.go b/pkg/users/middleware/logging_middleware.go
index d59a73c663642781c3ff6f5587e3d8c9d162d8cc..0b9438ed939131c97679c5a3364a1e715be63b75 100644
--- a/pkg/users/middleware/logging_middleware.go
+++ b/pkg/users/middleware/logging_middleware.go
@@ -1,4 +1,4 @@
-package service
+package middleware
 
 // Code generated by gowrap. DO NOT EDIT.
 // template: ../../../assets/templates/middleware/access_log
diff --git a/pkg/users/middleware/middleware.go b/pkg/users/middleware/middleware.go
index 2888f263ca2083bdea91e3c3e62cde40f85e974f..63bc862271dc6d7002ea2db479aa359885ad5ebd 100644
--- a/pkg/users/middleware/middleware.go
+++ b/pkg/users/middleware/middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/middleware
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/middleware -o middleware.go -l ""
 
diff --git a/pkg/users/middleware/recovering_middleware.go b/pkg/users/middleware/recovering_middleware.go
index 57c401b12c0b56e9f40109570c6efe59bac8d902..7dac51f0c84fca93e796fc79fe7facb6872d0df1 100644
--- a/pkg/users/middleware/recovering_middleware.go
+++ b/pkg/users/middleware/recovering_middleware.go
@@ -2,7 +2,7 @@
 // template: ../../../assets/templates/middleware/recovery
 // gowrap: http://github.com/hexdigest/gowrap
 
-package service
+package middleware
 
 //go:generate gowrap gen -p git.perx.ru/perxis/perxis-go/pkg/users -i Users -t ../../../assets/templates/middleware/recovery -o recovering_middleware.go -l ""