diff --git a/components/ratgdo/espsoftwareserial/SoftwareSerial.cpp b/components/espsoftwareserial/SoftwareSerial.cpp
similarity index 100%
rename from components/ratgdo/espsoftwareserial/SoftwareSerial.cpp
rename to components/espsoftwareserial/SoftwareSerial.cpp
diff --git a/components/ratgdo/espsoftwareserial/SoftwareSerial.h b/components/espsoftwareserial/SoftwareSerial.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/SoftwareSerial.h
rename to components/espsoftwareserial/SoftwareSerial.h
diff --git a/components/ratgdo/espsoftwareserial/circular_queue/Delegate.h b/components/espsoftwareserial/circular_queue/Delegate.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/circular_queue/Delegate.h
rename to components/espsoftwareserial/circular_queue/Delegate.h
diff --git a/components/ratgdo/espsoftwareserial/circular_queue/MultiDelegate.h b/components/espsoftwareserial/circular_queue/MultiDelegate.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/circular_queue/MultiDelegate.h
rename to components/espsoftwareserial/circular_queue/MultiDelegate.h
diff --git a/components/ratgdo/espsoftwareserial/circular_queue/circular_queue.h b/components/espsoftwareserial/circular_queue/circular_queue.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/circular_queue/circular_queue.h
rename to components/espsoftwareserial/circular_queue/circular_queue.h
diff --git a/components/ratgdo/espsoftwareserial/circular_queue/circular_queue_mp.h b/components/espsoftwareserial/circular_queue/circular_queue_mp.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/circular_queue/circular_queue_mp.h
rename to components/espsoftwareserial/circular_queue/circular_queue_mp.h
diff --git a/components/ratgdo/espsoftwareserial/circular_queue/ghostl.h b/components/espsoftwareserial/circular_queue/ghostl.h
similarity index 100%
rename from components/ratgdo/espsoftwareserial/circular_queue/ghostl.h
rename to components/espsoftwareserial/circular_queue/ghostl.h
diff --git a/components/ratgdo/ratgdo.h b/components/ratgdo/ratgdo.h
index d07d747..99e7569 100644
--- a/components/ratgdo/ratgdo.h
+++ b/components/ratgdo/ratgdo.h
@@ -15,7 +15,7 @@
 #define _RATGDO_H
 
 #include "rolling_code.h"
-#include "espsoftwareserial/SoftwareSerial.h"
+#include "../espsoftwareserial/SoftwareSerial.h"
 
 SoftwareSerial swSerial;
 
diff --git a/components/ratgdo/rolling_code.h b/components/ratgdo/rolling_code.h
index b91233a..b74a25c 100644
--- a/components/ratgdo/rolling_code.h
+++ b/components/ratgdo/rolling_code.h
@@ -2,7 +2,7 @@
 #define _RATGDO_ROLLING_CODE_H
 
 extern "C" {
-#include "secplus/secplus.h"
+#include "../secplus/secplus.h"
 }
 
 void readCounterFromFlash(); // get the rolling code counter from setup.json &
diff --git a/components/ratgdo/secplus/secplus.c b/components/secplus/secplus.c
similarity index 100%
rename from components/ratgdo/secplus/secplus.c
rename to components/secplus/secplus.c
diff --git a/components/ratgdo/secplus/secplus.h b/components/secplus/secplus.h
similarity index 100%
rename from components/ratgdo/secplus/secplus.h
rename to components/secplus/secplus.h