diff --git a/DifferentialDrive.cpp b/DifferentialDrive.cpp
index 5dce7cf..242603f 100644
--- a/DifferentialDrive.cpp
+++ b/DifferentialDrive.cpp
@@ -1,5 +1,5 @@
 #include "DifferentialDrive.h"
-#include "FloatSingle.h"
+#include "VectorAlgebra/include/FloatSingle.h"
 
 #include <math.h>
 
diff --git a/Motor.h b/Motor.h
index 737e7ff..afe7d9f 100644
--- a/Motor.h
+++ b/Motor.h
@@ -1,15 +1,16 @@
 #pragma once
 
-#include <time.h>
 #include "Thing.h"
 
+#include <time.h>
+
 namespace Passer {
 namespace RoboidControl {
 
 /// @brief A Motor is a Thing which can move parts of the Roboid
 /// @note Currently only rotational motors are supported
 class Motor : public Thing {
- public:
+public:
   /// @brief Default constructor for the Motor
   Motor();
 
@@ -27,10 +28,10 @@ class Motor : public Thing {
   /// forward)
   virtual float GetSpeed();
 
- protected:
+protected:
   float currentTargetSpeed = 0;
 };
 
-}  // namespace RoboidControl
-}  // namespace Passer
+} // namespace RoboidControl
+} // namespace Passer
 using namespace Passer::RoboidControl;
\ No newline at end of file
diff --git a/Perception.cpp b/Perception.cpp
index 15bbed9..f15b3c1 100644
--- a/Perception.cpp
+++ b/Perception.cpp
@@ -1,8 +1,8 @@
 #include "Perception.h"
-#include "Angle.h"
 #include "DistanceSensor.h"
 #include "NetworkSync.h"
 #include "Switch.h"
+#include "VectorAlgebra/include/Angle.h"
 
 #include <math.h>
 
diff --git a/Perception.h b/Perception.h
index d652872..db19fb3 100644
--- a/Perception.h
+++ b/Perception.h
@@ -1,10 +1,10 @@
 #pragma once
 
 #include "Placement.h"
-#include "Polar.h"
-#include "Quaternion.h"
 #include "Sensor.h"
 #include "TrackedObject.h"
+#include "VectorAlgebra/include/Polar.h"
+#include "VectorAlgebra/include/Quaternion.h"
 
 namespace Passer {
 namespace RoboidControl {
diff --git a/Propulsion.cpp b/Propulsion.cpp
index 9b40f18..1b8a265 100644
--- a/Propulsion.cpp
+++ b/Propulsion.cpp
@@ -1,7 +1,7 @@
 #include "Propulsion.h"
 #include "Roboid.h"
 
-#include "FloatSingle.h"
+#include "VectorAlgebra/include/FloatSingle.h"
 
 Propulsion::Propulsion() {
   this->placement = nullptr;
diff --git a/Quadcopter.h b/Quadcopter.h
index c82de96..40322a4 100644
--- a/Quadcopter.h
+++ b/Quadcopter.h
@@ -2,7 +2,7 @@
 
 #include "Propulsion.h"
 #include "Thing.h"
-#include "Vector3.h"
+#include "VectorAlgebra/include/Vector3.h"
 
 namespace Passer {
 namespace RoboidControl {
diff --git a/TrackedObject.h b/TrackedObject.h
index 55be31f..f347b00 100644
--- a/TrackedObject.h
+++ b/TrackedObject.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "Polar.h"
 #include "Sensor.h"
+#include "VectorAlgebra/include/Polar.h"
 
 namespace Passer {
 namespace RoboidControl {