diff --git a/doc b/doc
index 2ce0e26..da08844 160000
--- a/doc
+++ b/doc
@@ -1 +1 @@
-Subproject commit 2ce0e26b101192b92061c299ffc0e5524104f215
+Subproject commit da08844f714919a287cd62a9fa90faf3a484d3c3
diff --git a/matemat/db/facade.py b/matemat/db/facade.py
index 64418d9..91365d3 100644
--- a/matemat/db/facade.py
+++ b/matemat/db/facade.py
@@ -4,7 +4,7 @@ from typing import List, Optional, Any, Type
 import crypt
 from hmac import compare_digest
 
-from matemat.primitives import User, Product
+from matemat.db.primitives import User, Product
 from matemat.exceptions import AuthenticationError, DatabaseConsistencyError
 from matemat.db import DatabaseWrapper
 from matemat.db.wrapper import Transaction
diff --git a/matemat/primitives/Product.py b/matemat/db/primitives/Product.py
similarity index 100%
rename from matemat/primitives/Product.py
rename to matemat/db/primitives/Product.py
diff --git a/matemat/primitives/User.py b/matemat/db/primitives/User.py
similarity index 100%
rename from matemat/primitives/User.py
rename to matemat/db/primitives/User.py
diff --git a/matemat/primitives/__init__.py b/matemat/db/primitives/__init__.py
similarity index 100%
rename from matemat/primitives/__init__.py
rename to matemat/db/primitives/__init__.py
diff --git a/matemat/webserver/pagelets/admin.py b/matemat/webserver/pagelets/admin.py
index 6130c20..4cc112c 100644
--- a/matemat/webserver/pagelets/admin.py
+++ b/matemat/webserver/pagelets/admin.py
@@ -6,7 +6,7 @@ import magic
 
 from matemat.webserver import pagelet, RequestArguments, PageletResponse, RedirectResponse, TemplateResponse
 from matemat.db import MatematDatabase
-from matemat.primitives import User
+from matemat.db.primitives import User
 from matemat.exceptions import DatabaseConsistencyError, HttpException
 
 
diff --git a/matemat/webserver/pagelets/login.py b/matemat/webserver/pagelets/login.py
index 83167e0..d8c7f0a 100644
--- a/matemat/webserver/pagelets/login.py
+++ b/matemat/webserver/pagelets/login.py
@@ -3,7 +3,7 @@ from typing import Any, Dict, Union
 
 from matemat.exceptions import AuthenticationError, HttpException
 from matemat.webserver import pagelet, RequestArguments, PageletResponse, RedirectResponse, TemplateResponse
-from matemat.primitives import User
+from matemat.db.primitives import User
 from matemat.db import MatematDatabase
 
 
diff --git a/matemat/webserver/pagelets/modproduct.py b/matemat/webserver/pagelets/modproduct.py
index 51da39f..e3416d9 100644
--- a/matemat/webserver/pagelets/modproduct.py
+++ b/matemat/webserver/pagelets/modproduct.py
@@ -6,7 +6,7 @@ import magic
 
 from matemat.webserver import pagelet, RequestArguments, PageletResponse, RedirectResponse, TemplateResponse
 from matemat.db import MatematDatabase
-from matemat.primitives import Product
+from matemat.db.primitives import Product
 from matemat.exceptions import DatabaseConsistencyError, HttpException
 from matemat.util.currency_format import parse_chf
 
diff --git a/matemat/webserver/pagelets/moduser.py b/matemat/webserver/pagelets/moduser.py
index c51a05d..043b3f4 100644
--- a/matemat/webserver/pagelets/moduser.py
+++ b/matemat/webserver/pagelets/moduser.py
@@ -6,7 +6,7 @@ import magic
 
 from matemat.webserver import pagelet, RequestArguments, PageletResponse, RedirectResponse, TemplateResponse
 from matemat.db import MatematDatabase
-from matemat.primitives import User
+from matemat.db.primitives import User
 from matemat.exceptions import DatabaseConsistencyError, HttpException
 from matemat.util.currency_format import parse_chf
 
diff --git a/matemat/webserver/pagelets/touchkey.py b/matemat/webserver/pagelets/touchkey.py
index 90dd451..253e94b 100644
--- a/matemat/webserver/pagelets/touchkey.py
+++ b/matemat/webserver/pagelets/touchkey.py
@@ -3,7 +3,7 @@ from typing import Any, Dict, Union
 
 from matemat.exceptions import AuthenticationError, HttpException
 from matemat.webserver import pagelet, RequestArguments, PageletResponse, RedirectResponse, TemplateResponse
-from matemat.primitives import User
+from matemat.db.primitives import User
 from matemat.db import MatematDatabase