diff --git a/Servo.h b/Servo.h
index aab9c16..0436c06 100644
--- a/Servo.h
+++ b/Servo.h
@@ -60,21 +60,21 @@
 
 // Architecture specific include
 #if defined(ARDUINO_ARCH_AVR)
-#include "avr/ServoTimers.h"
+#include "src/avr/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAM)
-#include "sam/ServoTimers.h"
+#include "src/sam/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_SAMD)
-#include "samd/ServoTimers.h"
+#include "src/samd/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_STM32F4)
-#include "stm32f4/ServoTimers.h"
+#include "src/stm32f4/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_NRF52)
-#include "nrf52/ServoTimers.h"
+#include "src/nrf52/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_MEGAAVR)
-#include "megaavr/ServoTimers.h"
+#include "src/megaavr/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_MBED)
-#include "mbed/ServoTimers.h"
+#include "src/mbed/ServoTimers.h"
 #elif defined(ARDUINO_ARCH_RENESAS)
-#include "renesas/ServoTimers.h"
+#include "src/renesas/ServoTimers.h"
 #else
 #error "This library only supports boards with an AVR, SAM, SAMD, NRF52 or STM32F4 processor."
 #endif
diff --git a/avr/Servo.cpp b/src/avr/Servo.cpp
similarity index 99%
rename from avr/Servo.cpp
rename to src/avr/Servo.cpp
index 11fecc5..aed4281 100644
--- a/avr/Servo.cpp
+++ b/src/avr/Servo.cpp
@@ -22,7 +22,7 @@
 #include <avr/interrupt.h>
 #include <Arduino.h>
 
-#include "Servo.h"
+#include "../../Servo.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond()* _us) / 8)     // converts microseconds to tick (assumes prescale of 8)  // 12 Aug 2009
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 8)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
diff --git a/avr/ServoTimers.h b/src/avr/ServoTimers.h
similarity index 100%
rename from avr/ServoTimers.h
rename to src/avr/ServoTimers.h
diff --git a/mbed/Servo.cpp b/src/mbed/Servo.cpp
similarity index 99%
rename from mbed/Servo.cpp
rename to src/mbed/Servo.cpp
index efb67f9..a356f3a 100644
--- a/mbed/Servo.cpp
+++ b/src/mbed/Servo.cpp
@@ -1,7 +1,7 @@
 #if defined(ARDUINO_ARCH_MBED)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 #include <mbed.h>
 
 #if defined __has_include
diff --git a/mbed/ServoTimers.h b/src/mbed/ServoTimers.h
similarity index 100%
rename from mbed/ServoTimers.h
rename to src/mbed/ServoTimers.h
diff --git a/megaavr/Servo.cpp b/src/megaavr/Servo.cpp
similarity index 99%
rename from megaavr/Servo.cpp
rename to src/megaavr/Servo.cpp
index 59b3e44..fec080b 100644
--- a/megaavr/Servo.cpp
+++ b/src/megaavr/Servo.cpp
@@ -1,7 +1,7 @@
 #if defined(ARDUINO_ARCH_MEGAAVR)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    ((clockCyclesPerMicrosecond() / 16 * _us) / 4)                 // converts microseconds to tick
 #define ticksToUs(_ticks) (((unsigned) _ticks * 16) / (clockCyclesPerMicrosecond() / 4))   // converts from ticks back to microseconds
diff --git a/megaavr/ServoTimers.h b/src/megaavr/ServoTimers.h
similarity index 100%
rename from megaavr/ServoTimers.h
rename to src/megaavr/ServoTimers.h
diff --git a/nrf52/Servo.cpp b/src/nrf52/Servo.cpp
similarity index 99%
rename from nrf52/Servo.cpp
rename to src/nrf52/Servo.cpp
index 72bd504..95c7658 100644
--- a/nrf52/Servo.cpp
+++ b/src/nrf52/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_NRF52)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 
 static servo_t servos[MAX_SERVOS];                          // static array of servo structures
diff --git a/nrf52/ServoTimers.h b/src/nrf52/ServoTimers.h
similarity index 100%
rename from nrf52/ServoTimers.h
rename to src/nrf52/ServoTimers.h
diff --git a/renesas/Servo.cpp b/src/renesas/Servo.cpp
similarity index 99%
rename from renesas/Servo.cpp
rename to src/renesas/Servo.cpp
index eaeb073..cbe24cc 100644
--- a/renesas/Servo.cpp
+++ b/src/renesas/Servo.cpp
@@ -23,7 +23,7 @@
 #if defined(ARDUINO_ARCH_RENESAS)
 
 #include "Arduino.h"
-#include "Servo.h"
+#include "../../Servo.h"
 #include "ServoTimers.h"
 #include "math.h"
 #include "FspTimer.h"
diff --git a/renesas/ServoTimers.h b/src/renesas/ServoTimers.h
similarity index 100%
rename from renesas/ServoTimers.h
rename to src/renesas/ServoTimers.h
diff --git a/sam/Servo.cpp b/src/sam/Servo.cpp
similarity index 99%
rename from sam/Servo.cpp
rename to src/sam/Servo.cpp
index df5058f..361d6bc 100644
--- a/sam/Servo.cpp
+++ b/src/sam/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_SAM)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    (( clockCyclesPerMicrosecond() * _us) / 32)     // converts microseconds to tick
 #define ticksToUs(_ticks) (( (unsigned)_ticks * 32)/ clockCyclesPerMicrosecond() ) // converts from ticks back to microseconds
diff --git a/sam/ServoTimers.h b/src/sam/ServoTimers.h
similarity index 100%
rename from sam/ServoTimers.h
rename to src/sam/ServoTimers.h
diff --git a/samd/Servo.cpp b/src/samd/Servo.cpp
similarity index 99%
rename from samd/Servo.cpp
rename to src/samd/Servo.cpp
index d8e2ec4..a1b3fc2 100644
--- a/samd/Servo.cpp
+++ b/src/samd/Servo.cpp
@@ -19,7 +19,7 @@
 #if defined(ARDUINO_ARCH_SAMD)
 
 #include <Arduino.h>
-#include <Servo.h>
+#include "../../Servo.h"
 
 #define usToTicks(_us)    ((clockCyclesPerMicrosecond() * _us) / 16)                 // converts microseconds to tick
 #define ticksToUs(_ticks) (((unsigned) _ticks * 16) / clockCyclesPerMicrosecond())   // converts from ticks back to microseconds
diff --git a/samd/ServoTimers.h b/src/samd/ServoTimers.h
similarity index 100%
rename from samd/ServoTimers.h
rename to src/samd/ServoTimers.h
diff --git a/stm32f4/Servo.cpp b/src/stm32f4/Servo.cpp
similarity index 100%
rename from stm32f4/Servo.cpp
rename to src/stm32f4/Servo.cpp
diff --git a/stm32f4/ServoTimers.h b/src/stm32f4/ServoTimers.h
similarity index 100%
rename from stm32f4/ServoTimers.h
rename to src/stm32f4/ServoTimers.h