diff --git a/Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.pde b/Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino
similarity index 100%
rename from Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.pde
rename to Code/Arduino/HanReader/examples/reporting_han_data_to_mqtt/reporting_han_data_to_mqtt.ino
diff --git a/Code/Arduino/HanReader/keywords.txt b/Code/Arduino/HanReader/keywords.txt
new file mode 100644
index 00000000..e69de29b
diff --git a/Code/Arduino/HanReader/library.properties b/Code/Arduino/HanReader/library.properties
new file mode 100644
index 00000000..e69de29b
diff --git a/Code/Arduino/HanReader/Crc16.cpp b/Code/Arduino/HanReader/src/Crc16.cpp
similarity index 100%
rename from Code/Arduino/HanReader/Crc16.cpp
rename to Code/Arduino/HanReader/src/Crc16.cpp
diff --git a/Code/Arduino/HanReader/Crc16.h b/Code/Arduino/HanReader/src/Crc16.h
similarity index 100%
rename from Code/Arduino/HanReader/Crc16.h
rename to Code/Arduino/HanReader/src/Crc16.h
diff --git a/Code/Arduino/HanReader/DlmsReader.cpp b/Code/Arduino/HanReader/src/DlmsReader.cpp
similarity index 100%
rename from Code/Arduino/HanReader/DlmsReader.cpp
rename to Code/Arduino/HanReader/src/DlmsReader.cpp
diff --git a/Code/Arduino/HanReader/DlmsReader.h b/Code/Arduino/HanReader/src/DlmsReader.h
similarity index 100%
rename from Code/Arduino/HanReader/DlmsReader.h
rename to Code/Arduino/HanReader/src/DlmsReader.h
diff --git a/Code/Arduino/HanReader/HanReader.cpp b/Code/Arduino/HanReader/src/HanReader.cpp
similarity index 100%
rename from Code/Arduino/HanReader/HanReader.cpp
rename to Code/Arduino/HanReader/src/HanReader.cpp
diff --git a/Code/Arduino/HanReader/HanReader.h b/Code/Arduino/HanReader/src/HanReader.h
similarity index 100%
rename from Code/Arduino/HanReader/HanReader.h
rename to Code/Arduino/HanReader/src/HanReader.h
diff --git a/Code/Arduino/HanReader/KaifaHan.cpp b/Code/Arduino/HanReader/src/KaifaHan.cpp
similarity index 100%
rename from Code/Arduino/HanReader/KaifaHan.cpp
rename to Code/Arduino/HanReader/src/KaifaHan.cpp
diff --git a/Code/Arduino/HanReader/KaifaHan.h b/Code/Arduino/HanReader/src/KaifaHan.h
similarity index 100%
rename from Code/Arduino/HanReader/KaifaHan.h
rename to Code/Arduino/HanReader/src/KaifaHan.h