diff --git a/samples/add_comments.cpp b/samples/add_comments.cpp
new file mode 100644
index 00000000..ddae8427
--- /dev/null
+++ b/samples/add_comments.cpp
@@ -0,0 +1 @@
+add_comments.cpp
\ No newline at end of file
diff --git a/samples/basic_conditional_formatting.cpp b/samples/basic_conditional_formatting.cpp
new file mode 100644
index 00000000..f5358dbc
--- /dev/null
+++ b/samples/basic_conditional_formatting.cpp
@@ -0,0 +1 @@
+basic_conditional_formatting.cpp
\ No newline at end of file
diff --git a/samples/comment_error.cpp b/samples/comment_error.cpp
new file mode 100644
index 00000000..6899f521
--- /dev/null
+++ b/samples/comment_error.cpp
@@ -0,0 +1 @@
+comment_error.cpp
\ No newline at end of file
diff --git a/samples/copy_style.cpp b/samples/copy_style.cpp
new file mode 100644
index 00000000..1887d2a8
--- /dev/null
+++ b/samples/copy_style.cpp
@@ -0,0 +1 @@
+copy_style.cpp
\ No newline at end of file
diff --git a/samples/sample1.xlsx b/samples/data/sample1.xlsx
similarity index 100%
rename from samples/sample1.xlsx
rename to samples/data/sample1.xlsx
diff --git a/samples/default_styles.cpp b/samples/default_styles.cpp
new file mode 100644
index 00000000..7d8d0602
--- /dev/null
+++ b/samples/default_styles.cpp
@@ -0,0 +1 @@
+default_styles.cpp
\ No newline at end of file
diff --git a/samples/font_legacy_colors.cpp b/samples/font_legacy_colors.cpp
new file mode 100644
index 00000000..270ba3da
--- /dev/null
+++ b/samples/font_legacy_colors.cpp
@@ -0,0 +1 @@
+font_legacy_colors.cpp
\ No newline at end of file
diff --git a/samples/font_rgb_colors.cpp b/samples/font_rgb_colors.cpp
new file mode 100644
index 00000000..881a4fee
--- /dev/null
+++ b/samples/font_rgb_colors.cpp
@@ -0,0 +1 @@
+font_rgb_colors.cpp
\ No newline at end of file
diff --git a/samples/group_columns.cpp b/samples/group_columns.cpp
new file mode 100644
index 00000000..39a00282
--- /dev/null
+++ b/samples/group_columns.cpp
@@ -0,0 +1 @@
+group_columns.cpp
\ No newline at end of file
diff --git a/samples/header_footer.cpp b/samples/header_footer.cpp
new file mode 100644
index 00000000..8282c828
--- /dev/null
+++ b/samples/header_footer.cpp
@@ -0,0 +1 @@
+header_footer.cpp
\ No newline at end of file
diff --git a/samples/image.cpp b/samples/image.cpp
new file mode 100644
index 00000000..d047359c
--- /dev/null
+++ b/samples/image.cpp
@@ -0,0 +1 @@
+image.cpp
\ No newline at end of file
diff --git a/samples/merge_unmerge.cpp b/samples/merge_unmerge.cpp
new file mode 100644
index 00000000..a95748d8
--- /dev/null
+++ b/samples/merge_unmerge.cpp
@@ -0,0 +1 @@
+merge_unmerge.cpp
\ No newline at end of file
diff --git a/samples/page_setup.cpp b/samples/page_setup.cpp
new file mode 100644
index 00000000..07db4da0
--- /dev/null
+++ b/samples/page_setup.cpp
@@ -0,0 +1 @@
+page_setup.cpp
\ No newline at end of file
diff --git a/samples/parse_formulae.cpp b/samples/parse_formulae.cpp
new file mode 100644
index 00000000..fc3279b9
--- /dev/null
+++ b/samples/parse_formulae.cpp
@@ -0,0 +1 @@
+parse_formulae.cpp
\ No newline at end of file
diff --git a/samples/print_options.cpp b/samples/print_options.cpp
new file mode 100644
index 00000000..ae580894
--- /dev/null
+++ b/samples/print_options.cpp
@@ -0,0 +1 @@
+print_options.cpp
\ No newline at end of file
diff --git a/samples/sample1.cpp b/samples/read.cpp
similarity index 100%
rename from samples/sample1.cpp
rename to samples/read.cpp
diff --git a/samples/row_column_style.cpp b/samples/row_column_style.cpp
new file mode 100644
index 00000000..5a34070e
--- /dev/null
+++ b/samples/row_column_style.cpp
@@ -0,0 +1 @@
+row_column_style.cpp
\ No newline at end of file
diff --git a/samples/sample.cpp b/samples/sample.cpp
new file mode 100644
index 00000000..b20572d1
--- /dev/null
+++ b/samples/sample.cpp
@@ -0,0 +1 @@
+sample.cpp
\ No newline at end of file
diff --git a/samples/style_application.cpp b/samples/style_application.cpp
new file mode 100644
index 00000000..2fbdef10
--- /dev/null
+++ b/samples/style_application.cpp
@@ -0,0 +1 @@
+style_application.cpp
\ No newline at end of file
diff --git a/samples/style_side_effects.cpp b/samples/style_side_effects.cpp
new file mode 100644
index 00000000..251f729c
--- /dev/null
+++ b/samples/style_side_effects.cpp
@@ -0,0 +1 @@
+style_side_effects.cpp
\ No newline at end of file
diff --git a/samples/using_formulae.cpp b/samples/using_formulae.cpp
new file mode 100644
index 00000000..b58b45d9
--- /dev/null
+++ b/samples/using_formulae.cpp
@@ -0,0 +1 @@
+using_formulae.cpp
\ No newline at end of file
diff --git a/samples/using_number_formats.cpp b/samples/using_number_formats.cpp
new file mode 100644
index 00000000..7bbca600
--- /dev/null
+++ b/samples/using_number_formats.cpp
@@ -0,0 +1 @@
+using_number_formats.cpp
\ No newline at end of file
diff --git a/samples/validate_cells.cpp b/samples/validate_cells.cpp
new file mode 100644
index 00000000..7d576057
--- /dev/null
+++ b/samples/validate_cells.cpp
@@ -0,0 +1 @@
+validate_cells.cpp
\ No newline at end of file
diff --git a/samples/worksheet_properties.cpp b/samples/worksheet_properties.cpp
new file mode 100644
index 00000000..cf416d42
--- /dev/null
+++ b/samples/worksheet_properties.cpp
@@ -0,0 +1 @@
+worksheet_properties.cpp
\ No newline at end of file
diff --git a/samples/sample2.cpp b/samples/write.cpp
similarity index 100%
rename from samples/sample2.cpp
rename to samples/write.cpp
diff --git a/samples/xltm_to_xlsx.cpp b/samples/xltm_to_xlsx.cpp
new file mode 100644
index 00000000..1df53519
--- /dev/null
+++ b/samples/xltm_to_xlsx.cpp
@@ -0,0 +1 @@
+xltm_to_xlsx.cpp
\ No newline at end of file
diff --git a/samples/xltx_to_xlsx.cpp b/samples/xltx_to_xlsx.cpp
new file mode 100644
index 00000000..c1b80077
--- /dev/null
+++ b/samples/xltx_to_xlsx.cpp
@@ -0,0 +1 @@
+xltx_to_xlsx.cpp
\ No newline at end of file
diff --git a/tests/data/reader/formatting.xlsx b/tests/data/reader/formatting.xlsx
new file mode 100644
index 00000000..e6acaef7
Binary files /dev/null and b/tests/data/reader/formatting.xlsx differ