diff --git a/app/models/form/sales/pages/property_number_of_bedrooms.rb b/app/models/form/sales/property/pages/property_number_of_bedrooms.rb
similarity index 57%
rename from app/models/form/sales/pages/property_number_of_bedrooms.rb
rename to app/models/form/sales/property/pages/property_number_of_bedrooms.rb
index 5efb6b0f4..c9199c84e 100644
--- a/app/models/form/sales/pages/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/property/pages/property_number_of_bedrooms.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
+class Form::Sales::Property::Pages::PropertyNumberOfBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_bedrooms"
@@ -9,7 +9,7 @@ class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Questions::PropertyNumberOfBedrooms.new(nil, nil, self),
+      Form::Sales::Property::Questions::PropertyNumberOfBedrooms.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/questions/property_number_of_bedrooms.rb b/app/models/form/sales/property/questions/property_number_of_bedrooms.rb
similarity index 76%
rename from app/models/form/sales/questions/property_number_of_bedrooms.rb
rename to app/models/form/sales/property/questions/property_number_of_bedrooms.rb
index 34b319240..046005cf1 100644
--- a/app/models/form/sales/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/property/questions/property_number_of_bedrooms.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
+class Form::Sales::Property::Questions::PropertyNumberOfBedrooms < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "beds"
diff --git a/app/models/form/sales/property/subsections/property_information.rb b/app/models/form/sales/property/subsections/property_information.rb
index 6abe162cb..cbaa37d42 100644
--- a/app/models/form/sales/property/subsections/property_information.rb
+++ b/app/models/form/sales/property/subsections/property_information.rb
@@ -4,12 +4,12 @@ class Form::Sales::Property::Subsections::PropertyInformation < ::Form::Subsecti
     @id = "property_information"
     @label = "Property information"
     @section = section
-    @depends_on = [ { "setup" => "completed" } ]
+    @depends_on = [{ "setup" => "completed" }]
   end
 
   def pages
     @pages ||= [
-      Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
+      Form::Sales::Property::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/subsections/setup.rb b/app/models/form/sales/subsections/setup.rb
index fc7442611..5b966efe4 100644
--- a/app/models/form/sales/subsections/setup.rb
+++ b/app/models/form/sales/subsections/setup.rb
@@ -17,7 +17,6 @@ class Form::Sales::Subsections::Setup < ::Form::Subsection
       Form::Sales::Pages::DiscountedOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::OutrightOwnershipType.new(nil, nil, self),
       Form::Sales::Pages::JointPurchase.new(nil, nil, self),
-      Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
     ]
   end
 end
diff --git a/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb
index 078694916..88a6941f6 100644
--- a/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Pages::PropertyNumberOfBedrooms, type: :model do
+RSpec.describe Form::Sales::Property::Pages::PropertyNumberOfBedrooms, type: :model do
   subject(:page) { described_class.new(page_id, page_definition, subsection) }
 
   let(:page_id) { nil }
diff --git a/spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb
index fc8dc3989..7e7ba3078 100644
--- a/spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Questions::PropertyNumberOfBedrooms, type: :model do
+RSpec.describe Form::Sales::Property::Questions::PropertyNumberOfBedrooms, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page) }
 
   let(:question_id) { nil }
diff --git a/spec/models/form/sales/subsections/setup_spec.rb b/spec/models/form/sales/subsections/setup_spec.rb
index 6de4b568f..6b537ce04 100644
--- a/spec/models/form/sales/subsections/setup_spec.rb
+++ b/spec/models/form/sales/subsections/setup_spec.rb
@@ -13,7 +13,7 @@ RSpec.describe Form::Sales::Subsections::Setup, type: :model do
 
   it "has correct pages" do
     expect(setup.pages.map(&:id)).to eq(
-      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase property_number_of_bedrooms],
+      %w[organisation created_by completion_date purchaser_code ownership_scheme shared_ownership_type discounted_ownership_type outright_ownership_type joint_purchase],
     )
   end