diff --git a/pages/_components/input-colors.html b/pages/_components/input-colors.html
index a1cf23c9b..d10a902ec 100644
--- a/pages/_components/input-colors.html
+++ b/pages/_components/input-colors.html
@@ -3,4 +3,4 @@ title: Color input
 columns: false
 ---
 
-{% include parts/input-color.html %}
+{% include parts/form/input-color.html %}
diff --git a/pages/_components/input-image.html b/pages/_components/input-image.html
index 2bfc2fee9..87685eb3d 100644
--- a/pages/_components/input-image.html
+++ b/pages/_components/input-image.html
@@ -3,4 +3,4 @@ title: Image input
 columns: 2
 ---
 
-{% include parts/input-image.html %}
+{% include parts/form/input-image.html %}
diff --git a/pages/_docs/form-elements.md b/pages/_docs/form-elements.md
index 34d5b53bd..f18ac6e07 100644
--- a/pages/_docs/form-elements.md
+++ b/pages/_docs/form-elements.md
@@ -55,12 +55,12 @@ bootstrap-link: components/forms/
 
 ### Input size
 
-{% include parts/input-sizes.html %}
+{% include parts/form/input-sizes.html %}
 
 
 ### Select
 {% example %}
-{% include parts/select.html options="Germany,USA,Poland" %}
+{% include parts/form/select.html options="Germany,USA,Poland" %}
 {% endexample %}
 
 ### Textarea
@@ -73,55 +73,55 @@ bootstrap-link: components/forms/
 
 ### Image check
 {% example %}
-{% include parts/input-image.html %}
+{% include parts/form/input-image.html %}
 {% endexample %}
 
 ### Input color
 {% example %}
-{% include parts/input-color.html %}
+{% include parts/form/input-color.html %}
 {% endexample %}
 
 ### Input color picker
 {% example %}
-{% include parts/input-colorpicker.html %}
+{% include parts/form/input-colorpicker.html %}
 {% endexample %}
 
 ### Datalists
 {% example %}
-{% include parts/input-datalist.html %}
+{% include parts/form/input-datalist.html %}
 {% endexample %}
 
 ### Custom selectboxes
 {% example %}
-{% include parts/input-selectgroups.html %}
+{% include parts/form/input-selectgroups.html %}
 {% endexample %}
 
 ### Toggle switches
 {% example %}
-{% include parts/input-toggle.html %}
-{% include parts/input-toggle-single.html %}
+{% include parts/form/input-toggle.html %}
+{% include parts/form/input-toggle-single.html %}
 {% endexample %}
 
 ### Radios
 {% example %}
-{% include parts/input-radios.html %}
-{% include parts/input-radios-inline.html %}
+{% include parts/form/input-radios.html %}
+{% include parts/form/input-radios-inline.html %}
 {% endexample %}
 
 ### Checkboxes
 {% example %}
-{% include parts/input-checkboxes.html %}
-{% include parts/input-checkboxes-inline.html %}
+{% include parts/form/input-checkboxes.html %}
+{% include parts/form/input-checkboxes-inline.html %}
 {% endexample%}
 
 ### Range input
 {% example %}
-{% include parts/input-range.html %}
+{% include parts/form/input-range.html %}
 {% endexample %}
 
 ### Sample form
 {% example %}
-{% include parts/form-fieldset.html %}
+{% include parts/form/fieldset.html %}
 {% endexample %}
 
 ### Input group
@@ -162,12 +162,12 @@ bootstrap-link: components/forms/
 
 ### Input with icon
 {% example %}
-{% include parts/input-icon.html %}
+{% include parts/form/input-icon.html %}
 {% endexample %}
 
 ### Separated inputs
 {% example %}
-{% include parts/input-icon-separated.html %}
+{% include parts/form/input-icon-separated.html %}
 {% endexample %}
 
 ### Custom Input examples
diff --git a/pages/_includes/forms/form-elements-1.html b/pages/_includes/forms/form-elements-1.html
index 673e65f6d..f2fc05264 100644
--- a/pages/_includes/forms/form-elements-1.html
+++ b/pages/_includes/forms/form-elements-1.html
@@ -26,8 +26,8 @@
 	<textarea class="form-control" name="example-textarea-input" rows="6" placeholder="Content..">Oh! Come and see the violence inherent in the system! Help, help, I'm being repressed! We shall say 'Ni' again to you, if you do not appease us. I'm not a witch. I'm not a witch. Camelot!</textarea>
 </div>
 
-{% include parts/select.html %}
-{% include parts/select.html label="Select multiple" multiple=true %}
+{% include parts/form/select.html %}
+{% include parts/form/select.html label="Select multiple" multiple=true %}
 
 <div class="mb-3">
 	<label class="form-label">Input group</label>
@@ -59,8 +59,8 @@
 	</div>
 </div>
 
-{% include parts/input-icon.html %}
-{% include parts/input-icon-separated.html %}
+{% include parts/form/input-icon.html %}
+{% include parts/form/input-icon-separated.html %}
 
 
 <div class="mb-3">
diff --git a/pages/_includes/forms/form-elements-3.html b/pages/_includes/forms/form-elements-3.html
index b155623d4..a28c302c8 100644
--- a/pages/_includes/forms/form-elements-3.html
+++ b/pages/_includes/forms/form-elements-3.html
@@ -1,6 +1,6 @@
-{% include parts/input-image.html %}
-{% include parts/input-color.html %}
-{% include parts/input-colorpicker.html %}
+{% include parts/form/input-image.html %}
+{% include parts/form/input-color.html %}
+{% include parts/form/input-colorpicker.html %}
 
 <div class="mb-3">
    <label class="form-label">Validation States</label>
@@ -16,4 +16,4 @@
 </div>
 
 <label class="form-label">Form fieldset</label>
-{% include parts/form-fieldset.html %}
\ No newline at end of file
+{% include parts/form/fieldset.html %}
\ No newline at end of file
diff --git a/pages/_includes/forms/form-elements-4.html b/pages/_includes/forms/form-elements-4.html
index daebf9c66..32122a654 100644
--- a/pages/_includes/forms/form-elements-4.html
+++ b/pages/_includes/forms/form-elements-4.html
@@ -1,6 +1,6 @@
 
-{% include parts/input-selectgroups.html %}
-{% include parts/form-payments.html %}
-{% include parts/form-project-manager.html %}
+{% include parts/form/input-selectgroups.html %}
+{% include parts/form/selectgroup-payments.html %}
+{% include parts/form/selectgroup-project-manager.html %}
 
 
diff --git a/pages/_includes/forms/form-elements-5.html b/pages/_includes/forms/form-elements-5.html
index c00afb18d..3527a9ae2 100644
--- a/pages/_includes/forms/form-elements-5.html
+++ b/pages/_includes/forms/form-elements-5.html
@@ -1,8 +1,8 @@
-{% include parts/input-radios.html %}
-{% include parts/input-radios-inline.html %}
+{% include parts/form/input-radios.html %}
+{% include parts/form/input-radios-inline.html %}
 
-{% include parts/input-checkboxes.html %}
-{% include parts/input-checkboxes-inline.html %}
+{% include parts/form/input-checkboxes.html %}
+{% include parts/form/input-checkboxes-inline.html %}
 
 <div class="mb-3">
 	<label class="form-label">Checkboxes with description</label>
@@ -33,10 +33,10 @@
 	</label>
 </div>
 
-{% include parts/input-toggle.html %}
-{% include parts/input-toggle-single.html %}
+{% include parts/form/input-toggle.html %}
+{% include parts/form/input-toggle-single.html %}
 
-{% include parts/input-file.html %}
+{% include parts/form/input-file.html %}
 
 
 <div class="mb-3">
diff --git a/pages/_includes/forms/form-elements-6.html b/pages/_includes/forms/form-elements-6.html
index 7c3c0a81c..c79018109 100644
--- a/pages/_includes/forms/form-elements-6.html
+++ b/pages/_includes/forms/form-elements-6.html
@@ -1,5 +1,5 @@
-{% include parts/input-datalist.html %}
-{% include parts/input-range.html %}
+{% include parts/form/input-datalist.html %}
+{% include parts/form/input-range.html %}
 
 <div class="mb-3">
 	<label class="form-label">Datepicker</label>
diff --git a/pages/_includes/parts/form-fieldset.html b/pages/_includes/parts/form/fieldset.html
similarity index 100%
rename from pages/_includes/parts/form-fieldset.html
rename to pages/_includes/parts/form/fieldset.html
diff --git a/pages/_includes/parts/input-checkboxes-inline.html b/pages/_includes/parts/form/input-checkboxes-inline.html
similarity index 100%
rename from pages/_includes/parts/input-checkboxes-inline.html
rename to pages/_includes/parts/form/input-checkboxes-inline.html
diff --git a/pages/_includes/parts/input-checkboxes.html b/pages/_includes/parts/form/input-checkboxes.html
similarity index 100%
rename from pages/_includes/parts/input-checkboxes.html
rename to pages/_includes/parts/form/input-checkboxes.html
diff --git a/pages/_includes/parts/input-color.html b/pages/_includes/parts/form/input-color.html
similarity index 100%
rename from pages/_includes/parts/input-color.html
rename to pages/_includes/parts/form/input-color.html
diff --git a/pages/_includes/parts/input-colorpicker.html b/pages/_includes/parts/form/input-colorpicker.html
similarity index 100%
rename from pages/_includes/parts/input-colorpicker.html
rename to pages/_includes/parts/form/input-colorpicker.html
diff --git a/pages/_includes/parts/input-datalist.html b/pages/_includes/parts/form/input-datalist.html
similarity index 100%
rename from pages/_includes/parts/input-datalist.html
rename to pages/_includes/parts/form/input-datalist.html
diff --git a/pages/_includes/parts/form/input-file.html b/pages/_includes/parts/form/input-file.html
new file mode 100644
index 000000000..30b7548bd
--- /dev/null
+++ b/pages/_includes/parts/form/input-file.html
@@ -0,0 +1,4 @@
+<div class="mb-3">
+   <div class="form-label">{{ include.label | default: 'Custom File Input' }}</div>
+   {% include ui/form/input-file.html %}
+</div>
diff --git a/pages/_includes/parts/input-icon-separated.html b/pages/_includes/parts/form/input-icon-separated.html
similarity index 100%
rename from pages/_includes/parts/input-icon-separated.html
rename to pages/_includes/parts/form/input-icon-separated.html
diff --git a/pages/_includes/parts/input-icon.html b/pages/_includes/parts/form/input-icon.html
similarity index 100%
rename from pages/_includes/parts/input-icon.html
rename to pages/_includes/parts/form/input-icon.html
diff --git a/pages/_includes/parts/input-image.html b/pages/_includes/parts/form/input-image.html
similarity index 100%
rename from pages/_includes/parts/input-image.html
rename to pages/_includes/parts/form/input-image.html
diff --git a/pages/_includes/parts/input-radios-inline.html b/pages/_includes/parts/form/input-radios-inline.html
similarity index 100%
rename from pages/_includes/parts/input-radios-inline.html
rename to pages/_includes/parts/form/input-radios-inline.html
diff --git a/pages/_includes/parts/input-radios.html b/pages/_includes/parts/form/input-radios.html
similarity index 100%
rename from pages/_includes/parts/input-radios.html
rename to pages/_includes/parts/form/input-radios.html
diff --git a/pages/_includes/parts/input-range.html b/pages/_includes/parts/form/input-range.html
similarity index 100%
rename from pages/_includes/parts/input-range.html
rename to pages/_includes/parts/form/input-range.html
diff --git a/pages/_includes/parts/input-selectgroups.html b/pages/_includes/parts/form/input-selectgroups.html
similarity index 100%
rename from pages/_includes/parts/input-selectgroups.html
rename to pages/_includes/parts/form/input-selectgroups.html
diff --git a/pages/_includes/parts/input-sizes.html b/pages/_includes/parts/form/input-sizes.html
similarity index 100%
rename from pages/_includes/parts/input-sizes.html
rename to pages/_includes/parts/form/input-sizes.html
diff --git a/pages/_includes/parts/input-toggle-single.html b/pages/_includes/parts/form/input-toggle-single.html
similarity index 100%
rename from pages/_includes/parts/input-toggle-single.html
rename to pages/_includes/parts/form/input-toggle-single.html
diff --git a/pages/_includes/parts/input-toggle.html b/pages/_includes/parts/form/input-toggle.html
similarity index 100%
rename from pages/_includes/parts/input-toggle.html
rename to pages/_includes/parts/form/input-toggle.html
diff --git a/pages/_includes/parts/select.html b/pages/_includes/parts/form/select.html
similarity index 100%
rename from pages/_includes/parts/select.html
rename to pages/_includes/parts/form/select.html
diff --git a/pages/_includes/parts/form-payments.html b/pages/_includes/parts/form/selectgroup-payments.html
similarity index 100%
rename from pages/_includes/parts/form-payments.html
rename to pages/_includes/parts/form/selectgroup-payments.html
diff --git a/pages/_includes/parts/form-project-manager.html b/pages/_includes/parts/form/selectgroup-project-manager.html
similarity index 100%
rename from pages/_includes/parts/form-project-manager.html
rename to pages/_includes/parts/form/selectgroup-project-manager.html
diff --git a/pages/_includes/parts/input-file.html b/pages/_includes/parts/input-file.html
deleted file mode 100644
index 9aa7d85a5..000000000
--- a/pages/_includes/parts/input-file.html
+++ /dev/null
@@ -1,10 +0,0 @@
-<div class="mb-3">
-   <div class="form-label">{{ include.label | default: 'Custom File Input' }}</div>
-   <div class="form-file">
-      <input type="file" class="form-file-input" id="customFile">
-      <label class="form-file-label" for="customFile">
-         <span class="form-file-text">Choose file...</span>
-         <span class="form-file-button">Browse</span>
-      </label>
-   </div>
-</div>
diff --git a/pages/_includes/ui/form/input-file.html b/pages/_includes/ui/form/input-file.html
new file mode 100644
index 000000000..98078feae
--- /dev/null
+++ b/pages/_includes/ui/form/input-file.html
@@ -0,0 +1,7 @@
+<div class="form-file">
+	<input type="file" class="form-file-input" id="customFile">
+	<label class="form-file-label" for="customFile">
+		<span class="form-file-text">Choose file...</span>
+		<span class="form-file-button">Browse</span>
+	</label>
+</div>
\ No newline at end of file
diff --git a/pages/tmp-dark.html b/pages/tmp-dark.html
index aa6c3d5c6..da1b49342 100644
--- a/pages/tmp-dark.html
+++ b/pages/tmp-dark.html
@@ -30,10 +30,10 @@ page-title: Dark
 						<input type="text" class="form-control" name="example-text-input" placeholder="Text..">
 					</div>
 
-					{% include parts/select.html %}
+					{% include parts/form/select.html %}
 
-					{% include parts/input-color.html %}
-					{% include parts/input-checkboxes.html %}
+					{% include parts/form/input-color.html %}
+					{% include parts/form/input-checkboxes.html %}
 
 					<div class="mb-3">
 						<label class="form-label">Input with appended text</label>