diff --git a/lib/chess/auth.ex b/lib/chess/auth.ex
index 4cce885..f5b9ad9 100644
--- a/lib/chess/auth.ex
+++ b/lib/chess/auth.ex
@@ -7,7 +7,7 @@ defmodule Chess.Auth do
   alias Comeonin.Argon2
   alias Chess.Repo
 
-  alias Chess.Auth.User
+  alias Chess.Store.User
 
   def current_user(conn) do
     Guardian.Plug.current_resource(conn)
diff --git a/lib/chess/store/game.ex b/lib/chess/store/game.ex
index 80f14d8..1f62af8 100644
--- a/lib/chess/store/game.ex
+++ b/lib/chess/store/game.ex
@@ -14,8 +14,8 @@ defmodule Chess.Store.Game do
     field :board, :map, default: Board.default()
     field :turn, :string, default: "white"
 
-    belongs_to :user, Chess.Auth.User
-    belongs_to :opponent, Chess.Auth.User, references: :id
+    belongs_to :user, Chess.Store.User
+    belongs_to :opponent, Chess.Store.User, references: :id
 
     timestamps()
   end
diff --git a/lib/chess/auth/user.ex b/lib/chess/store/user.ex
similarity index 96%
rename from lib/chess/auth/user.ex
rename to lib/chess/store/user.ex
index 85391e8..bb247d0 100644
--- a/lib/chess/auth/user.ex
+++ b/lib/chess/store/user.ex
@@ -1,4 +1,4 @@
-defmodule Chess.Auth.User do
+defmodule Chess.Store.User do
   @moduledoc false
 
   use Ecto.Schema
diff --git a/lib/chess_web/controllers/registration_controller.ex b/lib/chess_web/controllers/registration_controller.ex
index 14c402a..693694c 100644
--- a/lib/chess_web/controllers/registration_controller.ex
+++ b/lib/chess_web/controllers/registration_controller.ex
@@ -1,7 +1,7 @@
 defmodule ChessWeb.RegistrationController do
   use ChessWeb, :controller
 
-  alias Chess.Auth.User
+  alias Chess.Store.User
 
   def new(conn, _params) do
     changeset = User.changeset(%User{})
diff --git a/lib/chess_web/controllers/session_controller.ex b/lib/chess_web/controllers/session_controller.ex
index 5517490..999df9d 100644
--- a/lib/chess_web/controllers/session_controller.ex
+++ b/lib/chess_web/controllers/session_controller.ex
@@ -2,8 +2,8 @@ defmodule ChessWeb.SessionController do
   use ChessWeb, :controller
 
   alias Chess.Auth
-  alias Chess.Auth.User
   alias Chess.Auth.Guardian
+  alias Chess.Store.User
 
   def new(conn, _params) do
     changeset = User.changeset(%User{})
diff --git a/test/chess/auth_test.exs b/test/chess/auth_test.exs
index 3e651b4..c06c408 100644
--- a/test/chess/auth_test.exs
+++ b/test/chess/auth_test.exs
@@ -4,7 +4,7 @@ defmodule Chess.AuthTest do
   alias Chess.Auth
 
   describe "users" do
-    alias Chess.Auth.User
+    alias Chess.Store.User
 
     @valid_attrs %{
       name: "some name",
diff --git a/test/chess/auth/user_test.exs b/test/chess/store/user_test.exs
similarity index 96%
rename from test/chess/auth/user_test.exs
rename to test/chess/store/user_test.exs
index 299c4c1..fcc5d7f 100644
--- a/test/chess/auth/user_test.exs
+++ b/test/chess/store/user_test.exs
@@ -4,7 +4,7 @@ defmodule Chess.UserTest do
   import Chess.Factory
 
   describe "user" do
-    alias Chess.Auth.User
+    alias Chess.Store.User
     alias Chess.Repo
 
     @valid_attrs %{
diff --git a/test/support/factory.ex b/test/support/factory.ex
index b31d6d6..046b724 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -1,7 +1,7 @@
 defmodule Chess.Factory do
   @moduledoc false
 
-  alias Chess.Auth.User
+  alias Chess.Store.User
   alias Chess.Store.Game
   alias Chess.Repo