diff --git a/Example/Get Module Configuration Example/Get Module Configuration Example.vi b/Example/Get Module Configuration Example/0. Using within CSM - Get Module Configuration.vi
similarity index 58%
rename from Example/Get Module Configuration Example/Get Module Configuration Example.vi
rename to Example/Get Module Configuration Example/0. Using within CSM - Get Module Configuration.vi
index 96250fc..94247d3 100644
Binary files a/Example/Get Module Configuration Example/Get Module Configuration Example.vi and b/Example/Get Module Configuration Example/0. Using within CSM - Get Module Configuration.vi differ
diff --git a/Example/Get Module Configuration Example/SubModule.vi b/Example/Get Module Configuration Example/SubModule.vi
index 72dc352..e9cb6f5 100644
Binary files a/Example/Get Module Configuration Example/SubModule.vi and b/Example/Get Module Configuration Example/SubModule.vi differ
diff --git a/Example/String to Enum Example.vi b/Example/String to Enum Example.vi
deleted file mode 100644
index 2520978..0000000
Binary files a/Example/String to Enum Example.vi and /dev/null differ
diff --git a/Example/String(Float with Unit) To Float Example.vi b/Example/String(Float with Unit) To Float Example.vi
deleted file mode 100644
index df62dfd..0000000
Binary files a/Example/String(Float with Unit) To Float Example.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/1. CSM API String to Typical data types.vi b/Example/Supported Datatype Examples/1. CSM API String to Typical data types.vi
new file mode 100644
index 0000000..5306e43
Binary files /dev/null and b/Example/Supported Datatype Examples/1. CSM API String to Typical data types.vi differ
diff --git a/Example/Supported Datatype Examples/2. Typical data types to CSM API String.vi b/Example/Supported Datatype Examples/2. Typical data types to CSM API String.vi
new file mode 100644
index 0000000..51d06df
Binary files /dev/null and b/Example/Supported Datatype Examples/2. Typical data types to CSM API String.vi differ
diff --git a/Example/Supported Datatype Examples/3. Incorrect usage collections.vi b/Example/Supported Datatype Examples/3. Incorrect usage collections.vi
new file mode 100644
index 0000000..d40e2ed
Binary files /dev/null and b/Example/Supported Datatype Examples/3. Incorrect usage collections.vi differ
diff --git a/Example/Supported Datatype Examples/Test Cases - float.vi b/Example/Supported Datatype Examples/4.1 CSM API String to Float.vi
similarity index 55%
rename from Example/Supported Datatype Examples/Test Cases - float.vi
rename to Example/Supported Datatype Examples/4.1 CSM API String to Float.vi
index 1a7322b..644c03d 100644
Binary files a/Example/Supported Datatype Examples/Test Cases - float.vi and b/Example/Supported Datatype Examples/4.1 CSM API String to Float.vi differ
diff --git a/Example/Supported Datatype Examples/4.2. CSM API String (Float with Unit) to Float.vi b/Example/Supported Datatype Examples/4.2. CSM API String (Float with Unit) to Float.vi
new file mode 100644
index 0000000..79ef6ad
Binary files /dev/null and b/Example/Supported Datatype Examples/4.2. CSM API String (Float with Unit) to Float.vi differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Complex.vi b/Example/Supported Datatype Examples/4.3 CSM API String to Complex Numeric.vi
similarity index 62%
rename from Example/Supported Datatype Examples/Test Cases - Complex.vi
rename to Example/Supported Datatype Examples/4.3 CSM API String to Complex Numeric.vi
index b3f53c2..bea47f7 100644
Binary files a/Example/Supported Datatype Examples/Test Cases - Complex.vi and b/Example/Supported Datatype Examples/4.3 CSM API String to Complex Numeric.vi differ
diff --git a/Example/Supported Datatype Examples/4.4 CSM API String to TimeStamp.vi b/Example/Supported Datatype Examples/4.4 CSM API String to TimeStamp.vi
new file mode 100644
index 0000000..c9f93f6
Binary files /dev/null and b/Example/Supported Datatype Examples/4.4 CSM API String to TimeStamp.vi differ
diff --git a/Example/Supported Datatype Examples/4.5 CSM API String to Enum(special format).vi b/Example/Supported Datatype Examples/4.5 CSM API String to Enum(special format).vi
new file mode 100644
index 0000000..5470513
Binary files /dev/null and b/Example/Supported Datatype Examples/4.5 CSM API String to Enum(special format).vi differ
diff --git a/Example/Supported Datatype Examples/5.1 CSM API String to Array.vi b/Example/Supported Datatype Examples/5.1 CSM API String to Array.vi
new file mode 100644
index 0000000..124ae8d
Binary files /dev/null and b/Example/Supported Datatype Examples/5.1 CSM API String to Array.vi differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Array Contains Cluster with Array.vi b/Example/Supported Datatype Examples/5.2 1D-Cluster to CSM API String.vi
similarity index 54%
rename from Example/Supported Datatype Examples/Test Cases - Array Contains Cluster with Array.vi
rename to Example/Supported Datatype Examples/5.2 1D-Cluster to CSM API String.vi
index 4db2c18..b82bf2a 100644
Binary files a/Example/Supported Datatype Examples/Test Cases - Array Contains Cluster with Array.vi and b/Example/Supported Datatype Examples/5.2 1D-Cluster to CSM API String.vi differ
diff --git a/Example/Supported Datatype Examples/Test Cases - 2D Cluster Array.vi b/Example/Supported Datatype Examples/5.3 2D-Cluster to CSM API String.vi
similarity index 59%
rename from Example/Supported Datatype Examples/Test Cases - 2D Cluster Array.vi
rename to Example/Supported Datatype Examples/5.3 2D-Cluster to CSM API String.vi
index 2a603d1..fbede6a 100644
Binary files a/Example/Supported Datatype Examples/Test Cases - 2D Cluster Array.vi and b/Example/Supported Datatype Examples/5.3 2D-Cluster to CSM API String.vi differ
diff --git a/Example/Supported Datatype Examples/6.1 Cluster to CSM API String.vi b/Example/Supported Datatype Examples/6.1 Cluster to CSM API String.vi
new file mode 100644
index 0000000..7ae3ecd
Binary files /dev/null and b/Example/Supported Datatype Examples/6.1 Cluster to CSM API String.vi differ
diff --git a/Example/Supported Datatype Examples/6.2 CSM API String to Cluster.vi b/Example/Supported Datatype Examples/6.2 CSM API String to Cluster.vi
new file mode 100644
index 0000000..ff7a30a
Binary files /dev/null and b/Example/Supported Datatype Examples/6.2 CSM API String to Cluster.vi differ
diff --git a/Example/Supported Datatype Examples/6.3 CSM API String to Cluster with 2D Array elements.vi b/Example/Supported Datatype Examples/6.3 CSM API String to Cluster with 2D Array elements.vi
new file mode 100644
index 0000000..e5dccf4
Binary files /dev/null and b/Example/Supported Datatype Examples/6.3 CSM API String to Cluster with 2D Array elements.vi differ
diff --git a/Example/Supported Datatype Examples/Test Cases - 2D Array in Cluster.vi b/Example/Supported Datatype Examples/Test Cases - 2D Array in Cluster.vi
deleted file mode 100644
index d3fed7c..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - 2D Array in Cluster.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - API String Arguments Support(Variant).vi b/Example/Supported Datatype Examples/Test Cases - API String Arguments Support(Variant).vi
deleted file mode 100644
index e767995..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - API String Arguments Support(Variant).vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Cluster Array.vi b/Example/Supported Datatype Examples/Test Cases - Cluster Array.vi
deleted file mode 100644
index 4ee3c97..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - Cluster Array.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Cluster Changed Value as Arguments.vi b/Example/Supported Datatype Examples/Test Cases - Cluster Changed Value as Arguments.vi
deleted file mode 100644
index f53a531..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - Cluster Changed Value as Arguments.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Cluster.vi b/Example/Supported Datatype Examples/Test Cases - Cluster.vi
deleted file mode 100644
index edfe943..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - Cluster.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Datatype Check.vi b/Example/Supported Datatype Examples/Test Cases - Datatype Check.vi
deleted file mode 100644
index e569388..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - Datatype Check.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - Empty String Check.vi b/Example/Supported Datatype Examples/Test Cases - Empty String Check.vi
deleted file mode 100644
index c5b89e1..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - Empty String Check.vi and /dev/null differ
diff --git a/Example/Supported Datatype Examples/Test Cases - timestamp.vi b/Example/Supported Datatype Examples/Test Cases - timestamp.vi
deleted file mode 100644
index a580ad4..0000000
Binary files a/Example/Supported Datatype Examples/Test Cases - timestamp.vi and /dev/null differ
diff --git a/testcases/testcase-Supported-Datatype/testcases/test - float.vi b/testcases/testcase-Supported-Datatype/testcases/test - float.vi
index 6694b7c..fd7b3c2 100644
Binary files a/testcases/testcase-Supported-Datatype/testcases/test - float.vi and b/testcases/testcase-Supported-Datatype/testcases/test - float.vi differ
diff --git a/testcases/testcase-Supported-Datatype/testcases/test - timestamp.vi b/testcases/testcase-Supported-Datatype/testcases/test - timestamp.vi
index 071698e..df7a166 100644
Binary files a/testcases/testcase-Supported-Datatype/testcases/test - timestamp.vi and b/testcases/testcase-Supported-Datatype/testcases/test - timestamp.vi differ