diff --git a/app/models/form/sales/property/pages/property_number_of_bedrooms.rb b/app/models/form/sales/pages/property_number_of_bedrooms.rb
similarity index 57%
rename from app/models/form/sales/property/pages/property_number_of_bedrooms.rb
rename to app/models/form/sales/pages/property_number_of_bedrooms.rb
index c9199c84e..5efb6b0f4 100644
--- a/app/models/form/sales/property/pages/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/pages/property_number_of_bedrooms.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Property::Pages::PropertyNumberOfBedrooms < ::Form::Page
+class Form::Sales::Pages::PropertyNumberOfBedrooms < ::Form::Page
   def initialize(id, hsh, subsection)
     super
     @id = "property_number_of_bedrooms"
@@ -9,7 +9,7 @@ class Form::Sales::Property::Pages::PropertyNumberOfBedrooms < ::Form::Page
 
   def questions
     @questions ||= [
-      Form::Sales::Property::Questions::PropertyNumberOfBedrooms.new(nil, nil, self),
+      Form::Sales::Questions::PropertyNumberOfBedrooms.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form/sales/property/sections/property_information.rb b/app/models/form/sales/property/sections/property_information.rb
deleted file mode 100644
index eab4faac6..000000000
--- a/app/models/form/sales/property/sections/property_information.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-class Form::Sales::Property::Sections::PropertyInformation < ::Form::Section
-  def initialize(id, hsh, form)
-    super
-    @id = "property_information"
-    @label = "Property information"
-    @description = ""
-    @form = form
-    @subsections = [Form::Sales::Property::Subsections::PropertyInformation.new(nil, nil, self)] || []
-  end
-end
diff --git a/app/models/form/sales/property/questions/property_number_of_bedrooms.rb b/app/models/form/sales/questions/property_number_of_bedrooms.rb
similarity index 76%
rename from app/models/form/sales/property/questions/property_number_of_bedrooms.rb
rename to app/models/form/sales/questions/property_number_of_bedrooms.rb
index 046005cf1..34b319240 100644
--- a/app/models/form/sales/property/questions/property_number_of_bedrooms.rb
+++ b/app/models/form/sales/questions/property_number_of_bedrooms.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Property::Questions::PropertyNumberOfBedrooms < ::Form::Question
+class Form::Sales::Questions::PropertyNumberOfBedrooms < ::Form::Question
   def initialize(id, hsh, page)
     super
     @id = "beds"
diff --git a/app/models/form/sales/sections/property_information.rb b/app/models/form/sales/sections/property_information.rb
new file mode 100644
index 000000000..39f6609ae
--- /dev/null
+++ b/app/models/form/sales/sections/property_information.rb
@@ -0,0 +1,10 @@
+class Form::Sales::Sections::PropertyInformation < ::Form::Section
+  def initialize(id, hsh, form)
+    super
+    @id = "property_information"
+    @label = "Property information"
+    @description = ""
+    @form = form
+    @subsections = [Form::Sales::Subsections::PropertyInformation.new(nil, nil, self)] || []
+  end
+end
diff --git a/app/models/form/sales/property/subsections/property_information.rb b/app/models/form/sales/subsections/property_information.rb
similarity index 58%
rename from app/models/form/sales/property/subsections/property_information.rb
rename to app/models/form/sales/subsections/property_information.rb
index cbaa37d42..22983049b 100644
--- a/app/models/form/sales/property/subsections/property_information.rb
+++ b/app/models/form/sales/subsections/property_information.rb
@@ -1,4 +1,4 @@
-class Form::Sales::Property::Subsections::PropertyInformation < ::Form::Subsection
+class Form::Sales::Subsections::PropertyInformation < ::Form::Subsection
   def initialize(id, hsh, section)
     super
     @id = "property_information"
@@ -9,7 +9,7 @@ class Form::Sales::Property::Subsections::PropertyInformation < ::Form::Subsecti
 
   def pages
     @pages ||= [
-      Form::Sales::Property::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
+      Form::Sales::Pages::PropertyNumberOfBedrooms.new(nil, nil, self),
     ]
   end
 end
diff --git a/app/models/form_handler.rb b/app/models/form_handler.rb
index 8cbcba5cf..c9d45e876 100644
--- a/app/models/form_handler.rb
+++ b/app/models/form_handler.rb
@@ -20,7 +20,7 @@ class FormHandler
 
   def sales_forms
     sales_sections = [
-      Form::Sales::Property::Sections::PropertyInformation,
+      Form::Sales::Sections::PropertyInformation,
       Form::Sales::Sections::Household,
     ]
     current_form = Form.new(nil, current_collection_start_year, sales_sections, "sales")
diff --git a/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb b/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
similarity index 88%
rename from spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb
rename to spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
index 88a6941f6..078694916 100644
--- a/spec/models/form/sales/property/pages/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/pages/property_number_of_bedrooms_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Property::Pages::PropertyNumberOfBedrooms, type: :model do
+RSpec.describe Form::Sales::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/questions/property_number_of_bedrooms_spec.rb
similarity index 90%
rename from spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb
rename to spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
index 7e7ba3078..fc8dc3989 100644
--- a/spec/models/form/sales/property/questions/property_number_of_bedrooms_spec.rb
+++ b/spec/models/form/sales/questions/property_number_of_bedrooms_spec.rb
@@ -1,6 +1,6 @@
 require "rails_helper"
 
-RSpec.describe Form::Sales::Property::Questions::PropertyNumberOfBedrooms, type: :model do
+RSpec.describe Form::Sales::Questions::PropertyNumberOfBedrooms, type: :model do
   subject(:question) { described_class.new(question_id, question_definition, page) }
 
   let(:question_id) { nil }