diff --git a/controls/model/c_controller.c b/controls/model/c_controller.c
index 6bcee0997d9c72199d6983b738bac881478fdbe6..aff3ffbc6aad17c2751048c88c508d7834d74399 100644
--- a/controls/model/c_controller.c
+++ b/controls/model/c_controller.c
@@ -1,6 +1,6 @@
 #include "c_controller.h"
-#include "quad_files/control_algorithm.c"
-#include "quad_files/computation_graph.c"
+#include "control_algorithm.c"
+#include "computation_graph.c"
 double c_controller(int vrpn_id, double vrpn_ts, double set_x, double set_y, double set_z, double set_yaw,
         double cur_x, double cur_y, double cur_z,
         double cur_phi, double cur_theta, double cur_psi,
diff --git a/controls/model/c_controller.h b/controls/model/c_controller.h
index e53b1a508409d70211a99fe6ba6de76e092ae7a5..4cf3a88f751129dd1777898ae599358964d012e5 100644
--- a/controls/model/c_controller.h
+++ b/controls/model/c_controller.h
@@ -1,12 +1,12 @@
 #ifndef C_CONTROLLER_H
 #define C_CONTROLLER_H
-#include "quad_files/computation_graph.h"
-#include "quad_files/graph_blocks/node_pid.h"
-#include "quad_files/graph_blocks/node_bounds.h"
-#include "quad_files/graph_blocks/node_constant.h"
-#include "quad_files/graph_blocks/node_mixer.h"
-#include "quad_files/PID.h"
-#include "quad_files/control_algorithm.h"
+#include "computation_graph.h"
+#include "node_pid.h"
+#include "node_bounds.h"
+#include "node_constant.h"
+#include "node_mixer.h"
+#include "PID.h"
+#include "control_algorithm.h"
 
 double c_controller(int vrpn_id, double vrpn_ts, double set_x, double set_y, double set_z, double set_yaw,
         double cur_x, double cur_y, double cur_z,
diff --git a/controls/model/quad_files/.gitignore b/controls/model/quad_files/.gitignore
deleted file mode 100644
index 1c4bc674e912af84e9c6bed639cd5780a68b7846..0000000000000000000000000000000000000000
--- a/controls/model/quad_files/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-# Don't track the copied files here
-*.h
-*.c
\ No newline at end of file
diff --git a/controls/model/quad_files/copy_files.bat b/controls/model/quad_files/copy_files.bat
deleted file mode 100644
index bd5f65861b103ddaf3b761a47c9bc584bb35b50b..0000000000000000000000000000000000000000
--- a/controls/model/quad_files/copy_files.bat
+++ /dev/null
@@ -1,27 +0,0 @@
-copy ..\..\..\quad\computation_graph\src\computation_graph.c computation_graph.c
-copy ..\..\..\quad\computation_graph\src\computation_graph.h computation_graph.h
-
-copy ..\..\..\quad\sw\modular_quad_pid\src\control_algorithm.h control_algorithm.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\control_algorithm.c control_algorithm.c
-
-copy ..\..\..\quad\sw\modular_quad_pid\src\PID.h PID.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\type_def.h type_def.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\sensor_processing.h sensor_processing.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\log_data.h log_data.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\quadposition.h quadposition.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\util.h util.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\timer.h timer.h
-copy ..\..\..\groundStation\src\backend\commands.h commands.h
-copy ..\..\..\groundStation\src\backend\callbacks.h callbacks.h
-
-mkdir graph_blocks
-copy ..\..\..\quad\computation_graph\src\graph_blocks\node_constant.h graph_blocks\node_constant.h
-copy ..\..\..\quad\computation_graph\src\graph_blocks\node_constant.c graph_blocks\node_constant.c
-copy ..\..\..\quad\computation_graph\src\graph_blocks\node_add.h graph_blocks\node_add.h
-copy ..\..\..\quad\computation_graph\src\graph_blocks\node_add.c graph_blocks\node_add.c
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_mixer.c graph_blocks\node_mixer.c
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_mixer.h graph_blocks\node_mixer.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_pid.c graph_blocks\node_pid.c
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_pid.h graph_blocks\node_pid.h
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_bounds.c graph_blocks\node_bounds.c
-copy ..\..\..\quad\sw\modular_quad_pid\src\graph_blocks\node_bounds.h graph_blocks\node_bounds.h
\ No newline at end of file
diff --git a/controls/model/test_model.slx b/controls/model/test_model.slx
index a54bd8cd630ecc1d3f555ece7495d8c7ebd49b04..93229cbac59b18930c7e4a1158b9e2f6c53bb53c 100644
Binary files a/controls/model/test_model.slx and b/controls/model/test_model.slx differ