diff --git a/assets/package-lock.json b/assets/package-lock.json
index 0b6a0cf..910d86d 100644
--- a/assets/package-lock.json
+++ b/assets/package-lock.json
@@ -39,12 +39,12 @@
       }
     },
     "../deps/phoenix": {
-      "version": "1.6.2",
+      "version": "1.6.6",
       "integrity": "sha512-VjR27NETvrLSj8rI6DlpVAfo7pCYth/9+1OCoTof4LKEbq0141ze/tdxFHHZzVQSok3gqJUo2h/tqbxR3r8eyw==",
       "license": "MIT"
     },
     "../deps/phoenix_html": {
-      "version": "3.1.0",
+      "version": "3.2.0",
       "integrity": "sha512-PB41xiF7pDzUSL+iKHI4xvGPLY9tUD2C/BE7oEWcCpt3+wrNweAlhbLk2tzM7uQOTZHMyaTLs1rYytg0t5aJyw=="
     },
     "node_modules/@babel/code-frame": {
diff --git a/config/config.exs b/config/config.exs
index e67a6c9..62a1d4c 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -59,7 +59,7 @@ end
 
 # Configure Absinthe SDL/JSON code generation.
 config :absinthe,
-  schema: FlixWeb.Graphql.Schema
+  schema: FlixWeb.GraphQL.Schema
 
 # Import environment specific config. This must remain at the bottom
 # of this file so it overrides the configuration defined above.
diff --git a/lib/flix_web/graphql/resolvers/genre_resolver.ex b/lib/flix_web/graphql/resolvers/genre_resolver.ex
index 1a9c549..4fde250 100644
--- a/lib/flix_web/graphql/resolvers/genre_resolver.ex
+++ b/lib/flix_web/graphql/resolvers/genre_resolver.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Resolvers.GenreResolver do
+defmodule FlixWeb.GraphQL.Resolvers.GenreResolver do
   alias Flix.Catalogs
 
   def list_genres(%Flix.Catalogs.Movie{} = movie, _args, _resolution) do
diff --git a/lib/flix_web/graphql/resolvers/movie_resolver.ex b/lib/flix_web/graphql/resolvers/movie_resolver.ex
index 262f6f4..4d58d97 100644
--- a/lib/flix_web/graphql/resolvers/movie_resolver.ex
+++ b/lib/flix_web/graphql/resolvers/movie_resolver.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Resolvers.MovieResolver do
+defmodule FlixWeb.GraphQL.Resolvers.MovieResolver do
   alias Flix.Catalogs
   alias Flix.Catalogs.Movie
   alias Flix.Repo
diff --git a/lib/flix_web/graphql/resolvers/review_resolver.ex b/lib/flix_web/graphql/resolvers/review_resolver.ex
index 1c06091..eb3b385 100644
--- a/lib/flix_web/graphql/resolvers/review_resolver.ex
+++ b/lib/flix_web/graphql/resolvers/review_resolver.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Resolvers.ReviewResolver do
+defmodule FlixWeb.GraphQL.Resolvers.ReviewResolver do
   alias Flix.Catalogs
 
   def list_reviews(%Flix.Catalogs.Movie{} = movie, _args, _resolution) do
diff --git a/lib/flix_web/graphql/resolvers/user_resolver.ex b/lib/flix_web/graphql/resolvers/user_resolver.ex
index 65087cb..f22e172 100644
--- a/lib/flix_web/graphql/resolvers/user_resolver.ex
+++ b/lib/flix_web/graphql/resolvers/user_resolver.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Resolvers.UserResolver do
+defmodule FlixWeb.GraphQL.Resolvers.UserResolver do
   alias Flix.Accounts
   alias Flix.Accounts.User
   alias Flix.Repo
diff --git a/lib/flix_web/graphql/schema.ex b/lib/flix_web/graphql/schema.ex
index 1c9a40b..37d8216 100644
--- a/lib/flix_web/graphql/schema.ex
+++ b/lib/flix_web/graphql/schema.ex
@@ -1,14 +1,14 @@
-defmodule FlixWeb.Graphql.Schema do
+defmodule FlixWeb.GraphQL.Schema do
   use Absinthe.Schema
 
-  import_types(FlixWeb.Graphql.Types.{
+  import_types(FlixWeb.GraphQL.Types.{
     Genre,
     Movie,
     Review,
     User
   })
 
-  import_types(FlixWeb.Graphql.Schemas.Queries.{
+  import_types(FlixWeb.GraphQL.Schemas.Queries.{
     Movie,
     User
   })
diff --git a/lib/flix_web/graphql/schemas/queries/movie.ex b/lib/flix_web/graphql/schemas/queries/movie.ex
index 7bc127c..ac025f7 100644
--- a/lib/flix_web/graphql/schemas/queries/movie.ex
+++ b/lib/flix_web/graphql/schemas/queries/movie.ex
@@ -1,7 +1,7 @@
-defmodule FlixWeb.Graphql.Schemas.Queries.Movie do
+defmodule FlixWeb.GraphQL.Schemas.Queries.Movie do
   use Absinthe.Schema.Notation
 
-  alias FlixWeb.Graphql.Resolvers.MovieResolver
+  alias FlixWeb.GraphQL.Resolvers.MovieResolver
 
   object :movie_queries do
     @desc "get a single movie"
diff --git a/lib/flix_web/graphql/schemas/queries/user.ex b/lib/flix_web/graphql/schemas/queries/user.ex
index 6a984f6..fb828e1 100644
--- a/lib/flix_web/graphql/schemas/queries/user.ex
+++ b/lib/flix_web/graphql/schemas/queries/user.ex
@@ -1,7 +1,7 @@
-defmodule FlixWeb.Graphql.Schemas.Queries.User do
+defmodule FlixWeb.GraphQL.Schemas.Queries.User do
   use Absinthe.Schema.Notation
 
-  alias FlixWeb.Graphql.Resolvers.UserResolver
+  alias FlixWeb.GraphQL.Resolvers.UserResolver
 
   object :user_queries do
     @desc "get a single user"
diff --git a/lib/flix_web/graphql/types/genre.ex b/lib/flix_web/graphql/types/genre.ex
index 1dcf960..909e184 100644
--- a/lib/flix_web/graphql/types/genre.ex
+++ b/lib/flix_web/graphql/types/genre.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Types.Genre do
+defmodule FlixWeb.GraphQL.Types.Genre do
   use Absinthe.Schema.Notation
 
   @desc "a genre"
diff --git a/lib/flix_web/graphql/types/movie.ex b/lib/flix_web/graphql/types/movie.ex
index 7fe2ec1..2a632fe 100644
--- a/lib/flix_web/graphql/types/movie.ex
+++ b/lib/flix_web/graphql/types/movie.ex
@@ -1,9 +1,9 @@
-defmodule FlixWeb.Graphql.Types.Movie do
+defmodule FlixWeb.GraphQL.Types.Movie do
   use Absinthe.Schema.Notation
 
   import_types(Absinthe.Type.Custom)
 
-  alias FlixWeb.Graphql.Resolvers
+  alias FlixWeb.GraphQL.Resolvers
 
   @desc "a movie"
   object :movie do
diff --git a/lib/flix_web/graphql/types/review.ex b/lib/flix_web/graphql/types/review.ex
index d4e99ad..0129ff1 100644
--- a/lib/flix_web/graphql/types/review.ex
+++ b/lib/flix_web/graphql/types/review.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Types.Review do
+defmodule FlixWeb.GraphQL.Types.Review do
   use Absinthe.Schema.Notation
 
   @desc "a review"
diff --git a/lib/flix_web/graphql/types/session.ex b/lib/flix_web/graphql/types/session.ex
new file mode 100644
index 0000000..64c9ca1
--- /dev/null
+++ b/lib/flix_web/graphql/types/session.ex
@@ -0,0 +1,9 @@
+defmodule FlixWeb.GraphQL.Types.Session do
+  use Absinthe.Schema.Notation
+
+  @desc "a session"
+  object :session do
+    field :user, non_null(:user)
+    field :token, non_null(:string)
+  end
+end
diff --git a/lib/flix_web/graphql/types/user.ex b/lib/flix_web/graphql/types/user.ex
index e659539..1ee7c15 100644
--- a/lib/flix_web/graphql/types/user.ex
+++ b/lib/flix_web/graphql/types/user.ex
@@ -1,4 +1,4 @@
-defmodule FlixWeb.Graphql.Types.User do
+defmodule FlixWeb.GraphQL.Types.User do
   use Absinthe.Schema.Notation
 
   alias Flix.Accounts.User
diff --git a/lib/flix_web/router.ex b/lib/flix_web/router.ex
index 1036926..60fa915 100644
--- a/lib/flix_web/router.ex
+++ b/lib/flix_web/router.ex
@@ -22,14 +22,14 @@ defmodule FlixWeb.Router do
     if Mix.env() in [:dev, :test] do
       forward "/graphiql",
         Absinthe.Plug.GraphiQL,
-        schema: FlixWeb.Graphql.Schema,
+        schema: FlixWeb.GraphQL.Schema,
         json_codec: Jason,
         interface: :playground
     end
 
     forward "/graphql",
       Absinthe.Plug,
-      schema: FlixWeb.Graphql.Schema
+      schema: FlixWeb.GraphQL.Schema
   end
 
   scope "/", FlixWeb do