diff --git a/include/common/ScannerSickS300.hpp b/include/sicks300_2/common/ScannerSickS300.hpp
similarity index 93%
rename from include/common/ScannerSickS300.hpp
rename to include/sicks300_2/common/ScannerSickS300.hpp
index 1837d5e..513aaf2 100644
--- a/include/common/ScannerSickS300.hpp
+++ b/include/sicks300_2/common/ScannerSickS300.hpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef COMMON__SCANNERSICKS300_HPP_
-#define COMMON__SCANNERSICKS300_HPP_
+#ifndef SICKS300_2__COMMON__SCANNERSICKS300_HPP_
+#define SICKS300_2__COMMON__SCANNERSICKS300_HPP_
 
 // base classes
 #include <math.h>
@@ -25,8 +25,8 @@
 #include <string>
 #include <vector>
 
-#include "common/SerialIO.hpp"
-#include "common/TelegramS300.hpp"
+#include "sicks300_2/common/SerialIO.hpp"
+#include "sicks300_2/common/TelegramS300.hpp"
 
 /**
  * Driver class for the laser scanner SICK S300 Professional.
@@ -127,4 +127,4 @@ class ScannerSickS300
     std::vector<ScanPolarType> & vecScanPolar);
 };
 
-#endif  // COMMON__SCANNERSICKS300_HPP_
+#endif  // SICKS300_2__COMMON__SCANNERSICKS300_HPP_
diff --git a/include/common/SerialIO.hpp b/include/sicks300_2/common/SerialIO.hpp
similarity index 97%
rename from include/common/SerialIO.hpp
rename to include/sicks300_2/common/SerialIO.hpp
index 6ce5585..900e903 100644
--- a/include/common/SerialIO.hpp
+++ b/include/sicks300_2/common/SerialIO.hpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#ifndef COMMON__SERIALIO_HPP_
-#define COMMON__SERIALIO_HPP_
+#ifndef SICKS300_2__COMMON__SERIALIO_HPP_
+#define SICKS300_2__COMMON__SERIALIO_HPP_
 
 #include <termios.h>
 #include <sys/select.h>
@@ -205,4 +205,4 @@ class SerialIO
 };
 
 
-#endif  // COMMON__SERIALIO_HPP_
+#endif  // SICKS300_2__COMMON__SERIALIO_HPP_
diff --git a/include/common/TelegramS300.hpp b/include/sicks300_2/common/TelegramS300.hpp
similarity index 100%
rename from include/common/TelegramS300.hpp
rename to include/sicks300_2/common/TelegramS300.hpp
diff --git a/include/sicks300_2/sicks300.hpp b/include/sicks300_2/sicks300.hpp
index 3b31531..43c76d4 100644
--- a/include/sicks300_2/sicks300.hpp
+++ b/include/sicks300_2/sicks300.hpp
@@ -29,7 +29,7 @@
 #include "diagnostic_msgs/msg/diagnostic_array.hpp"
 
 // Common
-#include "common/ScannerSickS300.hpp"
+#include "sicks300_2/common/ScannerSickS300.hpp"
 
 namespace sicks300_2
 {
diff --git a/src/common/ScannerSickS300.cpp b/src/common/ScannerSickS300.cpp
index ac5a03d..6803e9a 100644
--- a/src/common/ScannerSickS300.cpp
+++ b/src/common/ScannerSickS300.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <stdint.h>
-#include "common/ScannerSickS300.hpp"
+#include "sicks300_2/common/ScannerSickS300.hpp"
 
 //-----------------------------------------------
 
diff --git a/src/common/SerialIO.cpp b/src/common/SerialIO.cpp
index 1320f73..e6b0135 100644
--- a/src/common/SerialIO.cpp
+++ b/src/common/SerialIO.cpp
@@ -26,7 +26,7 @@
 #include <linux/serial.h>
 #include <iostream>
 
-#include "common/SerialIO.hpp"
+#include "sicks300_2/common/SerialIO.hpp"
 
 // #define _PRINT_BYTES