diff --git a/template/hooks/__init__.py b/fastapi_template/__init__.py
similarity index 100%
rename from template/hooks/__init__.py
rename to fastapi_template/__init__.py
diff --git a/main.py b/fastapi_template/main.py
similarity index 100%
rename from main.py
rename to fastapi_template/main.py
diff --git a/template/cookiecutter.json b/fastapi_template/template/cookiecutter.json
similarity index 100%
rename from template/cookiecutter.json
rename to fastapi_template/template/cookiecutter.json
diff --git a/template/{{cookiecutter.project_name}}/migrations/__init__.py b/fastapi_template/template/hooks/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/migrations/__init__.py
rename to fastapi_template/template/hooks/__init__.py
diff --git a/template/hooks/post_gen_project.py b/fastapi_template/template/hooks/post_gen_project.py
similarity index 100%
rename from template/hooks/post_gen_project.py
rename to fastapi_template/template/hooks/post_gen_project.py
diff --git a/template/hooks/pre_gen_project.py b/fastapi_template/template/hooks/pre_gen_project.py
similarity index 100%
rename from template/hooks/pre_gen_project.py
rename to fastapi_template/template/hooks/pre_gen_project.py
diff --git a/template/{{cookiecutter.project_name}}/.gitignore b/fastapi_template/template/{{cookiecutter.project_name}}/.gitignore
similarity index 100%
rename from template/{{cookiecutter.project_name}}/.gitignore
rename to fastapi_template/template/{{cookiecutter.project_name}}/.gitignore
diff --git a/template/{{cookiecutter.project_name}}/.gitlab-ci.yml b/fastapi_template/template/{{cookiecutter.project_name}}/.gitlab-ci.yml
similarity index 100%
rename from template/{{cookiecutter.project_name}}/.gitlab-ci.yml
rename to fastapi_template/template/{{cookiecutter.project_name}}/.gitlab-ci.yml
diff --git a/template/{{cookiecutter.project_name}}/.pre-commit-config.yaml b/fastapi_template/template/{{cookiecutter.project_name}}/.pre-commit-config.yaml
similarity index 100%
rename from template/{{cookiecutter.project_name}}/.pre-commit-config.yaml
rename to fastapi_template/template/{{cookiecutter.project_name}}/.pre-commit-config.yaml
diff --git a/template/{{cookiecutter.project_name}}/Dockerfile b/fastapi_template/template/{{cookiecutter.project_name}}/Dockerfile
similarity index 100%
rename from template/{{cookiecutter.project_name}}/Dockerfile
rename to fastapi_template/template/{{cookiecutter.project_name}}/Dockerfile
diff --git a/template/{{cookiecutter.project_name}}/README.md b/fastapi_template/template/{{cookiecutter.project_name}}/README.md
similarity index 100%
rename from template/{{cookiecutter.project_name}}/README.md
rename to fastapi_template/template/{{cookiecutter.project_name}}/README.md
diff --git a/template/{{cookiecutter.project_name}}/alembic.ini b/fastapi_template/template/{{cookiecutter.project_name}}/alembic.ini
similarity index 100%
rename from template/{{cookiecutter.project_name}}/alembic.ini
rename to fastapi_template/template/{{cookiecutter.project_name}}/alembic.ini
diff --git a/template/{{cookiecutter.project_name}}/conditional_files.json b/fastapi_template/template/{{cookiecutter.project_name}}/conditional_files.json
similarity index 100%
rename from template/{{cookiecutter.project_name}}/conditional_files.json
rename to fastapi_template/template/{{cookiecutter.project_name}}/conditional_files.json
diff --git a/template/{{cookiecutter.project_name}}/deploy.sh b/fastapi_template/template/{{cookiecutter.project_name}}/deploy.sh
similarity index 100%
rename from template/{{cookiecutter.project_name}}/deploy.sh
rename to fastapi_template/template/{{cookiecutter.project_name}}/deploy.sh
diff --git a/template/{{cookiecutter.project_name}}/docker-compose.prod.yml b/fastapi_template/template/{{cookiecutter.project_name}}/docker-compose.prod.yml
similarity index 100%
rename from template/{{cookiecutter.project_name}}/docker-compose.prod.yml
rename to fastapi_template/template/{{cookiecutter.project_name}}/docker-compose.prod.yml
diff --git a/template/{{cookiecutter.project_name}}/docker-compose.yml b/fastapi_template/template/{{cookiecutter.project_name}}/docker-compose.yml
similarity index 100%
rename from template/{{cookiecutter.project_name}}/docker-compose.yml
rename to fastapi_template/template/{{cookiecutter.project_name}}/docker-compose.yml
diff --git a/template/{{cookiecutter.project_name}}/envs/example.env b/fastapi_template/template/{{cookiecutter.project_name}}/envs/example.env
similarity index 100%
rename from template/{{cookiecutter.project_name}}/envs/example.env
rename to fastapi_template/template/{{cookiecutter.project_name}}/envs/example.env
diff --git a/template/{{cookiecutter.project_name}}/envs/test.env b/fastapi_template/template/{{cookiecutter.project_name}}/envs/test.env
similarity index 100%
rename from template/{{cookiecutter.project_name}}/envs/test.env
rename to fastapi_template/template/{{cookiecutter.project_name}}/envs/test.env
diff --git a/template/{{cookiecutter.project_name}}/main.py b/fastapi_template/template/{{cookiecutter.project_name}}/main.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/main.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/main.py
diff --git a/template/{{cookiecutter.project_name}}/src/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/migrations/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/migrations/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/migrations/env.py b/fastapi_template/template/{{cookiecutter.project_name}}/migrations/env.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/migrations/env.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/migrations/env.py
diff --git a/template/{{cookiecutter.project_name}}/migrations/script.py.mako b/fastapi_template/template/{{cookiecutter.project_name}}/migrations/script.py.mako
similarity index 100%
rename from template/{{cookiecutter.project_name}}/migrations/script.py.mako
rename to fastapi_template/template/{{cookiecutter.project_name}}/migrations/script.py.mako
diff --git a/template/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py b/fastapi_template/template/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/migrations/versions/7ae297ab5ac1_created_dummy_model.py
diff --git a/template/{{cookiecutter.project_name}}/pyproject.toml b/fastapi_template/template/{{cookiecutter.project_name}}/pyproject.toml
similarity index 100%
rename from template/{{cookiecutter.project_name}}/pyproject.toml
rename to fastapi_template/template/{{cookiecutter.project_name}}/pyproject.toml
diff --git a/template/{{cookiecutter.project_name}}/pytest.ini b/fastapi_template/template/{{cookiecutter.project_name}}/pytest.ini
similarity index 100%
rename from template/{{cookiecutter.project_name}}/pytest.ini
rename to fastapi_template/template/{{cookiecutter.project_name}}/pytest.ini
diff --git a/template/{{cookiecutter.project_name}}/scheduler.py b/fastapi_template/template/{{cookiecutter.project_name}}/scheduler.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/scheduler.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/scheduler.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/dummy_db/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/dummy_db/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/routes.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/dummy_db/schema.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/httpbin/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/httpbin/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/httpbin/routes.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/routes.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/httpbin/routes.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/routes.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/httpbin/schema.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/schema.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/httpbin/schema.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/httpbin/schema.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/redis_api/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/redis_api/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/redis_api/routes.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/routes.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/redis_api/routes.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/routes.py
diff --git a/template/{{cookiecutter.project_name}}/src/api/redis_api/schema.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/schema.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/api/redis_api/schema.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/api/redis_api/schema.py
diff --git a/template/{{cookiecutter.project_name}}/src/exceptions.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/exceptions.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/exceptions.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/exceptions.py
diff --git a/template/{{cookiecutter.project_name}}/src/models/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/models/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/models/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/models/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/models/dummy_db_model.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/models/dummy_db_model.py
diff --git a/template/{{cookiecutter.project_name}}/src/server.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/server.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/server.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/server.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/httpbin/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/httpbin/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/db/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/db/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/db/base.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/base.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/db/base.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/base.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/db/db_meta.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/db_meta.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/db/db_meta.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/db_meta.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/db/engine.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/engine.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/db/engine.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/engine.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/db/session.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/session.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/db/session.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/db/session.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/elastic/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/elastic/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/elastic/client.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/client.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/elastic/client.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/client.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/elastic/mixin.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/mixin.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/elastic/mixin.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/mixin.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/elastic/schema.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/schema.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/elastic/schema.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/elastic/schema.py
diff --git a/template/{{cookiecutter.project_name}}/src/utils.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/utils.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/httpbin/client.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/client.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/httpbin/client.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/client.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/httpbin/schema.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/schema.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/httpbin/schema.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/httpbin/schema.py
diff --git a/template/{{cookiecutter.project_name}}/src/services/redis.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/services/redis.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/services/redis.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/services/redis.py
diff --git a/template/{{cookiecutter.project_name}}/src/settings.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/settings.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/src/settings.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/src/settings.py
diff --git a/fastapi_template/template/{{cookiecutter.project_name}}/src/utils.py b/fastapi_template/template/{{cookiecutter.project_name}}/src/utils.py
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_scheduler.service b/fastapi_template/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_scheduler.service
similarity index 100%
rename from template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_scheduler.service
rename to fastapi_template/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_scheduler.service
diff --git a/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_service.service b/fastapi_template/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_service.service
similarity index 100%
rename from template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_service.service
rename to fastapi_template/template/{{cookiecutter.project_name}}/systemd/{{ cookiecutter.project_name }}_service.service
diff --git a/template/{{cookiecutter.project_name}}/tests/__init__.py b/fastapi_template/template/{{cookiecutter.project_name}}/tests/__init__.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/tests/__init__.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/tests/__init__.py
diff --git a/template/{{cookiecutter.project_name}}/tests/conftest.py b/fastapi_template/template/{{cookiecutter.project_name}}/tests/conftest.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/tests/conftest.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/tests/conftest.py
diff --git a/template/{{cookiecutter.project_name}}/tests/dummy_db_test.py b/fastapi_template/template/{{cookiecutter.project_name}}/tests/dummy_db_test.py
similarity index 100%
rename from template/{{cookiecutter.project_name}}/tests/dummy_db_test.py
rename to fastapi_template/template/{{cookiecutter.project_name}}/tests/dummy_db_test.py
diff --git a/pyproject.toml b/pyproject.toml
index 09b57844b0cce153950d4666dbaeca2d2556d033..78bdc09470bdbb3d696cbd1bd39abec846f94153 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,10 +1,10 @@
 [tool.poetry]
 name = "fastapi_template"
-version = "1.1.6"
+version = "1.1.7"
 description = "Feature-rich robust FastAPI template"
 authors = ["Pavel Kirilin <win10@list.ru>"]
 packages = [
-    { include = "template" },
+    { include = "fastapi_template" },
 ]
 repository = "https://github.com/s3rius/FastAPI-template"
 homepage = "https://github.com/s3rius/FastAPI-template"
@@ -26,7 +26,7 @@ pygit2 = "^1.4.0"
 [tool.poetry.dev-dependencies]
 
 [tool.poetry.scripts]
-fastapi_template = "main:main"
+fastapi_template = "fastapi_template.main:main"
 
 [build-system]
 requires = ["poetry-core>=1.0.0"]