diff --git a/STM32/libraries/HardwareTest/examples/Black407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics.ino b/STM32/libraries/BoardExamples/examples/BlackF407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics.ino
similarity index 100%
rename from STM32/libraries/HardwareTest/examples/Black407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics.ino
rename to STM32/libraries/BoardExamples/examples/BlackF407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics.ino
diff --git a/STM32/libraries/HardwareTest/examples/Black407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics_functions.ino b/STM32/libraries/BoardExamples/examples/BlackF407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics_functions.ino
similarity index 100%
rename from STM32/libraries/HardwareTest/examples/Black407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics_functions.ino
rename to STM32/libraries/BoardExamples/examples/BlackF407VE/Winbond25Q16Diagnostics/Winbond25Q16Diagnostics_functions.ino
diff --git a/STM32/libraries/BoardExamples/keywords.txt b/STM32/libraries/BoardExamples/keywords.txt
new file mode 100644
index 0000000..726c150
--- /dev/null
+++ b/STM32/libraries/BoardExamples/keywords.txt
@@ -0,0 +1,15 @@
+#######################################
+# Syntax Coloring Map SPI
+#######################################
+
+#######################################
+# Datatypes (KEYWORD1)
+#######################################
+
+#######################################
+# Methods and Functions (KEYWORD2)
+#######################################
+
+#######################################
+# Constants (LITERAL1)
+#######################################
diff --git a/STM32/libraries/BoardExamples/library.properties b/STM32/libraries/BoardExamples/library.properties
new file mode 100644
index 0000000..dce2d11
--- /dev/null
+++ b/STM32/libraries/BoardExamples/library.properties
@@ -0,0 +1,9 @@
+name=STM32 board examples for users
+version=0.1
+author=Daniel Fekete
+maintainer=Daniel Fekete <danieleff@gmail.com>
+sentence=Examples for specifix STM32 boards
+paragraph=
+category=Other
+url=https://github.com/danieleff/STM32GENERIC
+architectures=stm32
diff --git a/STM32/libraries/BoardExamples/src/BoardExamples.h b/STM32/libraries/BoardExamples/src/BoardExamples.h
new file mode 100644
index 0000000..e69de29
diff --git a/STM32/libraries/HardwareTest/library.properties b/STM32/libraries/HardwareTest/library.properties
index 8656f12..8c38e76 100644
--- a/STM32/libraries/HardwareTest/library.properties
+++ b/STM32/libraries/HardwareTest/library.properties
@@ -1,4 +1,4 @@
-name=HardwareTest - Arduino API compatibility testing for STM32
+name=STM32 board testing for developers
 version=0.1
 author=Daniel Fekete
 maintainer=Daniel Fekete <danieleff@gmail.com>