diff --git a/app/components/form/date_component.rb b/app/components/input/date_component.rb
similarity index 85%
rename from app/components/form/date_component.rb
rename to app/components/input/date_component.rb
index 143b1733f9..3240562f3d 100644
--- a/app/components/form/date_component.rb
+++ b/app/components/input/date_component.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::DateComponent < InputFieldComponent
+class Input::DateComponent < InputFieldComponent
   def initialize(label: '', name:, value: Date.today, placeholder: '', error_message: '', helper_text: '')
     super(label: label, name: name, value: value,  placeholder: placeholder, error_message: error_message, helper_text: helper_text)
   end
diff --git a/app/components/form/date_component/date_component.html.haml b/app/components/input/date_component/date_component.html.haml
similarity index 100%
rename from app/components/form/date_component/date_component.html.haml
rename to app/components/input/date_component/date_component.html.haml
diff --git a/app/components/form/file_input_component.rb b/app/components/input/file_input_component.rb
similarity index 71%
rename from app/components/form/file_input_component.rb
rename to app/components/input/file_input_component.rb
index 189a3db5c6..41de28bce3 100644
--- a/app/components/form/file_input_component.rb
+++ b/app/components/input/file_input_component.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::FileInputComponent < ViewComponent::Base
+class Input::FileInputComponent < ViewComponent::Base
   def initialize(name:, html_options: '')
     @name = name
     @html_options = html_options
diff --git a/app/components/form/file_input_component/file_input_component.html.haml b/app/components/input/file_input_component/file_input_component.html.haml
similarity index 100%
rename from app/components/form/file_input_component/file_input_component.html.haml
rename to app/components/input/file_input_component/file_input_component.html.haml
diff --git a/app/components/form/file_input_component/file_input_loader_component_controller.js b/app/components/input/file_input_component/file_input_loader_component_controller.js
similarity index 100%
rename from app/components/form/file_input_component/file_input_loader_component_controller.js
rename to app/components/input/file_input_component/file_input_loader_component_controller.js
diff --git a/app/components/form/select_component.rb b/app/components/input/select_component.rb
similarity index 90%
rename from app/components/form/select_component.rb
rename to app/components/input/select_component.rb
index 19a89a6704..44d0de23b6 100644
--- a/app/components/form/select_component.rb
+++ b/app/components/input/select_component.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::SelectComponent < InputFieldComponent
+class Input::SelectComponent < InputFieldComponent
 
   def initialize(id: nil, label: '', name:, value: [], selected: '', placeholder: '', error_message: '', helper_text: '', multiple: false, open_to_add_values: false)
     super(label: label, name: name, value: value,  placeholder: placeholder, error_message: error_message, helper_text: helper_text)
diff --git a/app/components/form/select_component/select_component.html.haml b/app/components/input/select_component/select_component.html.haml
similarity index 100%
rename from app/components/form/select_component/select_component.html.haml
rename to app/components/input/select_component/select_component.html.haml
diff --git a/app/components/form/text_area_component.rb b/app/components/input/text_area_component.rb
similarity index 85%
rename from app/components/form/text_area_component.rb
rename to app/components/input/text_area_component.rb
index a9aa3041ec..b493347c28 100644
--- a/app/components/form/text_area_component.rb
+++ b/app/components/input/text_area_component.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::TextAreaComponent < InputFieldComponent
+class Input::TextAreaComponent < InputFieldComponent
   def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '', rows: "5")
     super(label: label, name: name, value: value,  placeholder: placeholder, error_message: error_message, helper_text: helper_text)
     @rows = rows
diff --git a/app/components/form/text_area_component/text_area_component.html.haml b/app/components/input/text_area_component/text_area_component.html.haml
similarity index 100%
rename from app/components/form/text_area_component/text_area_component.html.haml
rename to app/components/input/text_area_component/text_area_component.html.haml
diff --git a/app/components/form/text_input_component.rb b/app/components/input/text_input_component.rb
similarity index 83%
rename from app/components/form/text_input_component.rb
rename to app/components/input/text_input_component.rb
index 94fa720fe1..ad5b2f5efe 100644
--- a/app/components/form/text_input_component.rb
+++ b/app/components/input/text_input_component.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::TextInputComponent < InputFieldComponent
+class Input::TextInputComponent < InputFieldComponent
   def initialize(label: '', name:, value: nil, placeholder: '', error_message: '', helper_text: '')
     super(label: label, name: name, value: value,  placeholder: placeholder, error_message: error_message, helper_text: helper_text)
   end
diff --git a/app/components/form/text_input_component/text_input_component.html.haml b/app/components/input/text_input_component/text_input_component.html.haml
similarity index 100%
rename from app/components/form/text_input_component/text_input_component.html.haml
rename to app/components/input/text_input_component/text_input_component.html.haml
diff --git a/app/views/mappings/bulk_loader/_loader.html.haml b/app/views/mappings/bulk_loader/_loader.html.haml
index eb50fa54db..efc06170b9 100644
--- a/app/views/mappings/bulk_loader/_loader.html.haml
+++ b/app/views/mappings/bulk_loader/_loader.html.haml
@@ -14,6 +14,6 @@
                   = JSON.pretty_generate @example_code
         = form_with url: '/mappings/loader', method: :post, multipart: true, data: { turbo: true} do
           %div
-            = render Form::FileInputComponent.new(name: :file)
+            = render Input::FileInputComponent.new(name: :file)
           %button.btn.btn-secondary.btn-block.mt-2{type:'submit'}
             Save
diff --git a/test/components/previews/chip_button_component_preview.rb b/test/components/previews/display/chip_button_component_preview.rb
similarity index 84%
rename from test/components/previews/chip_button_component_preview.rb
rename to test/components/previews/display/chip_button_component_preview.rb
index ab5dedab29..8ee4429875 100644
--- a/test/components/previews/chip_button_component_preview.rb
+++ b/test/components/previews/display/chip_button_component_preview.rb
@@ -1,4 +1,4 @@
-class ChipButtonComponentPreview < ViewComponent::Preview
+class Display::ChipButtonComponentPreview < ViewComponent::Preview
 
     # @param url text
     # @param text text
diff --git a/test/components/previews/date_time_field_component_preview.rb b/test/components/previews/display/date_time_field_component_preview.rb
similarity index 78%
rename from test/components/previews/date_time_field_component_preview.rb
rename to test/components/previews/display/date_time_field_component_preview.rb
index f23e937a5e..04071bc8c8 100644
--- a/test/components/previews/date_time_field_component_preview.rb
+++ b/test/components/previews/display/date_time_field_component_preview.rb
@@ -1,4 +1,4 @@
-class DateTimeFieldComponentPreview < ViewComponent::Preview
+class Display::DateTimeFieldComponentPreview < ViewComponent::Preview
 
   # @param text text
   # @param format select [year_month_day_concise, month_day_year, monthfull_day_year]
diff --git a/test/components/previews/field_container_component_preview.rb b/test/components/previews/display/field_container_component_preview.rb
similarity index 74%
rename from test/components/previews/field_container_component_preview.rb
rename to test/components/previews/display/field_container_component_preview.rb
index 17f01770a2..0f04e8222c 100644
--- a/test/components/previews/field_container_component_preview.rb
+++ b/test/components/previews/display/field_container_component_preview.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class FieldContainerComponentPreview < ViewComponent::Preview
+class Display::FieldContainerComponentPreview < ViewComponent::Preview
 
   # @param label text
   # @param value text
diff --git a/test/components/previews/language_field_component_preview.rb b/test/components/previews/display/language_field_component_preview.rb
similarity index 61%
rename from test/components/previews/language_field_component_preview.rb
rename to test/components/previews/display/language_field_component_preview.rb
index 9c2f00ab15..29cd56d3ac 100644
--- a/test/components/previews/language_field_component_preview.rb
+++ b/test/components/previews/display/language_field_component_preview.rb
@@ -1,4 +1,4 @@
-class LanguageFieldComponentPreview < ViewComponent::Preview
+class Display::LanguageFieldComponentPreview < ViewComponent::Preview
 
   # @param value text
   def default(value: 'fr')
diff --git a/test/components/previews/license_field_component_preview.rb b/test/components/previews/display/license_field_component_preview.rb
similarity index 83%
rename from test/components/previews/license_field_component_preview.rb
rename to test/components/previews/display/license_field_component_preview.rb
index 8c3f8233b4..203318a0b5 100644
--- a/test/components/previews/license_field_component_preview.rb
+++ b/test/components/previews/display/license_field_component_preview.rb
@@ -1,4 +1,4 @@
-class LicenseFieldComponentPreview < ViewComponent::Preview
+class Display::LicenseFieldComponentPreview < ViewComponent::Preview
 
   # @param value select [	CC-BY IGO 3.0, https://creativecommons.org/licenses/by/4.0/, http://www.gnu.org/licenses/gpl-3.0, https://opensource.org/licenses/MIT, http://www.apache.org/licenses/LICENSE-2.0  ]
   def default(value: "https://creativecommons.org/licenses/by/4.0/")
diff --git a/test/components/previews/link_field_component_preview.rb b/test/components/previews/display/link_field_component_preview.rb
similarity index 66%
rename from test/components/previews/link_field_component_preview.rb
rename to test/components/previews/display/link_field_component_preview.rb
index f364b8e30d..3b6d3a85a5 100644
--- a/test/components/previews/link_field_component_preview.rb
+++ b/test/components/previews/display/link_field_component_preview.rb
@@ -1,4 +1,4 @@
-class LinkFieldComponentPreview < ViewComponent::Preview
+class Display::LinkFieldComponentPreview < ViewComponent::Preview
 
   # @param text text
   def default(text: "https://agroportal.lirmm.fr/")
diff --git a/test/components/previews/text_area_field_component_preview.rb b/test/components/previews/display/text_area_field_component_preview.rb
similarity index 91%
rename from test/components/previews/text_area_field_component_preview.rb
rename to test/components/previews/display/text_area_field_component_preview.rb
index 2d6cfa7b78..efa508ab23 100644
--- a/test/components/previews/text_area_field_component_preview.rb
+++ b/test/components/previews/display/text_area_field_component_preview.rb
@@ -1,4 +1,4 @@
-class TextAreaFieldComponentPreview < ViewComponent::Preview
+class Display::TextAreaFieldComponentPreview < ViewComponent::Preview
 
 
   # @param value textarea
diff --git a/test/components/previews/form/file_input_component_preview.rb b/test/components/previews/form/file_input_component_preview.rb
deleted file mode 100644
index ef8000a6d7..0000000000
--- a/test/components/previews/form/file_input_component_preview.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-class Form::FileInputComponentPreview < ViewComponent::Preview
-
-    
-    def default
-        render Form::FileInputComponent.new(name: "file")
-    end
-
-
-end 
\ No newline at end of file
diff --git a/test/components/previews/chips_component_preview.rb b/test/components/previews/input/chips_component_preview.rb
similarity index 74%
rename from test/components/previews/chips_component_preview.rb
rename to test/components/previews/input/chips_component_preview.rb
index 8f806211c7..76e10ec283 100644
--- a/test/components/previews/chips_component_preview.rb
+++ b/test/components/previews/input/chips_component_preview.rb
@@ -1,4 +1,4 @@
-class ChipsComponentPreview < ViewComponent::Preview
+class Input::ChipsComponentPreview < ViewComponent::Preview
 
     # @param name text
     # @param value text
diff --git a/test/components/previews/form/date_component_preview.rb b/test/components/previews/input/date_component_preview.rb
similarity index 75%
rename from test/components/previews/form/date_component_preview.rb
rename to test/components/previews/input/date_component_preview.rb
index 193bc3cf92..07cb53fb8b 100644
--- a/test/components/previews/form/date_component_preview.rb
+++ b/test/components/previews/input/date_component_preview.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::DateComponentPreview < ViewComponent::Preview
+class Input::DateComponentPreview < ViewComponent::Preview
   def default
     # This is a date input field:
     # - To use it without a label: don't give a value to the param label or leave it empty.
@@ -11,7 +11,7 @@ def default
     # @param helper_text text
 
     def default(label: "Label", placeholder: "", error_message: "", helper_text: "")
-      render Form::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text)
+      render Input::DateComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text)
     end
   end
 end
diff --git a/test/components/previews/input/file_input_component_preview.rb b/test/components/previews/input/file_input_component_preview.rb
new file mode 100644
index 0000000000..94638bf570
--- /dev/null
+++ b/test/components/previews/input/file_input_component_preview.rb
@@ -0,0 +1,9 @@
+class Input::FileInputComponentPreview < ViewComponent::Preview
+
+    
+    def default
+        render Input::FileInputComponent.new(name: "file")
+    end
+
+
+end 
\ No newline at end of file
diff --git a/test/components/previews/nested_form_input_component_preview.rb b/test/components/previews/input/nested_form_input_component_preview.rb
similarity index 88%
rename from test/components/previews/nested_form_input_component_preview.rb
rename to test/components/previews/input/nested_form_input_component_preview.rb
index 20ef1783ed..ec9329466c 100644
--- a/test/components/previews/nested_form_input_component_preview.rb
+++ b/test/components/previews/input/nested_form_input_component_preview.rb
@@ -1,4 +1,4 @@
-class NestedFormInputComponentPreview < ViewComponent::Preview
+class Input::NestedFormInputComponentPreview < ViewComponent::Preview
 
   include ActionView::Helpers::TagHelper
   include ActionView::Helpers::FormTagHelper
diff --git a/test/components/previews/form/select_component_preview.rb b/test/components/previews/input/select_component_preview.rb
similarity index 75%
rename from test/components/previews/form/select_component_preview.rb
rename to test/components/previews/input/select_component_preview.rb
index 1a1fab70df..95ba3e5eca 100644
--- a/test/components/previews/form/select_component_preview.rb
+++ b/test/components/previews/input/select_component_preview.rb
@@ -1,15 +1,15 @@
 # frozen_string_literal: true
 
-class Form::SelectComponentPreview < ViewComponent::Preview
+class Input::SelectComponentPreview < ViewComponent::Preview
   def default(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: false, open_to_add_values: false)
-    render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
+    render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
   end
 
   def multiple(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true, open_to_add_values: false)
-    render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
+    render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
   end
 
   def open_to_add(id: "", name: "", values: ["choices 1", "choices 2", "choices 3"], selected: "choices 2", multiple: true , open_to_add_values: true)
-    render Form::SelectComponent.new(id: id, name: name, values: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
+    render Input::SelectComponent.new(id: id, name: name, value: values, selected: selected, multiple: multiple, open_to_add_values: open_to_add_values)
   end
 end
diff --git a/test/components/previews/form/text_area_component_preview.rb b/test/components/previews/input/text_area_component_preview.rb
similarity index 76%
rename from test/components/previews/form/text_area_component_preview.rb
rename to test/components/previews/input/text_area_component_preview.rb
index 36d21e577a..3af24aa3b1 100644
--- a/test/components/previews/form/text_area_component_preview.rb
+++ b/test/components/previews/input/text_area_component_preview.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::TextAreaComponentPreview < ViewComponent::Preview
+class Input::TextAreaComponentPreview < ViewComponent::Preview
   # This is a textarea field:
   # - To use it without a label: don't give a value to the param label or leave it empty.
   # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed.
@@ -14,6 +14,6 @@ class Form::TextAreaComponentPreview < ViewComponent::Preview
   # @param rows number
 
   def default(label: "Label", placeholder: "", error_message: "", helper_text: "", rows: 5)
-    render Form::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows)
+    render Input::TextAreaComponent.new(label: label, name: "name",value: '', placeholder: placeholder, error_message: error_message, helper_text: helper_text, rows: rows)
   end
 end
diff --git a/test/components/previews/form/text_input_component_preview.rb b/test/components/previews/input/text_input_component_preview.rb
similarity index 76%
rename from test/components/previews/form/text_input_component_preview.rb
rename to test/components/previews/input/text_input_component_preview.rb
index 9511f23744..e5e5f9a872 100644
--- a/test/components/previews/form/text_input_component_preview.rb
+++ b/test/components/previews/input/text_input_component_preview.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class Form::TextInputComponentPreview < ViewComponent::Preview
+class Input::TextInputComponentPreview < ViewComponent::Preview
   # This is a text input field:
   # - To use it without a label: don't give a value to the param label or leave it empty.
   # - To give it a hint (placeholder): define the param hint with the hind you want to be displayed.
@@ -12,6 +12,6 @@ class Form::TextInputComponentPreview < ViewComponent::Preview
   # @param helper_text text
 
   def default(label: "Label", placeholder: "", error_message: "", helper_text: "")
-    render Form::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text)
+    render Input::TextInputComponent.new(label: label, name: "name", placeholder: placeholder, error_message: error_message, helper_text: helper_text)
   end
 end
diff --git a/test/components/previews/card_message_component_preview.rb b/test/components/previews/layout/card_message_component_preview.rb
similarity index 94%
rename from test/components/previews/card_message_component_preview.rb
rename to test/components/previews/layout/card_message_component_preview.rb
index 5220316696..4b28bf40ff 100644
--- a/test/components/previews/card_message_component_preview.rb
+++ b/test/components/previews/layout/card_message_component_preview.rb
@@ -1,4 +1,4 @@
-class CardMessageComponentPreview < ViewComponent::Preview
+class Layout::CardMessageComponentPreview < ViewComponent::Preview
 
     # @param message text
     # @param button_text text
diff --git a/test/components/previews/dropdown_container_component_preview.rb b/test/components/previews/layout/dropdown_container_component_preview.rb
similarity index 79%
rename from test/components/previews/dropdown_container_component_preview.rb
rename to test/components/previews/layout/dropdown_container_component_preview.rb
index 90753546c0..7d66eb5dfc 100644
--- a/test/components/previews/dropdown_container_component_preview.rb
+++ b/test/components/previews/layout/dropdown_container_component_preview.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-class DropdownContainerComponentPreview < ViewComponent::Preview
+class Layout::DropdownContainerComponentPreview < ViewComponent::Preview
   layout 'component_preview_not_centred'
 
   # @param title text
diff --git a/test/components/previews/summary_section_component_preview.rb b/test/components/previews/layout/summary_section_component_preview.rb
similarity index 86%
rename from test/components/previews/summary_section_component_preview.rb
rename to test/components/previews/layout/summary_section_component_preview.rb
index d29593c326..626770b14a 100644
--- a/test/components/previews/summary_section_component_preview.rb
+++ b/test/components/previews/layout/summary_section_component_preview.rb
@@ -1,4 +1,4 @@
-class SummarySectionComponentPreview < ViewComponent::Preview
+class Layout::SummarySectionComponentPreview < ViewComponent::Preview
   layout 'component_preview_not_centred'
   # @param title text
   # @param content textarea