diff --git a/Header.php b/Header.php
new file mode 100644
index 0000000000..80bb46b17d
--- /dev/null
+++ b/Header.php
@@ -0,0 +1,3 @@
+<?php
+
+require __DIR__ . '/samples/Header.php';
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 24f49af632..158421b7c7 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,15 +1,5 @@
 parameters:
 	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$formula of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\DataValidation\\:\\:setFormula1\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: samples/Basic/15_Datavalidation.php
-
-		-
-			message: "#^Parameter \\#1 \\$formula of method PhpOffice\\\\PhpSpreadsheet\\\\Cell\\\\DataValidation\\:\\:setFormula2\\(\\) expects string, int given\\.$#"
-			count: 1
-			path: samples/Basic/15_Datavalidation.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between mixed and null will always evaluate to false\\.$#"
 			count: 1
diff --git a/samples/Basic/11_Documentsecurity.php b/samples/Basic1/11_Documentsecurity.php
similarity index 100%
rename from samples/Basic/11_Documentsecurity.php
rename to samples/Basic1/11_Documentsecurity.php
diff --git a/samples/Basic/12_CellProtection.php b/samples/Basic1/12_CellProtection.php
similarity index 100%
rename from samples/Basic/12_CellProtection.php
rename to samples/Basic1/12_CellProtection.php
diff --git a/samples/Basic/13_Calculation.php b/samples/Basic1/13_Calculation.php
similarity index 100%
rename from samples/Basic/13_Calculation.php
rename to samples/Basic1/13_Calculation.php
diff --git a/samples/Basic/13_CalculationCyclicFormulae.php b/samples/Basic1/13_CalculationCyclicFormulae.php
similarity index 100%
rename from samples/Basic/13_CalculationCyclicFormulae.php
rename to samples/Basic1/13_CalculationCyclicFormulae.php
diff --git a/samples/Basic/14_Xls.php b/samples/Basic1/14_Xls.php
similarity index 100%
rename from samples/Basic/14_Xls.php
rename to samples/Basic1/14_Xls.php
diff --git a/samples/Basic/15_Datavalidation.php b/samples/Basic1/15_Datavalidation.php
similarity index 98%
rename from samples/Basic/15_Datavalidation.php
rename to samples/Basic1/15_Datavalidation.php
index fb76b4dc2d..c2804cfbb2 100644
--- a/samples/Basic/15_Datavalidation.php
+++ b/samples/Basic1/15_Datavalidation.php
@@ -47,8 +47,8 @@
 $validation->setError('Only numbers between 10 and 20 are allowed!');
 $validation->setPromptTitle('Allowed input');
 $validation->setPrompt('Only numbers between 10 and 20 are allowed.');
-$validation->setFormula1(10);
-$validation->setFormula2(20);
+$validation->setFormula1('10');
+$validation->setFormula2('20');
 
 $validation = $spreadsheet->getActiveSheet()->getCell('B5')->getDataValidation();
 $validation->setType(DataValidation::TYPE_LIST);
diff --git a/samples/Basic/16_Csv.php b/samples/Basic1/16_Csv.php
similarity index 100%
rename from samples/Basic/16_Csv.php
rename to samples/Basic1/16_Csv.php
diff --git a/samples/Basic/17_Html.php b/samples/Basic1/17_Html.php
similarity index 100%
rename from samples/Basic/17_Html.php
rename to samples/Basic1/17_Html.php
diff --git a/samples/Basic/17a_Html.php b/samples/Basic1/17a_Html.php
similarity index 100%
rename from samples/Basic/17a_Html.php
rename to samples/Basic1/17a_Html.php
diff --git a/samples/Basic/17b_Html.php b/samples/Basic1/17b_Html.php
similarity index 100%
rename from samples/Basic/17b_Html.php
rename to samples/Basic1/17b_Html.php
diff --git a/samples/Basic/18_Extendedcalculation.php b/samples/Basic1/18_Extendedcalculation.php
similarity index 100%
rename from samples/Basic/18_Extendedcalculation.php
rename to samples/Basic1/18_Extendedcalculation.php
diff --git a/samples/Basic/19_Namedrange.php b/samples/Basic1/19_Namedrange.php
similarity index 100%
rename from samples/Basic/19_Namedrange.php
rename to samples/Basic1/19_Namedrange.php
diff --git a/samples/Basic/20_Read_Excel2003XML.php b/samples/Basic2/20_Read_Excel2003XML.php
similarity index 100%
rename from samples/Basic/20_Read_Excel2003XML.php
rename to samples/Basic2/20_Read_Excel2003XML.php
diff --git a/samples/Basic/20_Read_Gnumeric.php b/samples/Basic2/20_Read_Gnumeric.php
similarity index 100%
rename from samples/Basic/20_Read_Gnumeric.php
rename to samples/Basic2/20_Read_Gnumeric.php
diff --git a/samples/Basic/20_Read_Ods.php b/samples/Basic2/20_Read_Ods.php
similarity index 100%
rename from samples/Basic/20_Read_Ods.php
rename to samples/Basic2/20_Read_Ods.php
diff --git a/samples/Basic/20_Read_Sylk.php b/samples/Basic2/20_Read_Sylk.php
similarity index 100%
rename from samples/Basic/20_Read_Sylk.php
rename to samples/Basic2/20_Read_Sylk.php
diff --git a/samples/Basic/20_Read_Xls.php b/samples/Basic2/20_Read_Xls.php
similarity index 100%
rename from samples/Basic/20_Read_Xls.php
rename to samples/Basic2/20_Read_Xls.php
diff --git a/samples/Basic/22_Heavily_formatted.php b/samples/Basic2/22_Heavily_formatted.php
similarity index 100%
rename from samples/Basic/22_Heavily_formatted.php
rename to samples/Basic2/22_Heavily_formatted.php
diff --git a/samples/Basic/23_Sharedstyles.php b/samples/Basic2/23_Sharedstyles.php
similarity index 100%
rename from samples/Basic/23_Sharedstyles.php
rename to samples/Basic2/23_Sharedstyles.php
diff --git a/samples/Basic/24_Readfilter.php b/samples/Basic2/24_Readfilter.php
similarity index 100%
rename from samples/Basic/24_Readfilter.php
rename to samples/Basic2/24_Readfilter.php
diff --git a/samples/Basic/25_In_memory_image.php b/samples/Basic2/25_In_memory_image.php
similarity index 100%
rename from samples/Basic/25_In_memory_image.php
rename to samples/Basic2/25_In_memory_image.php
diff --git a/samples/Basic/26_Utf8.php b/samples/Basic2/26_Utf8.php
similarity index 100%
rename from samples/Basic/26_Utf8.php
rename to samples/Basic2/26_Utf8.php
diff --git a/samples/Basic/27_Images_Html_Pdf.php b/samples/Basic2/27_Images_Html_Pdf.php
similarity index 100%
rename from samples/Basic/27_Images_Html_Pdf.php
rename to samples/Basic2/27_Images_Html_Pdf.php
diff --git a/samples/Basic/27_Images_Xls.php b/samples/Basic2/27_Images_Xls.php
similarity index 100%
rename from samples/Basic/27_Images_Xls.php
rename to samples/Basic2/27_Images_Xls.php
diff --git a/samples/Basic/27_Images_Xlsx.php b/samples/Basic2/27_Images_Xlsx.php
similarity index 100%
rename from samples/Basic/27_Images_Xlsx.php
rename to samples/Basic2/27_Images_Xlsx.php
diff --git a/samples/Basic/29_Advanced_value_binder.php b/samples/Basic2/29_Advanced_value_binder.php
similarity index 100%
rename from samples/Basic/29_Advanced_value_binder.php
rename to samples/Basic2/29_Advanced_value_binder.php
diff --git a/samples/Basic/30_Template.php b/samples/Basic3/30_Template.php
similarity index 100%
rename from samples/Basic/30_Template.php
rename to samples/Basic3/30_Template.php
diff --git a/samples/Basic/30_Templatebiff5.php b/samples/Basic3/30_Templatebiff5.php
similarity index 100%
rename from samples/Basic/30_Templatebiff5.php
rename to samples/Basic3/30_Templatebiff5.php
diff --git a/samples/Basic/31_Document_properties_write.php b/samples/Basic3/31_Document_properties_write.php
similarity index 100%
rename from samples/Basic/31_Document_properties_write.php
rename to samples/Basic3/31_Document_properties_write.php
diff --git a/samples/Basic/31_Document_properties_write_xls.php b/samples/Basic3/31_Document_properties_write_xls.php
similarity index 100%
rename from samples/Basic/31_Document_properties_write_xls.php
rename to samples/Basic3/31_Document_properties_write_xls.php
diff --git a/samples/Basic/37_Page_layout_view.php b/samples/Basic3/37_Page_layout_view.php
similarity index 100%
rename from samples/Basic/37_Page_layout_view.php
rename to samples/Basic3/37_Page_layout_view.php
diff --git a/samples/Basic/38_Clone_worksheet.php b/samples/Basic3/38_Clone_worksheet.php
similarity index 100%
rename from samples/Basic/38_Clone_worksheet.php
rename to samples/Basic3/38_Clone_worksheet.php
diff --git a/samples/Basic/39_Dropdown.php b/samples/Basic3/39_Dropdown.php
similarity index 100%
rename from samples/Basic/39_Dropdown.php
rename to samples/Basic3/39_Dropdown.php
diff --git a/samples/Basic/data/continents/Africa.txt b/samples/Basic3/data/continents/Africa.txt
similarity index 100%
rename from samples/Basic/data/continents/Africa.txt
rename to samples/Basic3/data/continents/Africa.txt
diff --git a/samples/Basic/data/continents/Asia.txt b/samples/Basic3/data/continents/Asia.txt
similarity index 100%
rename from samples/Basic/data/continents/Asia.txt
rename to samples/Basic3/data/continents/Asia.txt
diff --git a/samples/Basic/data/continents/Europe.txt b/samples/Basic3/data/continents/Europe.txt
similarity index 100%
rename from samples/Basic/data/continents/Europe.txt
rename to samples/Basic3/data/continents/Europe.txt
diff --git a/samples/Basic/data/continents/North America.txt b/samples/Basic3/data/continents/North America.txt
similarity index 100%
rename from samples/Basic/data/continents/North America.txt
rename to samples/Basic3/data/continents/North America.txt
diff --git a/samples/Basic/data/continents/Oceania.txt b/samples/Basic3/data/continents/Oceania.txt
similarity index 100%
rename from samples/Basic/data/continents/Oceania.txt
rename to samples/Basic3/data/continents/Oceania.txt
diff --git a/samples/Basic/data/continents/South America.txt b/samples/Basic3/data/continents/South America.txt
similarity index 100%
rename from samples/Basic/data/continents/South America.txt
rename to samples/Basic3/data/continents/South America.txt
diff --git a/samples/Basic/40_Duplicate_style.php b/samples/Basic4/40_Duplicate_style.php
similarity index 100%
rename from samples/Basic/40_Duplicate_style.php
rename to samples/Basic4/40_Duplicate_style.php
diff --git a/samples/Basic/41_Password.php b/samples/Basic4/41_Password.php
similarity index 100%
rename from samples/Basic/41_Password.php
rename to samples/Basic4/41_Password.php
diff --git a/samples/Basic/42_RichText.php b/samples/Basic4/42_RichText.php
similarity index 100%
rename from samples/Basic/42_RichText.php
rename to samples/Basic4/42_RichText.php
diff --git a/samples/Basic/43_Merge_workbooks.php b/samples/Basic4/43_Merge_workbooks.php
similarity index 100%
rename from samples/Basic/43_Merge_workbooks.php
rename to samples/Basic4/43_Merge_workbooks.php
diff --git a/samples/Basic/44_Worksheet_info.php b/samples/Basic4/44_Worksheet_info.php
similarity index 100%
rename from samples/Basic/44_Worksheet_info.php
rename to samples/Basic4/44_Worksheet_info.php
diff --git a/samples/Basic/45_Quadratic_equation_solver.php b/samples/Basic4/45_Quadratic_equation_solver.php
similarity index 100%
rename from samples/Basic/45_Quadratic_equation_solver.php
rename to samples/Basic4/45_Quadratic_equation_solver.php
diff --git a/samples/Basic/46_ReadHtml.php b/samples/Basic4/46_ReadHtml.php
similarity index 100%
rename from samples/Basic/46_ReadHtml.php
rename to samples/Basic4/46_ReadHtml.php
diff --git a/samples/Basic/47_xlsfill.php b/samples/Basic4/47_xlsfill.php
similarity index 100%
rename from samples/Basic/47_xlsfill.php
rename to samples/Basic4/47_xlsfill.php
diff --git a/samples/Basic/47_xlsxfill.php b/samples/Basic4/47_xlsxfill.php
similarity index 100%
rename from samples/Basic/47_xlsxfill.php
rename to samples/Basic4/47_xlsxfill.php
diff --git a/samples/Basic/48_Image_move_size_with_cells.php b/samples/Basic4/48_Image_move_size_with_cells.php
similarity index 100%
rename from samples/Basic/48_Image_move_size_with_cells.php
rename to samples/Basic4/48_Image_move_size_with_cells.php
diff --git a/samples/Basic/49_alignment.php b/samples/Basic4/49_alignment.php
similarity index 100%
rename from samples/Basic/49_alignment.php
rename to samples/Basic4/49_alignment.php
diff --git a/samples/Basic/50_xlsverticalbreak.php b/samples/Basic4/50_xlsverticalbreak.php
similarity index 100%
rename from samples/Basic/50_xlsverticalbreak.php
rename to samples/Basic4/50_xlsverticalbreak.php
diff --git a/samples/Calculations/Engineering/BITAND.php b/samples/Bitwise/BITAND.php
similarity index 100%
rename from samples/Calculations/Engineering/BITAND.php
rename to samples/Bitwise/BITAND.php
diff --git a/samples/Calculations/Engineering/BITLSHIFT.php b/samples/Bitwise/BITLSHIFT.php
similarity index 100%
rename from samples/Calculations/Engineering/BITLSHIFT.php
rename to samples/Bitwise/BITLSHIFT.php
diff --git a/samples/Calculations/Engineering/BITOR.php b/samples/Bitwise/BITOR.php
similarity index 100%
rename from samples/Calculations/Engineering/BITOR.php
rename to samples/Bitwise/BITOR.php
diff --git a/samples/Calculations/Engineering/BITRSHIFT.php b/samples/Bitwise/BITRSHIFT.php
similarity index 100%
rename from samples/Calculations/Engineering/BITRSHIFT.php
rename to samples/Bitwise/BITRSHIFT.php
diff --git a/samples/Calculations/Engineering/BITXOR.php b/samples/Bitwise/BITXOR.php
similarity index 100%
rename from samples/Calculations/Engineering/BITXOR.php
rename to samples/Bitwise/BITXOR.php
diff --git a/samples/Chart/33_Chart_create_area.php b/samples/Chart33a/33_Chart_create_area.php
similarity index 100%
rename from samples/Chart/33_Chart_create_area.php
rename to samples/Chart33a/33_Chart_create_area.php
diff --git a/samples/Chart/33_Chart_create_area_2.php b/samples/Chart33a/33_Chart_create_area_2.php
similarity index 100%
rename from samples/Chart/33_Chart_create_area_2.php
rename to samples/Chart33a/33_Chart_create_area_2.php
diff --git a/samples/Chart/33_Chart_create_bar.php b/samples/Chart33a/33_Chart_create_bar.php
similarity index 100%
rename from samples/Chart/33_Chart_create_bar.php
rename to samples/Chart33a/33_Chart_create_bar.php
diff --git a/samples/Chart/33_Chart_create_bar_custom_colors.php b/samples/Chart33a/33_Chart_create_bar_custom_colors.php
similarity index 100%
rename from samples/Chart/33_Chart_create_bar_custom_colors.php
rename to samples/Chart33a/33_Chart_create_bar_custom_colors.php
diff --git a/samples/Chart/33_Chart_create_bar_labels_lines.php b/samples/Chart33a/33_Chart_create_bar_labels_lines.php
similarity index 100%
rename from samples/Chart/33_Chart_create_bar_labels_lines.php
rename to samples/Chart33a/33_Chart_create_bar_labels_lines.php
diff --git a/samples/Chart/33_Chart_create_bar_stacked.php b/samples/Chart33a/33_Chart_create_bar_stacked.php
similarity index 100%
rename from samples/Chart/33_Chart_create_bar_stacked.php
rename to samples/Chart33a/33_Chart_create_bar_stacked.php
diff --git a/samples/Chart/33_Chart_create_bubble.php b/samples/Chart33a/33_Chart_create_bubble.php
similarity index 100%
rename from samples/Chart/33_Chart_create_bubble.php
rename to samples/Chart33a/33_Chart_create_bubble.php
diff --git a/samples/Chart/33_Chart_create_column.php b/samples/Chart33a/33_Chart_create_column.php
similarity index 100%
rename from samples/Chart/33_Chart_create_column.php
rename to samples/Chart33a/33_Chart_create_column.php
diff --git a/samples/Chart/33_Chart_create_column_2.php b/samples/Chart33a/33_Chart_create_column_2.php
similarity index 100%
rename from samples/Chart/33_Chart_create_column_2.php
rename to samples/Chart33a/33_Chart_create_column_2.php
diff --git a/samples/Chart/33_Chart_create_composite.alternate.php b/samples/Chart33a/33_Chart_create_composite.alternate.php
similarity index 100%
rename from samples/Chart/33_Chart_create_composite.alternate.php
rename to samples/Chart33a/33_Chart_create_composite.alternate.php
diff --git a/samples/Chart/33_Chart_create_composite.php b/samples/Chart33a/33_Chart_create_composite.php
similarity index 100%
rename from samples/Chart/33_Chart_create_composite.php
rename to samples/Chart33a/33_Chart_create_composite.php
diff --git a/samples/Chart/33_Chart_create_line.php b/samples/Chart33a/33_Chart_create_line.php
similarity index 100%
rename from samples/Chart/33_Chart_create_line.php
rename to samples/Chart33a/33_Chart_create_line.php
diff --git a/samples/Chart/33_Chart_create_line_dateaxis.php b/samples/Chart33a/33_Chart_create_line_dateaxis.php
similarity index 100%
rename from samples/Chart/33_Chart_create_line_dateaxis.php
rename to samples/Chart33a/33_Chart_create_line_dateaxis.php
diff --git a/samples/Chart/33_Chart_create_multiple_charts.php b/samples/Chart33b/33_Chart_create_multiple_charts.php
similarity index 100%
rename from samples/Chart/33_Chart_create_multiple_charts.php
rename to samples/Chart33b/33_Chart_create_multiple_charts.php
diff --git a/samples/Chart/33_Chart_create_pie.php b/samples/Chart33b/33_Chart_create_pie.php
similarity index 100%
rename from samples/Chart/33_Chart_create_pie.php
rename to samples/Chart33b/33_Chart_create_pie.php
diff --git a/samples/Chart/33_Chart_create_pie_custom_colors.php b/samples/Chart33b/33_Chart_create_pie_custom_colors.php
similarity index 100%
rename from samples/Chart/33_Chart_create_pie_custom_colors.php
rename to samples/Chart33b/33_Chart_create_pie_custom_colors.php
diff --git a/samples/Chart/33_Chart_create_radar.php b/samples/Chart33b/33_Chart_create_radar.php
similarity index 100%
rename from samples/Chart/33_Chart_create_radar.php
rename to samples/Chart33b/33_Chart_create_radar.php
diff --git a/samples/Chart/33_Chart_create_scatter.php b/samples/Chart33b/33_Chart_create_scatter.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter.php
rename to samples/Chart33b/33_Chart_create_scatter.php
diff --git a/samples/Chart/33_Chart_create_scatter2.php b/samples/Chart33b/33_Chart_create_scatter2.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter2.php
rename to samples/Chart33b/33_Chart_create_scatter2.php
diff --git a/samples/Chart/33_Chart_create_scatter3.php b/samples/Chart33b/33_Chart_create_scatter3.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter3.php
rename to samples/Chart33b/33_Chart_create_scatter3.php
diff --git a/samples/Chart/33_Chart_create_scatter4.php b/samples/Chart33b/33_Chart_create_scatter4.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter4.php
rename to samples/Chart33b/33_Chart_create_scatter4.php
diff --git a/samples/Chart/33_Chart_create_scatter5_trendlines.php b/samples/Chart33b/33_Chart_create_scatter5_trendlines.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter5_trendlines.php
rename to samples/Chart33b/33_Chart_create_scatter5_trendlines.php
diff --git a/samples/Chart/33_Chart_create_scatter6_value_xaxis.php b/samples/Chart33b/33_Chart_create_scatter6_value_xaxis.php
similarity index 100%
rename from samples/Chart/33_Chart_create_scatter6_value_xaxis.php
rename to samples/Chart33b/33_Chart_create_scatter6_value_xaxis.php
diff --git a/samples/Chart/33_Chart_create_stock.php b/samples/Chart33b/33_Chart_create_stock.php
similarity index 100%
rename from samples/Chart/33_Chart_create_stock.php
rename to samples/Chart33b/33_Chart_create_stock.php
diff --git a/samples/Chart/33_Chart_create_stock2.php b/samples/Chart33b/33_Chart_create_stock2.php
similarity index 100%
rename from samples/Chart/33_Chart_create_stock2.php
rename to samples/Chart33b/33_Chart_create_stock2.php
diff --git a/samples/Calculations/Engineering/COMPLEX.php b/samples/ComplexNumbers1/COMPLEX.php
similarity index 100%
rename from samples/Calculations/Engineering/COMPLEX.php
rename to samples/ComplexNumbers1/COMPLEX.php
diff --git a/samples/Calculations/Engineering/IMABS.php b/samples/ComplexNumbers1/IMABS.php
similarity index 100%
rename from samples/Calculations/Engineering/IMABS.php
rename to samples/ComplexNumbers1/IMABS.php
diff --git a/samples/Calculations/Engineering/IMAGINARY.php b/samples/ComplexNumbers1/IMAGINARY.php
similarity index 100%
rename from samples/Calculations/Engineering/IMAGINARY.php
rename to samples/ComplexNumbers1/IMAGINARY.php
diff --git a/samples/Calculations/Engineering/IMARGUMENT.php b/samples/ComplexNumbers1/IMARGUMENT.php
similarity index 100%
rename from samples/Calculations/Engineering/IMARGUMENT.php
rename to samples/ComplexNumbers1/IMARGUMENT.php
diff --git a/samples/Calculations/Engineering/IMCONJUGATE.php b/samples/ComplexNumbers1/IMCONJUGATE.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCONJUGATE.php
rename to samples/ComplexNumbers1/IMCONJUGATE.php
diff --git a/samples/Calculations/Engineering/IMREAL.php b/samples/ComplexNumbers1/IMREAL.php
similarity index 100%
rename from samples/Calculations/Engineering/IMREAL.php
rename to samples/ComplexNumbers1/IMREAL.php
diff --git a/samples/Calculations/Engineering/IMCOS.php b/samples/ComplexNumbers2/IMCOS.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCOS.php
rename to samples/ComplexNumbers2/IMCOS.php
diff --git a/samples/Calculations/Engineering/IMCOSH.php b/samples/ComplexNumbers2/IMCOSH.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCOSH.php
rename to samples/ComplexNumbers2/IMCOSH.php
diff --git a/samples/Calculations/Engineering/IMCOT.php b/samples/ComplexNumbers2/IMCOT.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCOT.php
rename to samples/ComplexNumbers2/IMCOT.php
diff --git a/samples/Calculations/Engineering/IMCSC.php b/samples/ComplexNumbers2/IMCSC.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCSC.php
rename to samples/ComplexNumbers2/IMCSC.php
diff --git a/samples/Calculations/Engineering/IMCSCH.php b/samples/ComplexNumbers2/IMCSCH.php
similarity index 100%
rename from samples/Calculations/Engineering/IMCSCH.php
rename to samples/ComplexNumbers2/IMCSCH.php
diff --git a/samples/Calculations/Engineering/IMDIV.php b/samples/ComplexNumbers2/IMDIV.php
similarity index 100%
rename from samples/Calculations/Engineering/IMDIV.php
rename to samples/ComplexNumbers2/IMDIV.php
diff --git a/samples/Calculations/Engineering/IMEXP.php b/samples/ComplexNumbers2/IMEXP.php
similarity index 100%
rename from samples/Calculations/Engineering/IMEXP.php
rename to samples/ComplexNumbers2/IMEXP.php
diff --git a/samples/Calculations/Engineering/IMLN.php b/samples/ComplexNumbers2/IMLN.php
similarity index 100%
rename from samples/Calculations/Engineering/IMLN.php
rename to samples/ComplexNumbers2/IMLN.php
diff --git a/samples/Calculations/Engineering/IMLOG10.php b/samples/ComplexNumbers2/IMLOG10.php
similarity index 100%
rename from samples/Calculations/Engineering/IMLOG10.php
rename to samples/ComplexNumbers2/IMLOG10.php
diff --git a/samples/Calculations/Engineering/IMLOG2.php b/samples/ComplexNumbers2/IMLOG2.php
similarity index 100%
rename from samples/Calculations/Engineering/IMLOG2.php
rename to samples/ComplexNumbers2/IMLOG2.php
diff --git a/samples/Calculations/Engineering/IMPOWER.php b/samples/ComplexNumbers3/IMPOWER.php
similarity index 100%
rename from samples/Calculations/Engineering/IMPOWER.php
rename to samples/ComplexNumbers3/IMPOWER.php
diff --git a/samples/Calculations/Engineering/IMPRODUCT.php b/samples/ComplexNumbers3/IMPRODUCT.php
similarity index 100%
rename from samples/Calculations/Engineering/IMPRODUCT.php
rename to samples/ComplexNumbers3/IMPRODUCT.php
diff --git a/samples/Calculations/Engineering/IMSEC.php b/samples/ComplexNumbers3/IMSEC.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSEC.php
rename to samples/ComplexNumbers3/IMSEC.php
diff --git a/samples/Calculations/Engineering/IMSECH.php b/samples/ComplexNumbers3/IMSECH.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSECH.php
rename to samples/ComplexNumbers3/IMSECH.php
diff --git a/samples/Calculations/Engineering/IMSIN.php b/samples/ComplexNumbers3/IMSIN.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSIN.php
rename to samples/ComplexNumbers3/IMSIN.php
diff --git a/samples/Calculations/Engineering/IMSINH.php b/samples/ComplexNumbers3/IMSINH.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSINH.php
rename to samples/ComplexNumbers3/IMSINH.php
diff --git a/samples/Calculations/Engineering/IMSQRT.php b/samples/ComplexNumbers3/IMSQRT.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSQRT.php
rename to samples/ComplexNumbers3/IMSQRT.php
diff --git a/samples/Calculations/Engineering/IMSUB.php b/samples/ComplexNumbers3/IMSUB.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSUB.php
rename to samples/ComplexNumbers3/IMSUB.php
diff --git a/samples/Calculations/Engineering/IMSUM.php b/samples/ComplexNumbers3/IMSUM.php
similarity index 100%
rename from samples/Calculations/Engineering/IMSUM.php
rename to samples/ComplexNumbers3/IMSUM.php
diff --git a/samples/Calculations/Engineering/IMTAN.php b/samples/ComplexNumbers3/IMTAN.php
similarity index 100%
rename from samples/Calculations/Engineering/IMTAN.php
rename to samples/ComplexNumbers3/IMTAN.php
diff --git a/samples/Calculations/Database/DAVERAGE.php b/samples/Database/DAVERAGE.php
similarity index 100%
rename from samples/Calculations/Database/DAVERAGE.php
rename to samples/Database/DAVERAGE.php
diff --git a/samples/Calculations/Database/DCOUNT.php b/samples/Database/DCOUNT.php
similarity index 100%
rename from samples/Calculations/Database/DCOUNT.php
rename to samples/Database/DCOUNT.php
diff --git a/samples/Calculations/Database/DCOUNTA.php b/samples/Database/DCOUNTA.php
similarity index 100%
rename from samples/Calculations/Database/DCOUNTA.php
rename to samples/Database/DCOUNTA.php
diff --git a/samples/Calculations/Database/DGET.php b/samples/Database/DGET.php
similarity index 100%
rename from samples/Calculations/Database/DGET.php
rename to samples/Database/DGET.php
diff --git a/samples/Calculations/Database/DMAX.php b/samples/Database/DMAX.php
similarity index 100%
rename from samples/Calculations/Database/DMAX.php
rename to samples/Database/DMAX.php
diff --git a/samples/Calculations/Database/DMIN.php b/samples/Database/DMIN.php
similarity index 100%
rename from samples/Calculations/Database/DMIN.php
rename to samples/Database/DMIN.php
diff --git a/samples/Calculations/Database/DPRODUCT.php b/samples/Database/DPRODUCT.php
similarity index 100%
rename from samples/Calculations/Database/DPRODUCT.php
rename to samples/Database/DPRODUCT.php
diff --git a/samples/Calculations/Database/DSTDEV.php b/samples/Database/DSTDEV.php
similarity index 100%
rename from samples/Calculations/Database/DSTDEV.php
rename to samples/Database/DSTDEV.php
diff --git a/samples/Calculations/Database/DSTDEVP.php b/samples/Database/DSTDEVP.php
similarity index 100%
rename from samples/Calculations/Database/DSTDEVP.php
rename to samples/Database/DSTDEVP.php
diff --git a/samples/Calculations/Database/DSUM.php b/samples/Database/DSUM.php
similarity index 100%
rename from samples/Calculations/Database/DSUM.php
rename to samples/Database/DSUM.php
diff --git a/samples/Calculations/Database/DVAR.php b/samples/Database/DVAR.php
similarity index 100%
rename from samples/Calculations/Database/DVAR.php
rename to samples/Database/DVAR.php
diff --git a/samples/Calculations/Database/DVARP.php b/samples/Database/DVARP.php
similarity index 100%
rename from samples/Calculations/Database/DVARP.php
rename to samples/Database/DVARP.php
diff --git a/samples/Calculations/DateTime/DATE.php b/samples/DateTime/DATE.php
similarity index 100%
rename from samples/Calculations/DateTime/DATE.php
rename to samples/DateTime/DATE.php
diff --git a/samples/Calculations/DateTime/DATEDIF.php b/samples/DateTime/DATEDIF.php
similarity index 100%
rename from samples/Calculations/DateTime/DATEDIF.php
rename to samples/DateTime/DATEDIF.php
diff --git a/samples/Calculations/DateTime/DATEVALUE.php b/samples/DateTime/DATEVALUE.php
similarity index 100%
rename from samples/Calculations/DateTime/DATEVALUE.php
rename to samples/DateTime/DATEVALUE.php
diff --git a/samples/Calculations/DateTime/DAY.php b/samples/DateTime/DAY.php
similarity index 100%
rename from samples/Calculations/DateTime/DAY.php
rename to samples/DateTime/DAY.php
diff --git a/samples/Calculations/DateTime/DAYS.php b/samples/DateTime/DAYS.php
similarity index 100%
rename from samples/Calculations/DateTime/DAYS.php
rename to samples/DateTime/DAYS.php
diff --git a/samples/Calculations/DateTime/DAYS360.php b/samples/DateTime/DAYS360.php
similarity index 100%
rename from samples/Calculations/DateTime/DAYS360.php
rename to samples/DateTime/DAYS360.php
diff --git a/samples/Calculations/DateTime/EDATE.php b/samples/DateTime/EDATE.php
similarity index 100%
rename from samples/Calculations/DateTime/EDATE.php
rename to samples/DateTime/EDATE.php
diff --git a/samples/Calculations/DateTime/EOMONTH.php b/samples/DateTime/EOMONTH.php
similarity index 100%
rename from samples/Calculations/DateTime/EOMONTH.php
rename to samples/DateTime/EOMONTH.php
diff --git a/samples/Calculations/DateTime/HOUR.php b/samples/DateTime/HOUR.php
similarity index 100%
rename from samples/Calculations/DateTime/HOUR.php
rename to samples/DateTime/HOUR.php
diff --git a/samples/Calculations/DateTime/ISOWEEKNUM.php b/samples/DateTime/ISOWEEKNUM.php
similarity index 100%
rename from samples/Calculations/DateTime/ISOWEEKNUM.php
rename to samples/DateTime/ISOWEEKNUM.php
diff --git a/samples/Calculations/DateTime/MINUTE.php b/samples/DateTime/MINUTE.php
similarity index 100%
rename from samples/Calculations/DateTime/MINUTE.php
rename to samples/DateTime/MINUTE.php
diff --git a/samples/Calculations/DateTime/MONTH.php b/samples/DateTime/MONTH.php
similarity index 100%
rename from samples/Calculations/DateTime/MONTH.php
rename to samples/DateTime/MONTH.php
diff --git a/samples/Calculations/DateTime/NETWORKDAYS.php b/samples/DateTime2/NETWORKDAYS.php
similarity index 100%
rename from samples/Calculations/DateTime/NETWORKDAYS.php
rename to samples/DateTime2/NETWORKDAYS.php
diff --git a/samples/Calculations/DateTime/NOW.php b/samples/DateTime2/NOW.php
similarity index 100%
rename from samples/Calculations/DateTime/NOW.php
rename to samples/DateTime2/NOW.php
diff --git a/samples/Calculations/DateTime/SECOND.php b/samples/DateTime2/SECOND.php
similarity index 100%
rename from samples/Calculations/DateTime/SECOND.php
rename to samples/DateTime2/SECOND.php
diff --git a/samples/Calculations/DateTime/TIME.php b/samples/DateTime2/TIME.php
similarity index 100%
rename from samples/Calculations/DateTime/TIME.php
rename to samples/DateTime2/TIME.php
diff --git a/samples/Calculations/DateTime/TIMEVALUE.php b/samples/DateTime2/TIMEVALUE.php
similarity index 100%
rename from samples/Calculations/DateTime/TIMEVALUE.php
rename to samples/DateTime2/TIMEVALUE.php
diff --git a/samples/Calculations/DateTime/TODAY.php b/samples/DateTime2/TODAY.php
similarity index 100%
rename from samples/Calculations/DateTime/TODAY.php
rename to samples/DateTime2/TODAY.php
diff --git a/samples/Calculations/DateTime/WEEKDAY.php b/samples/DateTime2/WEEKDAY.php
similarity index 100%
rename from samples/Calculations/DateTime/WEEKDAY.php
rename to samples/DateTime2/WEEKDAY.php
diff --git a/samples/Calculations/DateTime/WEEKNUM.php b/samples/DateTime2/WEEKNUM.php
similarity index 100%
rename from samples/Calculations/DateTime/WEEKNUM.php
rename to samples/DateTime2/WEEKNUM.php
diff --git a/samples/Calculations/DateTime/WORKDAY.php b/samples/DateTime2/WORKDAY.php
similarity index 100%
rename from samples/Calculations/DateTime/WORKDAY.php
rename to samples/DateTime2/WORKDAY.php
diff --git a/samples/Calculations/DateTime/YEAR.php b/samples/DateTime2/YEAR.php
similarity index 100%
rename from samples/Calculations/DateTime/YEAR.php
rename to samples/DateTime2/YEAR.php
diff --git a/samples/Calculations/DateTime/YEARFRAC.php b/samples/DateTime2/YEARFRAC.php
similarity index 100%
rename from samples/Calculations/DateTime/YEARFRAC.php
rename to samples/DateTime2/YEARFRAC.php
diff --git a/samples/Calculations/Engineering/BESSELI.php b/samples/Engineering/BESSELI.php
similarity index 100%
rename from samples/Calculations/Engineering/BESSELI.php
rename to samples/Engineering/BESSELI.php
diff --git a/samples/Calculations/Engineering/BESSELJ.php b/samples/Engineering/BESSELJ.php
similarity index 100%
rename from samples/Calculations/Engineering/BESSELJ.php
rename to samples/Engineering/BESSELJ.php
diff --git a/samples/Calculations/Engineering/BESSELK.php b/samples/Engineering/BESSELK.php
similarity index 100%
rename from samples/Calculations/Engineering/BESSELK.php
rename to samples/Engineering/BESSELK.php
diff --git a/samples/Calculations/Engineering/BESSELY.php b/samples/Engineering/BESSELY.php
similarity index 100%
rename from samples/Calculations/Engineering/BESSELY.php
rename to samples/Engineering/BESSELY.php
diff --git a/samples/Calculations/Engineering/CONVERT.php b/samples/Engineering/CONVERT.php
similarity index 100%
rename from samples/Calculations/Engineering/CONVERT.php
rename to samples/Engineering/CONVERT.php
diff --git a/samples/Calculations/Engineering/Convert-Online.php b/samples/Engineering/Convert-Online.php
similarity index 76%
rename from samples/Calculations/Engineering/Convert-Online.php
rename to samples/Engineering/Convert-Online.php
index 3d26a3f6ba..54c24e8dae 100644
--- a/samples/Calculations/Engineering/Convert-Online.php
+++ b/samples/Engineering/Convert-Online.php
@@ -14,6 +14,7 @@
 }
 
 $categories = ConvertUOM::getConversionCategories();
+$defaultCategory = $_POST['category'] ?? $categories[0];
 $units = [];
 foreach ($categories as $category) {
     $categoryUnits = ConvertUOM::getConversionCategoryUnitDetails($category)[$category];
@@ -48,7 +49,7 @@
         <label for="fromUnit" class="col-sm-2 col-form-label">From Unit</label>
         <div class="col-sm-10">
             <select name="fromUnit" class="form-select">
-                <?php foreach ($units[$_POST['category']] as $fromUnitCode => $fromUnitName) {
+                <?php foreach ($units[$defaultCategory] as $fromUnitCode => $fromUnitName) {
                     echo "<option value=\"{$fromUnitCode}\" " . ((isset($_POST['fromUnit']) && $_POST['fromUnit'] === $fromUnitCode) ? 'selected' : '') . ">{$fromUnitName}</option>", PHP_EOL;
                 } ?>
             </select>
@@ -58,7 +59,7 @@
         <label for="toUnit" class="col-sm-2 col-form-label">To Unit</label>
         <div class="col-sm-10">
             <select name="toUnit" class="form-select">
-                <?php foreach ($units[$_POST['category']] as $toUnitCode => $toUnitName) {
+                <?php foreach ($units[$defaultCategory] as $toUnitCode => $toUnitName) {
                     echo "<option value=\"{$toUnitCode}\" " . ((isset($_POST['toUnit']) && $_POST['toUnit'] === $toUnitCode) ? 'selected' : '') . ">{$toUnitName}</option>", PHP_EOL;
                 } ?>
             </select>
@@ -66,19 +67,25 @@
     </div>
     <div class="mb-3 row">
         <div class="col-sm-10">
-            <input  class="btn btn-primary" name="submit" type="submit" value="Convert"><br />
+            <input  class="btn btn-primary" name="submitx" type="submit" value="Convert"><br />
         </div>
     </div>
 </form>
 
 <?php
 /**     If the user has submitted the form, then we need to calculate the value and display the result */
-if (isset($_POST['submit'])) {
+if (isset($_POST['quantity'], $_POST['fromUnit'], $_POST['toUnit'])) {
     $quantity = $_POST['quantity'];
     $fromUnit = $_POST['fromUnit'];
     $toUnit = $_POST['toUnit'];
-    /** @var float|string */
-    $result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
+    if (isset($units[$_POST['category']][$fromUnit], $units[$_POST['category']][$toUnit])) {
+        /** @var float|string */
+        $result = ConvertUOM::CONVERT($quantity, $fromUnit, $toUnit);
 
-    echo "{$quantity} {$units[$_POST['category']][$fromUnit]} is {$result} {$units[$_POST['category']][$toUnit]}", PHP_EOL;
+        echo "{$quantity} {$units[$_POST['category']][$fromUnit]} is {$result} {$units[$_POST['category']][$toUnit]}", PHP_EOL;
+    } else {
+        echo 'Please enter quantity and select From Unit and To Unit', PHP_EOL;
+    }
+} else {
+    echo 'Please enter quantity and select From Unit and To Unit', PHP_EOL;
 }
diff --git a/samples/Calculations/Engineering/DELTA.php b/samples/Engineering/DELTA.php
similarity index 100%
rename from samples/Calculations/Engineering/DELTA.php
rename to samples/Engineering/DELTA.php
diff --git a/samples/Calculations/Engineering/ERF.php b/samples/Engineering/ERF.php
similarity index 100%
rename from samples/Calculations/Engineering/ERF.php
rename to samples/Engineering/ERF.php
diff --git a/samples/Calculations/Engineering/ERFC.php b/samples/Engineering/ERFC.php
similarity index 100%
rename from samples/Calculations/Engineering/ERFC.php
rename to samples/Engineering/ERFC.php
diff --git a/samples/Calculations/Engineering/GESTEP.php b/samples/Engineering/GESTEP.php
similarity index 100%
rename from samples/Calculations/Engineering/GESTEP.php
rename to samples/Engineering/GESTEP.php
diff --git a/samples/Calculations/Financial/ACCRINT.php b/samples/Financial1/ACCRINT.php
similarity index 100%
rename from samples/Calculations/Financial/ACCRINT.php
rename to samples/Financial1/ACCRINT.php
diff --git a/samples/Calculations/Financial/ACCRINTM.php b/samples/Financial1/ACCRINTM.php
similarity index 100%
rename from samples/Calculations/Financial/ACCRINTM.php
rename to samples/Financial1/ACCRINTM.php
diff --git a/samples/Calculations/Financial/AMORDEGRC.php b/samples/Financial1/AMORDEGRC.php
similarity index 100%
rename from samples/Calculations/Financial/AMORDEGRC.php
rename to samples/Financial1/AMORDEGRC.php
diff --git a/samples/Calculations/Financial/AMORLINC.php b/samples/Financial1/AMORLINC.php
similarity index 100%
rename from samples/Calculations/Financial/AMORLINC.php
rename to samples/Financial1/AMORLINC.php
diff --git a/samples/Calculations/Financial/COUPDAYBS.php b/samples/Financial1/COUPDAYBS.php
similarity index 100%
rename from samples/Calculations/Financial/COUPDAYBS.php
rename to samples/Financial1/COUPDAYBS.php
diff --git a/samples/Calculations/Financial/COUPDAYS.php b/samples/Financial1/COUPDAYS.php
similarity index 100%
rename from samples/Calculations/Financial/COUPDAYS.php
rename to samples/Financial1/COUPDAYS.php
diff --git a/samples/Calculations/Financial/COUPDAYSNC.php b/samples/Financial1/COUPDAYSNC.php
similarity index 100%
rename from samples/Calculations/Financial/COUPDAYSNC.php
rename to samples/Financial1/COUPDAYSNC.php
diff --git a/samples/Calculations/Financial/COUPNCD.php b/samples/Financial1/COUPNCD.php
similarity index 100%
rename from samples/Calculations/Financial/COUPNCD.php
rename to samples/Financial1/COUPNCD.php
diff --git a/samples/Calculations/Financial/COUPNUM.php b/samples/Financial1/COUPNUM.php
similarity index 100%
rename from samples/Calculations/Financial/COUPNUM.php
rename to samples/Financial1/COUPNUM.php
diff --git a/samples/Calculations/Financial/COUPPCD.php b/samples/Financial1/COUPPCD.php
similarity index 100%
rename from samples/Calculations/Financial/COUPPCD.php
rename to samples/Financial1/COUPPCD.php
diff --git a/samples/Calculations/Financial/CUMIPMT.php b/samples/Financial1/CUMIPMT.php
similarity index 100%
rename from samples/Calculations/Financial/CUMIPMT.php
rename to samples/Financial1/CUMIPMT.php
diff --git a/samples/Calculations/Financial/CUMPRINC.php b/samples/Financial1/CUMPRINC.php
similarity index 100%
rename from samples/Calculations/Financial/CUMPRINC.php
rename to samples/Financial1/CUMPRINC.php
diff --git a/samples/Calculations/Financial/DB.php b/samples/Financial2/DB.php
similarity index 100%
rename from samples/Calculations/Financial/DB.php
rename to samples/Financial2/DB.php
diff --git a/samples/Calculations/Financial/DDB.php b/samples/Financial2/DDB.php
similarity index 100%
rename from samples/Calculations/Financial/DDB.php
rename to samples/Financial2/DDB.php
diff --git a/samples/Calculations/Financial/DISC.php b/samples/Financial2/DISC.php
similarity index 100%
rename from samples/Calculations/Financial/DISC.php
rename to samples/Financial2/DISC.php
diff --git a/samples/Calculations/Financial/DOLLARDE.php b/samples/Financial2/DOLLARDE.php
similarity index 100%
rename from samples/Calculations/Financial/DOLLARDE.php
rename to samples/Financial2/DOLLARDE.php
diff --git a/samples/Calculations/Financial/DOLLARFR.php b/samples/Financial2/DOLLARFR.php
similarity index 100%
rename from samples/Calculations/Financial/DOLLARFR.php
rename to samples/Financial2/DOLLARFR.php
diff --git a/samples/Calculations/Financial/EFFECT.php b/samples/Financial2/EFFECT.php
similarity index 100%
rename from samples/Calculations/Financial/EFFECT.php
rename to samples/Financial2/EFFECT.php
diff --git a/samples/Calculations/Financial/FV.php b/samples/Financial2/FV.php
similarity index 100%
rename from samples/Calculations/Financial/FV.php
rename to samples/Financial2/FV.php
diff --git a/samples/Calculations/Financial/FVSCHEDULE.php b/samples/Financial2/FVSCHEDULE.php
similarity index 100%
rename from samples/Calculations/Financial/FVSCHEDULE.php
rename to samples/Financial2/FVSCHEDULE.php
diff --git a/samples/Calculations/Financial/INTRATE.php b/samples/Financial3/INTRATE.php
similarity index 100%
rename from samples/Calculations/Financial/INTRATE.php
rename to samples/Financial3/INTRATE.php
diff --git a/samples/Calculations/Financial/IPMT.php b/samples/Financial3/IPMT.php
similarity index 100%
rename from samples/Calculations/Financial/IPMT.php
rename to samples/Financial3/IPMT.php
diff --git a/samples/Calculations/Financial/IRR.php b/samples/Financial3/IRR.php
similarity index 100%
rename from samples/Calculations/Financial/IRR.php
rename to samples/Financial3/IRR.php
diff --git a/samples/Calculations/Financial/ISPMT.php b/samples/Financial3/ISPMT.php
similarity index 100%
rename from samples/Calculations/Financial/ISPMT.php
rename to samples/Financial3/ISPMT.php
diff --git a/samples/Calculations/Financial/MIRR.php b/samples/Financial3/MIRR.php
similarity index 100%
rename from samples/Calculations/Financial/MIRR.php
rename to samples/Financial3/MIRR.php
diff --git a/samples/Calculations/Financial/NOMINAL.php b/samples/Financial3/NOMINAL.php
similarity index 100%
rename from samples/Calculations/Financial/NOMINAL.php
rename to samples/Financial3/NOMINAL.php
diff --git a/samples/Calculations/Financial/NPER.php b/samples/Financial3/NPER.php
similarity index 100%
rename from samples/Calculations/Financial/NPER.php
rename to samples/Financial3/NPER.php
diff --git a/samples/Calculations/Financial/NPV.php b/samples/Financial3/NPV.php
similarity index 100%
rename from samples/Calculations/Financial/NPV.php
rename to samples/Financial3/NPV.php
diff --git a/samples/Calculations/Engineering/BIN2DEC.php b/samples/HexEtcConversions/BIN2DEC.php
similarity index 100%
rename from samples/Calculations/Engineering/BIN2DEC.php
rename to samples/HexEtcConversions/BIN2DEC.php
diff --git a/samples/Calculations/Engineering/BIN2HEX.php b/samples/HexEtcConversions/BIN2HEX.php
similarity index 100%
rename from samples/Calculations/Engineering/BIN2HEX.php
rename to samples/HexEtcConversions/BIN2HEX.php
diff --git a/samples/Calculations/Engineering/BIN2OCT.php b/samples/HexEtcConversions/BIN2OCT.php
similarity index 100%
rename from samples/Calculations/Engineering/BIN2OCT.php
rename to samples/HexEtcConversions/BIN2OCT.php
diff --git a/samples/Calculations/Engineering/DEC2BIN.php b/samples/HexEtcConversions/DEC2BIN.php
similarity index 100%
rename from samples/Calculations/Engineering/DEC2BIN.php
rename to samples/HexEtcConversions/DEC2BIN.php
diff --git a/samples/Calculations/Engineering/DEC2HEX.php b/samples/HexEtcConversions/DEC2HEX.php
similarity index 100%
rename from samples/Calculations/Engineering/DEC2HEX.php
rename to samples/HexEtcConversions/DEC2HEX.php
diff --git a/samples/Calculations/Engineering/DEC2OCT.php b/samples/HexEtcConversions/DEC2OCT.php
similarity index 100%
rename from samples/Calculations/Engineering/DEC2OCT.php
rename to samples/HexEtcConversions/DEC2OCT.php
diff --git a/samples/Calculations/Engineering/HEX2BIN.php b/samples/HexEtcConversions/HEX2BIN.php
similarity index 100%
rename from samples/Calculations/Engineering/HEX2BIN.php
rename to samples/HexEtcConversions/HEX2BIN.php
diff --git a/samples/Calculations/Engineering/HEX2DEC.php b/samples/HexEtcConversions/HEX2DEC.php
similarity index 100%
rename from samples/Calculations/Engineering/HEX2DEC.php
rename to samples/HexEtcConversions/HEX2DEC.php
diff --git a/samples/Calculations/Engineering/HEX2OCT.php b/samples/HexEtcConversions/HEX2OCT.php
similarity index 100%
rename from samples/Calculations/Engineering/HEX2OCT.php
rename to samples/HexEtcConversions/HEX2OCT.php
diff --git a/samples/Calculations/Engineering/OCT2BIN.php b/samples/HexEtcConversions/OCT2BIN.php
similarity index 100%
rename from samples/Calculations/Engineering/OCT2BIN.php
rename to samples/HexEtcConversions/OCT2BIN.php
diff --git a/samples/Calculations/Engineering/OCT2DEC.php b/samples/HexEtcConversions/OCT2DEC.php
similarity index 100%
rename from samples/Calculations/Engineering/OCT2DEC.php
rename to samples/HexEtcConversions/OCT2DEC.php
diff --git a/samples/Calculations/Engineering/OCT2HEX.php b/samples/HexEtcConversions/OCT2HEX.php
similarity index 100%
rename from samples/Calculations/Engineering/OCT2HEX.php
rename to samples/HexEtcConversions/OCT2HEX.php
diff --git a/samples/Calculations/LookupRef/ADDRESS.php b/samples/LookupRef/ADDRESS.php
similarity index 100%
rename from samples/Calculations/LookupRef/ADDRESS.php
rename to samples/LookupRef/ADDRESS.php
diff --git a/samples/Calculations/LookupRef/COLUMN.php b/samples/LookupRef/COLUMN.php
similarity index 100%
rename from samples/Calculations/LookupRef/COLUMN.php
rename to samples/LookupRef/COLUMN.php
diff --git a/samples/Calculations/LookupRef/COLUMNS.php b/samples/LookupRef/COLUMNS.php
similarity index 100%
rename from samples/Calculations/LookupRef/COLUMNS.php
rename to samples/LookupRef/COLUMNS.php
diff --git a/samples/Calculations/LookupRef/INDEX.php b/samples/LookupRef/INDEX.php
similarity index 100%
rename from samples/Calculations/LookupRef/INDEX.php
rename to samples/LookupRef/INDEX.php
diff --git a/samples/Calculations/LookupRef/INDIRECT.php b/samples/LookupRef/INDIRECT.php
similarity index 100%
rename from samples/Calculations/LookupRef/INDIRECT.php
rename to samples/LookupRef/INDIRECT.php
diff --git a/samples/Calculations/LookupRef/OFFSET.php b/samples/LookupRef/OFFSET.php
similarity index 100%
rename from samples/Calculations/LookupRef/OFFSET.php
rename to samples/LookupRef/OFFSET.php
diff --git a/samples/Calculations/LookupRef/ROW.php b/samples/LookupRef/ROW.php
similarity index 100%
rename from samples/Calculations/LookupRef/ROW.php
rename to samples/LookupRef/ROW.php
diff --git a/samples/Calculations/LookupRef/ROWS.php b/samples/LookupRef/ROWS.php
similarity index 100%
rename from samples/Calculations/LookupRef/ROWS.php
rename to samples/LookupRef/ROWS.php
diff --git a/samples/Calculations/LookupRef/VLOOKUP.php b/samples/LookupRef/VLOOKUP.php
similarity index 100%
rename from samples/Calculations/LookupRef/VLOOKUP.php
rename to samples/LookupRef/VLOOKUP.php
diff --git a/samples/Reader/13_Simple_file_reader_for_multiple_CSV_files.php b/samples/Reader2/13_Simple_file_reader_for_multiple_CSV_files.php
similarity index 100%
rename from samples/Reader/13_Simple_file_reader_for_multiple_CSV_files.php
rename to samples/Reader2/13_Simple_file_reader_for_multiple_CSV_files.php
diff --git a/samples/Reader/14_Reading_a_large_CSV_file_in_chunks_to_split_across_multiple_worksheets.php b/samples/Reader2/14_Reading_a_large_CSV_file_in_chunks_to_split_across_multiple_worksheets.php
similarity index 100%
rename from samples/Reader/14_Reading_a_large_CSV_file_in_chunks_to_split_across_multiple_worksheets.php
rename to samples/Reader2/14_Reading_a_large_CSV_file_in_chunks_to_split_across_multiple_worksheets.php
diff --git a/samples/Reader/15_Simple_file_reader_for_tab_separated_value_file_using_the_Advanced_Value_Binder.php b/samples/Reader2/15_Simple_file_reader_for_tab_separated_value_file_using_the_Advanced_Value_Binder.php
similarity index 100%
rename from samples/Reader/15_Simple_file_reader_for_tab_separated_value_file_using_the_Advanced_Value_Binder.php
rename to samples/Reader2/15_Simple_file_reader_for_tab_separated_value_file_using_the_Advanced_Value_Binder.php
diff --git a/samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php b/samples/Reader2/16_Handling_loader_exceptions_using_TryCatch.php
similarity index 100%
rename from samples/Reader/16_Handling_loader_exceptions_using_TryCatch.php
rename to samples/Reader2/16_Handling_loader_exceptions_using_TryCatch.php
diff --git a/samples/Reader/17_Simple_file_reader_loading_several_named_worksheets.php b/samples/Reader2/17_Simple_file_reader_loading_several_named_worksheets.php
similarity index 100%
rename from samples/Reader/17_Simple_file_reader_loading_several_named_worksheets.php
rename to samples/Reader2/17_Simple_file_reader_loading_several_named_worksheets.php
diff --git a/samples/Reader/18_Reading_list_of_worksheets_without_loading_entire_file.php b/samples/Reader2/18_Reading_list_of_worksheets_without_loading_entire_file.php
similarity index 100%
rename from samples/Reader/18_Reading_list_of_worksheets_without_loading_entire_file.php
rename to samples/Reader2/18_Reading_list_of_worksheets_without_loading_entire_file.php
diff --git a/samples/Reader/19_Reading_worksheet_information_without_loading_entire_file.php b/samples/Reader2/19_Reading_worksheet_information_without_loading_entire_file.php
similarity index 100%
rename from samples/Reader/19_Reading_worksheet_information_without_loading_entire_file.php
rename to samples/Reader2/19_Reading_worksheet_information_without_loading_entire_file.php
diff --git a/samples/Reader/20_Reader_worksheet_hyperlink_image.php b/samples/Reader2/20_Reader_worksheet_hyperlink_image.php
similarity index 100%
rename from samples/Reader/20_Reader_worksheet_hyperlink_image.php
rename to samples/Reader2/20_Reader_worksheet_hyperlink_image.php
diff --git a/samples/Reader/21_Reader_CSV_Long_Integers_with_String_Value_Binder.php b/samples/Reader2/21_Reader_CSV_Long_Integers_with_String_Value_Binder.php
similarity index 100%
rename from samples/Reader/21_Reader_CSV_Long_Integers_with_String_Value_Binder.php
rename to samples/Reader2/21_Reader_CSV_Long_Integers_with_String_Value_Binder.php
diff --git a/samples/Reader/22_Reader_formscomments.php b/samples/Reader2/22_Reader_formscomments.php
similarity index 100%
rename from samples/Reader/22_Reader_formscomments.php
rename to samples/Reader2/22_Reader_formscomments.php
diff --git a/samples/Reader/22_Reader_issue1767.php b/samples/Reader2/22_Reader_issue1767.php
similarity index 100%
rename from samples/Reader/22_Reader_issue1767.php
rename to samples/Reader2/22_Reader_issue1767.php
diff --git a/samples/Reader/sampleData/example1.csv b/samples/Reader2/sampleData/example1.csv
similarity index 100%
rename from samples/Reader/sampleData/example1.csv
rename to samples/Reader2/sampleData/example1.csv
diff --git a/samples/Reader/sampleData/example1.tsv b/samples/Reader2/sampleData/example1.tsv
similarity index 100%
rename from samples/Reader/sampleData/example1.tsv
rename to samples/Reader2/sampleData/example1.tsv
diff --git a/samples/Reader2/sampleData/example1.xls b/samples/Reader2/sampleData/example1.xls
new file mode 100644
index 0000000000..5f7eb47a4a
Binary files /dev/null and b/samples/Reader2/sampleData/example1.xls differ
diff --git a/samples/Reader/sampleData/example2.csv b/samples/Reader2/sampleData/example2.csv
similarity index 100%
rename from samples/Reader/sampleData/example2.csv
rename to samples/Reader2/sampleData/example2.csv
diff --git a/samples/Reader/sampleData/formscomments.xlsx b/samples/Reader2/sampleData/formscomments.xlsx
similarity index 100%
rename from samples/Reader/sampleData/formscomments.xlsx
rename to samples/Reader2/sampleData/formscomments.xlsx
diff --git a/samples/Reader/sampleData/issue.1767.xlsx b/samples/Reader2/sampleData/issue.1767.xlsx
similarity index 100%
rename from samples/Reader/sampleData/issue.1767.xlsx
rename to samples/Reader2/sampleData/issue.1767.xlsx
diff --git a/samples/Reader/sampleData/longIntegers.csv b/samples/Reader2/sampleData/longIntegers.csv
similarity index 100%
rename from samples/Reader/sampleData/longIntegers.csv
rename to samples/Reader2/sampleData/longIntegers.csv
diff --git a/samples/bootstrap/css/phpspreadsheet.css b/samples/bootstrap/css/phpspreadsheet.css
index 5ea3734260..192148d9c9 100644
--- a/samples/bootstrap/css/phpspreadsheet.css
+++ b/samples/bootstrap/css/phpspreadsheet.css
@@ -5,6 +5,9 @@ body {
 .navbar {
     margin-bottom: 20px;
 }
+.navbar + h1 {
+    margin-top: 70px;
+}
 .passed {
     color: #339900;
 }
diff --git a/tests/PhpSpreadsheetTests/IOFactoryTest.php b/tests/PhpSpreadsheetTests/IOFactoryTest.php
index b8283ba2df..f123ae5009 100644
--- a/tests/PhpSpreadsheetTests/IOFactoryTest.php
+++ b/tests/PhpSpreadsheetTests/IOFactoryTest.php
@@ -192,14 +192,14 @@ public function testCreateInvalidReader(): void
 
     public function testCreateReaderUnknownExtension(): void
     {
-        $filename = 'samples/Reader/sampleData/example1.tsv';
+        $filename = 'samples/Reader2/sampleData/example1.tsv';
         $reader = IOFactory::createReaderForFile($filename);
         self::assertEquals('PhpOffice\\PhpSpreadsheet\\Reader\\Csv', $reader::class);
     }
 
     public function testCreateReaderCsvExtension(): void
     {
-        $filename = 'samples/Reader/sampleData/example1.csv';
+        $filename = 'samples/Reader2/sampleData/example1.csv';
         $reader = IOFactory::createReaderForFile($filename);
         self::assertEquals('PhpOffice\\PhpSpreadsheet\\Reader\\Csv', $reader::class);
     }
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
index 148a30cf51..6ad9bb79b0 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvContiguousTest.php
@@ -10,7 +10,7 @@
 
 class CsvContiguousTest extends TestCase
 {
-    private string $inputFileName = 'samples/Reader/sampleData/example2.csv';
+    private string $inputFileName = 'samples/Reader2/sampleData/example2.csv';
 
     public function testContiguous(): void
     {
diff --git a/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php b/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
index 335702cb9e..6ce2d23d4c 100644
--- a/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
+++ b/tests/PhpSpreadsheetTests/Reader/Csv/CsvTest.php
@@ -61,13 +61,13 @@ public static function providerDelimiterDetection(): array
                 'Number of items with weight <= 50kg',
             ],
             [
-                'samples/Reader/sampleData/example1.csv',
+                'samples/Reader2/sampleData/example1.csv',
                 ',',
                 'I4',
                 '100%',
             ],
             [
-                'samples/Reader/sampleData/example2.csv',
+                'samples/Reader2/sampleData/example2.csv',
                 ',',
                 'D8',
                 -58.373161,
@@ -107,8 +107,8 @@ public static function providerCanLoad(): array
             [true, 'tests/data/Reader/CSV/csv_without_extension'],
             [true, 'tests/data/Reader/HTML/csv_with_angle_bracket.csv'],
             [true, 'tests/data/Reader/CSV/empty.csv'],
-            [true, 'samples/Reader/sampleData/example1.csv'],
-            [true, 'samples/Reader/sampleData/example2.csv'],
+            [true, 'samples/Reader2/sampleData/example1.csv'],
+            [true, 'samples/Reader2/sampleData/example2.csv'],
         ];
     }