diff --git a/lib/pinchflat_web/controllers/media/media_item_controller.ex b/lib/pinchflat_web/controllers/media_items/media_item_controller.ex
similarity index 93%
rename from lib/pinchflat_web/controllers/media/media_item_controller.ex
rename to lib/pinchflat_web/controllers/media_items/media_item_controller.ex
index 398bd32..4248cac 100644
--- a/lib/pinchflat_web/controllers/media/media_item_controller.ex
+++ b/lib/pinchflat_web/controllers/media_items/media_item_controller.ex
@@ -1,4 +1,4 @@
-defmodule PinchflatWeb.Media.MediaItemController do
+defmodule PinchflatWeb.MediaItems.MediaItemController do
   use PinchflatWeb, :controller
 
   alias Pinchflat.Media
diff --git a/lib/pinchflat_web/controllers/media/media_item_html.ex b/lib/pinchflat_web/controllers/media_items/media_item_html.ex
similarity index 57%
rename from lib/pinchflat_web/controllers/media/media_item_html.ex
rename to lib/pinchflat_web/controllers/media_items/media_item_html.ex
index d0c0667..ffae16a 100644
--- a/lib/pinchflat_web/controllers/media/media_item_html.ex
+++ b/lib/pinchflat_web/controllers/media_items/media_item_html.ex
@@ -1,4 +1,4 @@
-defmodule PinchflatWeb.Media.MediaItemHTML do
+defmodule PinchflatWeb.MediaItems.MediaItemHTML do
   use PinchflatWeb, :html
 
   embed_templates "media_item_html/*"
diff --git a/lib/pinchflat_web/controllers/media/media_item_html/show.html.heex b/lib/pinchflat_web/controllers/media_items/media_item_html/show.html.heex
similarity index 100%
rename from lib/pinchflat_web/controllers/media/media_item_html/show.html.heex
rename to lib/pinchflat_web/controllers/media_items/media_item_html/show.html.heex
diff --git a/lib/pinchflat_web/router.ex b/lib/pinchflat_web/router.ex
index a4957a1..187a2d0 100644
--- a/lib/pinchflat_web/router.ex
+++ b/lib/pinchflat_web/router.ex
@@ -23,7 +23,7 @@ defmodule PinchflatWeb.Router do
     resources "/search", Searches.SearchController, only: [:show], singleton: true
 
     resources "/sources", Sources.SourceController do
-      resources "/media", Media.MediaItemController, only: [:show, :delete]
+      resources "/media", MediaItems.MediaItemController, only: [:show, :delete]
     end
   end