diff --git a/app/components/embed/login_component.rb b/app/components/embed/login_component.rb
deleted file mode 100644
index 463ccbef6..000000000
--- a/app/components/embed/login_component.rb
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module Embed
-  class LoginComponent < ViewComponent::Base
-  end
-end
diff --git a/app/components/embed/m3_component.rb b/app/components/embed/m3_component.rb
deleted file mode 100644
index c88d50230..000000000
--- a/app/components/embed/m3_component.rb
+++ /dev/null
@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Embed
-  class M3Component < ViewComponent::Base
-    def initialize(viewer:)
-      @viewer = viewer
-    end
-
-    attr_reader :viewer
-  end
-end
diff --git a/app/components/embed/pdf_component.rb b/app/components/embed/pdf_component.rb
deleted file mode 100644
index 9107a5709..000000000
--- a/app/components/embed/pdf_component.rb
+++ /dev/null
@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module Embed
-  class PdfComponent < ViewComponent::Base
-    def initialize(viewer:)
-      @viewer = viewer
-    end
-
-    attr_reader :viewer
-
-    delegate :purl_object, to: :viewer
-    delegate :druid, to: :purl_object
-
-    def iiif_v3_manifest_url
-      "#{Settings.purl_url}/#{druid}/iiif3/manifest"
-    end
-  end
-end
diff --git a/app/components/embed/login_component.html.erb b/app/components/login_component.html.erb
similarity index 100%
rename from app/components/embed/login_component.html.erb
rename to app/components/login_component.html.erb
diff --git a/app/components/login_component.rb b/app/components/login_component.rb
new file mode 100644
index 000000000..e82139a3a
--- /dev/null
+++ b/app/components/login_component.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+# This is only used by the PdfComponent
+class LoginComponent < ViewComponent::Base
+end
diff --git a/app/components/embed/m3_component.html.erb b/app/components/m3_component.html.erb
similarity index 100%
rename from app/components/embed/m3_component.html.erb
rename to app/components/m3_component.html.erb
diff --git a/app/components/m3_component.rb b/app/components/m3_component.rb
new file mode 100644
index 000000000..5a0d8224f
--- /dev/null
+++ b/app/components/m3_component.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class M3Component < ViewComponent::Base
+  def initialize(viewer:)
+    @viewer = viewer
+  end
+
+  attr_reader :viewer
+end
diff --git a/app/components/embed/pdf_component.html.erb b/app/components/pdf_component.html.erb
similarity index 95%
rename from app/components/embed/pdf_component.html.erb
rename to app/components/pdf_component.html.erb
index fe1d1bd42..89df7dac4 100644
--- a/app/components/embed/pdf_component.html.erb
+++ b/app/components/pdf_component.html.erb
@@ -14,7 +14,7 @@
   <% component.with_body do %>
     <div class="sul-embed-body" style="width: 100%">
     <% if viewer.available? %>
-          <%= render Embed::LoginComponent.new %>
+          <%= render LoginComponent.new %>
           <div class="sul-embed-pdf" style="height: 100%"
             data-controller="pdf"
             data-fullscreen-target="area"
diff --git a/app/components/pdf_component.rb b/app/components/pdf_component.rb
new file mode 100644
index 000000000..c297d8336
--- /dev/null
+++ b/app/components/pdf_component.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+class PdfComponent < ViewComponent::Base
+  def initialize(viewer:)
+    @viewer = viewer
+  end
+
+  attr_reader :viewer
+
+  delegate :purl_object, to: :viewer
+  delegate :druid, to: :purl_object
+
+  def iiif_v3_manifest_url
+    "#{Settings.purl_url}/#{druid}/iiif3/manifest"
+  end
+end
diff --git a/spec/components/embed/m3_component_spec.rb b/spec/components/m3_component_spec.rb
similarity index 95%
rename from spec/components/embed/m3_component_spec.rb
rename to spec/components/m3_component_spec.rb
index 416b811f3..49f25fb5e 100644
--- a/spec/components/embed/m3_component_spec.rb
+++ b/spec/components/m3_component_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Embed::M3Component, type: :component do
+RSpec.describe M3Component, type: :component do
   let(:request) { Embed::Request.new(url: 'http://purl.stanford.edu/abc123', canvas_index: 3, search: 'xyz', suggested_search: 'abc') }
   let(:viewer) { Embed::Viewer::M3Viewer.new(request) }
   let(:purl) { build(:purl) }
diff --git a/spec/components/embed/pdf_component_spec.rb b/spec/components/pdf_component_spec.rb
similarity index 96%
rename from spec/components/embed/pdf_component_spec.rb
rename to spec/components/pdf_component_spec.rb
index de831aefb..546cbc801 100644
--- a/spec/components/embed/pdf_component_spec.rb
+++ b/spec/components/pdf_component_spec.rb
@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-RSpec.describe Embed::PdfComponent, type: :component do
+RSpec.describe PdfComponent, type: :component do
   include PurlFixtures
 
   let(:url) { 'https://purl.stanford.edu/sq929fn8035' }