diff --git a/src/classification/ConvexHull1D.cpp b/src/classification/ConvexHull1D.cpp
index 6c01621e6bd550e051788c62f1114430bea39ba7..9359f7ac5bffdad9f2fb7ae137236c9f42bd3f6c 100644
--- a/src/classification/ConvexHull1D.cpp
+++ b/src/classification/ConvexHull1D.cpp
@@ -1,4 +1,4 @@
-#include <classification/ConvexHull1D.hpp>
+#include "classification/ConvexHull1D.hpp"
 
 ConvexHull1D::ConvexHull1D() :
     _sorted_value(),
diff --git a/src/classification/ConvexHull1D.hpp b/src/classification/ConvexHull1D.hpp
index b4ff3921449771bba8ea46f42c1bc005656d9988..6f50c6a922d25b6a5ac5c4dd536c6642f4471c73 100644
--- a/src/classification/ConvexHull1D.hpp
+++ b/src/classification/ConvexHull1D.hpp
@@ -8,10 +8,12 @@
 #ifndef CONVEX_UTILS
 #define CONVEX_UTILS
 
-#include <utils/math_funcs.hpp>
 #include <iomanip>
+
 #include <coin/ClpSimplex.hpp>
-#include <classification/prop_sorted_d_mat.hpp>
+
+#include "classification/prop_sorted_d_mat.hpp"
+#include "utils/math_funcs.hpp"
 
 class ConvexHull1D
 {
diff --git a/src/classification/LPWrapper.cpp b/src/classification/LPWrapper.cpp
index dbe7bf5793f25dac3fe8e1d12170dd5c85dc8799..5fd46e7a479c6c473c47faf222a531c0722705ce 100644
--- a/src/classification/LPWrapper.cpp
+++ b/src/classification/LPWrapper.cpp
@@ -1,4 +1,5 @@
-#include <classification/LPWrapper.hpp>
+#include "classification/LPWrapper.hpp"
+
 LPWrapper::LPWrapper(std::vector<int> samp_per_class, const int task_num, const int n_class, const int n_dim, const int n_samp, const double tol) :
     _elements((n_dim + 1) * n_samp, 0.0),
     _row_lower((n_dim + 1) * n_samp, 1.0),
diff --git a/src/classification/LPWrapper.hpp b/src/classification/LPWrapper.hpp
index f3157242c5eeead9e300d541a734b9b31610beb5..7c4ee427aeaef55bbff9f5772429c3142cbca759 100644
--- a/src/classification/LPWrapper.hpp
+++ b/src/classification/LPWrapper.hpp
@@ -14,8 +14,8 @@
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <utils/mkl_interface.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "utils/mkl_interface.hpp"
 class LPWrapper
 {
 protected:
diff --git a/src/classification/SVMWrapper.cpp b/src/classification/SVMWrapper.cpp
index 53048ab167a7690ef44cc8d069843016b070a424..97a0e1a04eef6e353f7ffcb207281832aaf9061e 100644
--- a/src/classification/SVMWrapper.cpp
+++ b/src/classification/SVMWrapper.cpp
@@ -1,4 +1,4 @@
-#include <classification/SVMWrapper.hpp>
+#include "classification/SVMWrapper.hpp"
 
 SVMWrapper::SVMWrapper(const int n_class, const int n_dim, const int n_samp, const double* prop) :
     _model(nullptr),
diff --git a/src/classification/SVMWrapper.hpp b/src/classification/SVMWrapper.hpp
index 3fbf758b5956e9f9d70796f7f8195486b005b053..e97dc8cccf0137879c0216b2e4018c0182eba45d 100644
--- a/src/classification/SVMWrapper.hpp
+++ b/src/classification/SVMWrapper.hpp
@@ -12,8 +12,8 @@
 #include <iostream>
 #include <numeric>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <external/libsvm/svm.h>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "external/libsvm/svm.h"
 
 class SVMWrapper
 {
diff --git a/src/classification/prop_sorted_d_mat.cpp b/src/classification/prop_sorted_d_mat.cpp
index 37e5bd0daa09470a4182a135b2666143fd909a87..500e67337bec56e02c8c06dddd43a458ce5c21e3 100644
--- a/src/classification/prop_sorted_d_mat.cpp
+++ b/src/classification/prop_sorted_d_mat.cpp
@@ -1,4 +1,4 @@
-#include <classification/prop_sorted_d_mat.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
 
 std::vector<double> prop_sorted_d_mat::SORTED_D_MATRIX;
 
diff --git a/src/classification/prop_sorted_d_mat.hpp b/src/classification/prop_sorted_d_mat.hpp
index c604329b39a08a3507748e362175d3672fdcbf23..3043d41f5813c4fa8d19450a900cb42131a3d73b 100644
--- a/src/classification/prop_sorted_d_mat.hpp
+++ b/src/classification/prop_sorted_d_mat.hpp
@@ -1,4 +1,4 @@
-/** @file <classification/prop_sorted_d_mat.hp
+/** @file classification/prop_sorted_d_mat.hpp
  *  @brief Central storage area for a sorted descriptor matrix based on the task/class of a sample
 
  *  @author Thomas A. R. Purcell (tpurcell)
diff --git a/src/descriptor_identifier/Model/Model.cpp b/src/descriptor_identifier/Model/Model.cpp
index 4b43809bb0cab5df6e4be138c2d6c164575208a3..1e05768c11d080094847d1c0c812f40651d9badb 100644
--- a/src/descriptor_identifier/Model/Model.cpp
+++ b/src/descriptor_identifier/Model/Model.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/Model.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
 
 Model::Model(
     const std::string prop_label,
diff --git a/src/descriptor_identifier/Model/Model.hpp b/src/descriptor_identifier/Model/Model.hpp
index 0022ef8e673db2f9f28fbde5749a64db6b5f2f3b..ba5456816c34dd7fa5336854e55fdae1d293ce92 100644
--- a/src/descriptor_identifier/Model/Model.hpp
+++ b/src/descriptor_identifier/Model/Model.hpp
@@ -14,12 +14,12 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem.hpp>
 
-#include<iomanip>
-#include<fstream>
-#include<iostream>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelClassifier.cpp b/src/descriptor_identifier/Model/ModelClassifier.cpp
index f1f33766e886380f7df00e2b96051f2b3c240e95..5d5df40709156ddac0cd00178645c0b4001c42c1 100644
--- a/src/descriptor_identifier/Model/ModelClassifier.cpp
+++ b/src/descriptor_identifier/Model/ModelClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
 
 ModelClassifier::ModelClassifier(
     const std::string prop_label,
diff --git a/src/descriptor_identifier/Model/ModelClassifier.hpp b/src/descriptor_identifier/Model/ModelClassifier.hpp
index 04e4ffd65652bd58ab3c360f26d6675168fc6215..1ff38237e0d90ba2a1b29dc882ed8e7842d79d0a 100644
--- a/src/descriptor_identifier/Model/ModelClassifier.hpp
+++ b/src/descriptor_identifier/Model/ModelClassifier.hpp
@@ -14,16 +14,16 @@
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/filesystem.hpp>
 
-#include<iomanip>
-#include<fstream>
-#include<iostream>
+#include <iomanip>
+#include <fstream>
+#include <iostream>
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/SVMWrapper.hpp>
-#include <descriptor_identifier/Model/Model.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "classification/SVMWrapper.hpp"
+#include "descriptor_identifier/Model/Model.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelLogRegressor.cpp b/src/descriptor_identifier/Model/ModelLogRegressor.cpp
index 652d2975dd427b5a72f8e53eebbe45b1f942a428..56e6fbee59e56e5afa98bf983c3b0d00192660c6 100644
--- a/src/descriptor_identifier/Model/ModelLogRegressor.cpp
+++ b/src/descriptor_identifier/Model/ModelLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelLogRegressor.hpp>
+#include "descriptor_identifier/Model/ModelLogRegressor.hpp"
 
 ModelLogRegressor::ModelLogRegressor()
 {}
diff --git a/src/descriptor_identifier/Model/ModelLogRegressor.hpp b/src/descriptor_identifier/Model/ModelLogRegressor.hpp
index ef9b5109d6c06fbe4333f90a0a71932cf5bdcb02..3309bcf1299cd4b9dd0e73be6d96f37154e06a48 100644
--- a/src/descriptor_identifier/Model/ModelLogRegressor.hpp
+++ b/src/descriptor_identifier/Model/ModelLogRegressor.hpp
@@ -10,7 +10,7 @@
 #ifndef MODEL_LOG_REGRESSOR
 #define MODEL_LOG_REGRESSOR
 
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/Model/ModelRegressor.cpp b/src/descriptor_identifier/Model/ModelRegressor.cpp
index dd38fc2579b1177edbfdc421b14d03ea668d5832..dcd61a60720d09d0b010640d11c81acda6654ce7 100644
--- a/src/descriptor_identifier/Model/ModelRegressor.cpp
+++ b/src/descriptor_identifier/Model/ModelRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
 
 ModelRegressor::ModelRegressor()
 {}
diff --git a/src/descriptor_identifier/Model/ModelRegressor.hpp b/src/descriptor_identifier/Model/ModelRegressor.hpp
index a70182eae97e4700c6ba7d26256f9037940f7f8d..86fbdac3bb4030b60d7f0998cf57e329d4c26a3e 100644
--- a/src/descriptor_identifier/Model/ModelRegressor.hpp
+++ b/src/descriptor_identifier/Model/ModelRegressor.hpp
@@ -18,9 +18,9 @@
 #include<fstream>
 #include<iostream>
 
-#include <descriptor_identifier/Model/Model.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <utils/string_utils.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
index 8931049a345d1c9431002a5873e4bceb90212406..45950f272de95fb1166457be9553486bb8478b23 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 SISSOClassifier::SISSOClassifier(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
index cd8ffc03bb05907b6ee8fa893c8a7d781c889807..11a9d6ff83efa84da89f7d1ff5e32d167dc3b1ba 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOClassifier.hpp
@@ -11,12 +11,12 @@
 
 #include <coin/ClpSimplex.hpp>
 
-#include <classification/prop_sorted_d_mat.hpp>
-#include <classification/SVMWrapper.hpp>
-#include <classification/LPWrapper.hpp>
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "classification/prop_sorted_d_mat.hpp"
+#include "classification/SVMWrapper.hpp"
+#include "classification/LPWrapper.hpp"
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 #include <ctime>
 #include <iomanip>
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
index bb5d72e5a2c5936aab87882f280e56fe407f9d86..c88564d4779ea63031669e281796e2c858a44ee6 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
 
 SISSOLogRegressor::SISSOLogRegressor(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
index bd54aaddee7560ad6ce46d052765eac3f65e30d3..01f740cc21552d9e8662ff651020b0fce396adaa 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp
@@ -9,8 +9,8 @@
 #ifndef SISSO_LOG_REGRESSOR
 #define SISSO_LOG_REGRESSOR
 
-#include <descriptor_identifier/Model/ModelLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/Model/ModelLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp b/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
index 02363bfb1938c9e69eb6d1df058a97e63883ff89..d710b5e1784efe1d300d09ff7125e3728700d980 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSORegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 SISSORegressor::SISSORegressor(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp b/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
index 0dffca8e00b0519b809806aa46c4f193992fdced..265fd5d48dbb6e22e7c63062ac04f62a595ef8b3 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSORegressor.hpp
@@ -9,11 +9,12 @@
 #ifndef SISSO_REGRESSOR
 #define SISSO_REGRESSOR
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/ModelRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
 #include <ctime>
 
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/ModelRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp b/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
index bbfff6f844527776e8e05406711dc8ec36493a84..7c60edf7cf1359904f5cf165daf6cedb14d8149b 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSO_DI.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 SISSO_DI::SISSO_DI(
     const std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp b/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
index 7b123c5142b8903cf1087c1fa32a7c6318b4302a..0b232ae92d81061de0727b45c347df0d20a5c9e3 100644
--- a/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
+++ b/src/descriptor_identifier/SISSO_DI/SISSO_DI.hpp
@@ -9,11 +9,12 @@
 #ifndef SISSO_DESCRIPTOR_ID
 #define SISSO_DESCRIPTOR_ID
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <descriptor_identifier/Model/Model.hpp>
 #include <ctime>
 #include <limits>
 
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "descriptor_identifier/Model/Model.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/feature_creation/feature_space/FeatureSpace.cpp b/src/feature_creation/feature_space/FeatureSpace.cpp
index 7c7cb9fcdfa8ab61096ec6a8d575cc620d10883c..3edd0b3fc955c43943526656c795a22a48860c60 100644
--- a/src/feature_creation/feature_space/FeatureSpace.cpp
+++ b/src/feature_creation/feature_space/FeatureSpace.cpp
@@ -1,5 +1,4 @@
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <iomanip>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
 
 BOOST_CLASS_EXPORT_GUID(FeatureNode, "FeatureNode")
 BOOST_CLASS_EXPORT_GUID(AddNode, "AddNode")
diff --git a/src/feature_creation/feature_space/FeatureSpace.hpp b/src/feature_creation/feature_space/FeatureSpace.hpp
index e773d451ce47c4e469495d1d598f93ec77445ca5..5b8279e815768f6fb3a3a1746964e35c2b398cf5 100644
--- a/src/feature_creation/feature_space/FeatureSpace.hpp
+++ b/src/feature_creation/feature_space/FeatureSpace.hpp
@@ -10,16 +10,6 @@
 #ifndef FEATURE_SPACE
 #define FEATURE_SPACE
 
-#include <mpi_interface/MPI_Interface.hpp>
-#include <mpi_interface/MPI_ops.hpp>
-#include <mpi_interface/serialize_tuple.h>
-#include <feature_creation/node/ModelNode.hpp>
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
-#include <feature_creation/node/utils.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <utils/compare_features.hpp>
-#include <utils/project.hpp>
-
 #include <boost/serialization/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 
@@ -27,6 +17,16 @@
 #include <iomanip>
 #include <utility>
 
+#include "mpi_interface/MPI_Interface.hpp"
+#include "mpi_interface/MPI_ops.hpp"
+#include "mpi_interface/serialize_tuple.h"
+#include "feature_creation/node/ModelNode.hpp"
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
+#include "feature_creation/node/utils.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "utils/compare_features.hpp"
+#include "utils/project.hpp"
+
 #ifdef PY_BINDINGS
     namespace np = boost::python::numpy;
     namespace py = boost::python;
diff --git a/src/feature_creation/node/FeatureNode.cpp b/src/feature_creation/node/FeatureNode.cpp
index 8a516bef36cc474fac758ba98c3f8651d251b822..a5944607a17b927cd8a817a8bbd4ba855a940090 100644
--- a/src/feature_creation/node/FeatureNode.cpp
+++ b/src/feature_creation/node/FeatureNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/FeatureNode.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
 
 FeatureNode::FeatureNode()
 {}
diff --git a/src/feature_creation/node/FeatureNode.hpp b/src/feature_creation/node/FeatureNode.hpp
index 477e36cddaf94034544781917df4ddb06784a81a..a6a1f9d1d0dd7ce174ecc2883488a78a1f510406 100644
--- a/src/feature_creation/node/FeatureNode.hpp
+++ b/src/feature_creation/node/FeatureNode.hpp
@@ -9,16 +9,15 @@
 #ifndef FEATURE_NODE
 #define FEATURE_NODE
 
-#include <utils/math_funcs.hpp>
-#include <utils/enum.hpp>
-#include <utils/string_utils.hpp>
-
 #include <memory>
 
 #include <boost/serialization/export.hpp>
 #include <boost/serialization/base_object.hpp>
 
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
+#include "utils/math_funcs.hpp"
+#include "utils/enum.hpp"
+#include "utils/string_utils.hpp"
 
 #ifdef PY_BINDINGS
 namespace np = boost::python::numpy;
@@ -81,7 +80,7 @@ public:
     );
     #ifdef PY_BINDINGS
     /**
-     * @brief Constructs a feature node using numpy arrays (cpp definition in <python/feature_creation/FeatureNode.cpp)
+     * @brief Constructs a feature node using numpy arrays (cpp definition in "python/feature_creation/FeatureNode.cpp)
      *
      * @param feat_ind index of the feature
      * @param expr Expression for the feature
@@ -92,7 +91,7 @@ public:
     FeatureNode(unsigned long int feat_ind, std::string expr, np::ndarray value, np::ndarray test_value, Unit unit);
 
     /**
-     * @brief Constructs a feature node using Python lists (cpp definition in <python/feature_creation/FeatureNode.cpp)
+     * @brief Constructs a feature node using Python lists (cpp definition in "python/feature_creation/FeatureNode.cpp)
      *
      * @param feat_ind index of the feature
      * @param expr Expression for the feature
diff --git a/src/feature_creation/node/ModelNode.cpp b/src/feature_creation/node/ModelNode.cpp
index d6c20df9b4f06d92ea5b17a17d9712c5252e5384..c23d0aa2613192c849fdad089d66454b07427625 100644
--- a/src/feature_creation/node/ModelNode.cpp
+++ b/src/feature_creation/node/ModelNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/ModelNode.hpp>
+#include "feature_creation/node/ModelNode.hpp"
 
 ModelNode::ModelNode()
 {}
diff --git a/src/feature_creation/node/ModelNode.hpp b/src/feature_creation/node/ModelNode.hpp
index b70d0c3f945fb06989182f2b2d22585e057d1800..9ee722b820b2a87eeb40f23b8d37a6326022f0f9 100644
--- a/src/feature_creation/node/ModelNode.hpp
+++ b/src/feature_creation/node/ModelNode.hpp
@@ -12,9 +12,9 @@
 #include <algorithm>
 #include <numeric>
 
-#include <feature_creation/node/FeatureNode.hpp>
-#include <feature_creation/node/operator_nodes/functions.hpp>
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
+#include "feature_creation/node/operator_nodes/functions.hpp"
+#include "utils/string_utils.hpp"
 
 typedef std::pair<std::function<void(int, std::vector<double*>&)>, int> fxn_nterms_pair;
 // DocString: cls_model_node
diff --git a/src/feature_creation/node/Node.cpp b/src/feature_creation/node/Node.cpp
index 663e3122d4be3d0b3efbd7004c2fce2591d48db0..58c6735e269a03994e038db674e6de5a721d077b 100644
--- a/src/feature_creation/node/Node.cpp
+++ b/src/feature_creation/node/Node.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
 
 Node::Node()
 {}
diff --git a/src/feature_creation/node/Node.hpp b/src/feature_creation/node/Node.hpp
index fb1e7f0632d75e55e185c1a537de95a0ec2093cb..8ec316ab7dbaac78d616f4a3fe75c476c860cf3c 100644
--- a/src/feature_creation/node/Node.hpp
+++ b/src/feature_creation/node/Node.hpp
@@ -11,11 +11,6 @@
 #ifndef NODE
 #define NODE
 
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <feature_creation/units/Unit.hpp>
-#include <utils/math_funcs.hpp>
-#include <utils/enum.hpp>
-
 #include <cmath>
 #include <memory>
 
@@ -24,8 +19,13 @@
 #include <boost/serialization/string.hpp>
 #include <boost/serialization/unique_ptr.hpp>
 
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "feature_creation/units/Unit.hpp"
+#include "utils/math_funcs.hpp"
+#include "utils/enum.hpp"
+
 #ifdef PY_BINDINGS
-#include <python/conversion_utils.hpp>
+#include "python/conversion_utils.hpp"
 namespace py = boost::python;
 namespace np = boost::python::numpy;
 #endif
diff --git a/src/feature_creation/node/operator_nodes/OperatorNode.cpp b/src/feature_creation/node/operator_nodes/OperatorNode.cpp
index b5a5ac2a42a49980e263aa931e73d5971a40a481..67690c947de559857743957ef647244619d90b58 100644
--- a/src/feature_creation/node/operator_nodes/OperatorNode.cpp
+++ b/src/feature_creation/node/operator_nodes/OperatorNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(OperatorNode)
 
diff --git a/src/feature_creation/node/operator_nodes/OperatorNode.hpp b/src/feature_creation/node/operator_nodes/OperatorNode.hpp
index b699f035f35f462da887b2bd6581f64fe2b92d29..f43fb81f2c3ee6beae8151186057784f0d228c6e 100644
--- a/src/feature_creation/node/operator_nodes/OperatorNode.hpp
+++ b/src/feature_creation/node/operator_nodes/OperatorNode.hpp
@@ -9,9 +9,7 @@
 #ifndef OPERATOR_NODE
 #define OPERATOR_NODE
 
-#include <feature_creation/node/Node.hpp>
-#include <feature_creation/node/operator_nodes/functions.hpp>
-#include <utils/math_funcs.hpp>
+#include <iomanip>
 
 #include <boost/serialization/base_object.hpp>
 #include <boost/serialization/export.hpp>
@@ -20,14 +18,16 @@
 #include <boost/serialization/array.hpp>
 #include <boost/serialization/vector.hpp>
 
-#include<iomanip>
+#include "feature_creation/node/Node.hpp"
+#include "feature_creation/node/operator_nodes/functions.hpp"
+#include "utils/math_funcs.hpp"
 
 #ifdef PARAMETERIZE
-#include<nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
 #endif
 
 #ifdef PY_BINDINGS
-#include <python/conversion_utils.hpp>
+#include "python/conversion_utils.hpp"
 
 namespace py = boost::python;
 namespace np = boost::python::numpy;
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
index b1f9cd7888f68dbfbfa2a254c93dfc246556e885..cd93a6fc17e6682e39957fdcd16d6eeb556260d8 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsNode)
 
 void generateAbsNode(
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
index 299260c6ecd4f6f68e963862eb0abf21d18ee1fc..ce655513bf6dede53244ec723e9303af4f0a41ff 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp
@@ -9,7 +9,7 @@
 #ifndef ABS_VAL_NODE
 #define ABS_VAL_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_abs_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
index ee580b02aad6bca7c48fafcb72dd82693c5a085d..4334be2cb2ec24ea8f0029438065a2518ac3760f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
index 06088ada35b44ef5e2c6e85278d136f78db905d9..efd056fdc2802d24d3f937f5bcebca5fcdd8ec91 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ABS_VAL_NODE
 #define PARAM_ABS_VAL_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
index 9b1238ab0cb0c91737f8951702c0144b48757e4a..4afc56de0fff5669e6f5faea6b73177050acecd5 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.cpp
@@ -1,5 +1,5 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
 
 void generateAbsDiffNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
index daf992eeee54a60b333e3da1671af756fa20042d..12a206c21026f5dba30df6311fcece88975407f5 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp
@@ -9,7 +9,7 @@
 #ifndef ABS_DIFF_NODE
 #define ABS_DIFF_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_abs_diff_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
index eedcc449635eee619f78d6398fff67f0b6b59a39..997af578cb1dc6abf2128383f18a2f54bf0d74bf 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AbsDiffParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
index 961355ac9ec792bc60f1e76623ef6247feff1b3c..5d70817f8a367a33988cef44d6bd209f7643e1b8 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ABS_DIFF_NODE
 #define PARAM_ABS_DIFF_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
index 2e3246ae0438458977eb7a7b200aa012c910f89e..e0cd0200ed2769a14a045fe654f744f851f18a41 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
 
 void generateAddNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
index 627121af7378da7855483babca680f03f326e319..972d136a79e5aefe0fbd27a6116a2ddae1f9995c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp
@@ -9,7 +9,7 @@
 #ifndef ADD_NODE
 #define ADD_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_add_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
index 6d10e5568fb90eb22419fb06c9cd8afa41e29dd5..da5685af9683ea5a86b64a8534f1839287be7d7b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(AddParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
index e4846aa10b24b61f520781811537a96344a55e68..ed4d726e3dd553a15a066c2d3e30c6e51a0cffa9 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_ADD_NODE
 #define PARAM_ADD_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
index 1ebbfb7c2ee16ae77a588882a577be8280d640b8..8ad4945f9d322023fec3107d2aa520c35c3b58db 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
 
 void generateCbNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
index d1eb8fd0a905aca529f25588aca2db55c65facac..79971943e289462a9fd76e9a249e71252f5f5b8f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp
@@ -9,7 +9,7 @@
 #ifndef CB_NODE
 #define CB_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cb_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
index 3da7e1c7831640a46b8380dca0b8935554929cce..ef3aad2b95a995c692b55d49e7fe3ab2f11985d3 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CbParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
index 1b46092348755264830e8f48ef7852386578b864..59681406b8641aabb8ad8cc2c025c1f0ff586c81 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_CUBE_NODE
 #define PARAM_CUBE_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
index 1c78350139f68662841655774f27b374fe8744a3..d33db4067ed81460682b44c00a6e5a959f2b7241 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
 
 void generateCbrtNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
index f88e1631c5ccabc2149b2558b09ec618f0d570fa..052e093f803c33dc671fb9d246b3371761e5ea79 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp
@@ -9,7 +9,7 @@
 #ifndef CBRT_NODE
 #define CBRT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cbrt_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
index 87de55f6251e134055494b9fe3181aba2aacc8cb..3acd047e5646ff13147719bf9eae0e53ceb5e959 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CbrtParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
index c22626ca09ca39a5a98f53d5c9f921e0350e960f..4201f6979d535e13b12a1419d71f1a3b9463e616 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_CBRT_NODE
 #define PARAM_CBRT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
index ae621e30c626b46b6daca93e671387337fcb3468..2bbcaddcc0335d1a6c50aed8af9ede0552ac441f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
 
 void generateCosNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
index e7ee85cbc2cb88a79838cd1192123cb3f21ea6da..960f2472e788d6d5fac135ecc9295790fc2cf01a 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp
@@ -9,7 +9,7 @@
 #ifndef COS_NODE
 #define COS_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_cos_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
index bf1f45fe2416824469e7f3dbc06cbbb9dda669eb..aa76173bdd58099741c767f941ded2ba455d47db 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(CosParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
index 78580abab1283785dfaf4e354914b14bf1b6d038..139c3760bb5de2ef71c0d6aba44d12f572182fbe 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_COS_NODE
 #define PARAM_COS_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
index f4314be4e88d39030ea5cad71e7c7f6b423e6eaf..c9dbf13d23432dea626ca83645d6fcd11de3d93f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
 
 void generateDivNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
index 253174e26a017da23dfef9fe1234c8278e9acd6f..ff752a80f83998825572b0a44dad6e6ffa3e32e0 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp
@@ -9,7 +9,7 @@
 #ifndef DIV_NODE
 #define DIV_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_div_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
index d646042638adb0b9b25f2d63d5288a1760410673..8b9f01035bc7403d992adc108e2ed034b21c664c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(DivParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
index fbe99494c1259a8b08bc53a465086fc5162c2455..188b69347d9451cbcc128529607ce504ae1cbcce 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_DIV_NODE
 #define PARAM_DIV_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
index 37288b1da5c86ee0f75f71279bf5140090a4b00d..a270e3ab46a936e5e2baed89431627fdecfe9250 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
 
 void generateExpNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
index 2d2b5fc1bd16bde8f738552c49de3934919bd856..fa1e34742bdcdc615cfb1bfd5a7b1e37f94a0aee 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp
@@ -9,7 +9,7 @@
 #ifndef EXP_NODE
 #define EXP_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_exp_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
index 282d226c3ad7eedd32bfeb30db76f7083bc0f6aa..19acd707944c226f2aff4bf3af60fe49100abaf2 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(ExpParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
index 4cd71ee21bf46db91759c89f94ca47b5aa80391d..4499b3e99836d5cb93569e81d8f5419de08c2059 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_EXP_NODE
 #define PARAM_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
index 36e476ead2495443e7a380aea21f18cdf8577c7a..1ecea5854dea4024b8c15b926ecdf2c354b5e747 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
 
 void generateInvNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
index dba801edbe5a3b4a6644d674b1c9f50167502e13..1b52670357814578379fcd4250409100190c10bf 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp
@@ -9,7 +9,7 @@
 #ifndef INV_NODE
 #define INV_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_inv_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
index 869530544e96b461448bfe02b53db92972ec47fd..73511e1e88b2b5841d4ccad491b8ad2af8832a75 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(InvParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
index 45595da50f816754b1e6c56ee9db23235110e7d9..ce707e6625e2188f5fc8b6d0e2aba5e15ae098c3 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_INV_NODE
 #define PARAM_INV_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
index a666f6acad7c2d0a7062f3a3e825fbf75dc2a4ea..06e460f1a73c19d4b249b978726cff5f048bc121 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
 
 void generateLogNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
index 8029277f30361a9e642b1dcc91245267264ce882..b32685234a8554c7d617b57756d8d2d9d6de2845 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp
@@ -9,7 +9,7 @@
 #ifndef LOG_NODE
 #define LOG_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_log_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
index b7ea4ad185e79eb96c13c9749521d40b4a709bd2..7738c1b688184b061de0253d4298908578dfd9c0 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(LogParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
index c41c11f87667c404852e488bbaf9db727e3d6cd8..274225cd5734da237eb945d30bdc9025e3130a8b 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_LOG_NODE
 #define PARAM_LOG_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
index 30cbbfa86256eefd4ce50539939ed6960f00c69a..84eb9cc542db55ad4e8502e93d763e1a9783af87 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
 
 void generateMultNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
index 9eafb9bee993bc9205118dc2679c201bc198947b..4b6f278b996a44a53748590ba9cccc6ee4a4c0cb 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp
@@ -9,7 +9,7 @@
 #ifndef MULT_NODE
 #define MULT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_multiplication_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
index aa6d0fbd5cb9234300dfff234aff6738f6cfcfa5..510d3e3007cb2f8d97c5b1fc67276f221a3ad190 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(MultParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
index fc05df89ae142284c85dd064deba1305f619c57b..25c9ad1412778dc23fe7c50b3dc0bfd091348afc 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_MULT_NODE
 #define PARAM_MULT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
index 19327f8d3aca384139cd90ef64f532d5769a44dd..d41d88dd1a8f475ddb02f1f0385b3cc7f35640c4 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
 
 void generateNegExpNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
index 21ee392817a4ec3c27f02a1b7ed25eceaf694f46..5410d5980b5b7de3f45d0574536f0c141ac8ebfd 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp
@@ -9,7 +9,7 @@
 #ifndef NEG_EXP_NODE
 #define NEG_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_neg_exp_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
index f170303e1068044610f7f86c5217c8daa838e6d0..de461af980f91b2c645428d0657ef19cdd2aa04f 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(NegExpParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
index 7fe1651b644117d3bd831b287c86779d7fc8abdd..8b5e9d2bd1869dc1f902f61786bdebed1ee34f56 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_NEG_EXP_NODE
 #define PARAM_NEG_EXP_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
index b9664df52a0fb1cb9bc7c7784b9d415907878f9a..bbcb981b35da9b05a838a6030adc3aa365b987c4 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SinParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
index 45bf07a491278611f39b4d6814e1630cabc2706f..3431a10589e5efb2f3f7de198a56fdce12da25d4 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SIN_NODE
 #define PARAM_SIN_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
index bcda54223d337975e8ca67e6b7b6659f5d885626..2e6064c93c21a71a6ba4347e1c5a926df873e71d 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
 
 void generateSinNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
index 2e4e3a3df3604bb0ac75b4404d8e32ca72182d40..50d341487d195a31d71ce1b67bbe69405bea2c2c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp
@@ -9,7 +9,7 @@
 #ifndef SIN_NODE
 #define SIN_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sin_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
index c3de182898c024dec3061081947d3c8bbb3f3006..c6802360a4c7277401480c258414377ed18585bd 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SixPowParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
index a6dcf36fcf2319650867d6e0610a94ec259444b4..de64830cc07089b9f8623486eb3c3be7d11bb372 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SIX_POW_NODE
 #define PARAM_SIX_POW_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
index 53bf9805fcd8eb17781d2405d712917f062eeede..c78e30416c3838ea3434272ce09b186738d8b635 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
 
 void generateSixPowNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
index ac8dfdc6acbdea258ab71f8edd6542b794a4ff94..359b71f7e34929f8ea87a969e599309121bde762 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp
@@ -9,7 +9,7 @@
 #ifndef SIXTH_POW_NODE
 #define SIXTH_POW_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_six_pow_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
index ad56e9db2dac5b1128e763780d10f37613104c10..6d28fca390801b35bfdf401121784741f72abc17 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SqParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
index a0251406c53633447d63e821a1bb6d54a10fe874..1b6f0719d252db15e44ac5008b4121ba5b924daa 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SQ_NODE
 #define PARAM_SQ_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
index e856482d132417da1999a4de558387abf3eefd95..0dd74faf3922e916a9e46bd9b3ed7a3b66d43c0a 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
 
 void generateSqNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
index 6ff265f8dc59d53ab2504b142de16c9f1684d920..ece923b6d01c68f97d61cb85d1fa1d8783a60e18 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp
@@ -9,7 +9,7 @@
 #ifndef SQ_NODE
 #define SQ_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sq_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
index 3c280fcb5022ba7f4ecccd51cbfb65fdb3e15ebe..3bc12241b6e30e750fcabb3f4bd5db057e66fa54 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SqrtParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
index d0174fc72ebff776726eae77b66f141f86a2631f..1aa32e35dbef4c587bedd09095dbd1894225f651 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SQRT_NODE
 #define PARAM_SQRT_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_abs_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
index b7e1c34c17d19a168f26d62f78d365059d4ba989..d6b2a091fac9eb7c358207d0e20a8e42dcefa510 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
 
 void generateSqrtNode(
     std::vector<node_ptr>& feat_list,
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
index c4880d43793a208985014f4bea43b076b9203707..d23a831cc644bc6da45b47a56014709e2be86519 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp
@@ -9,7 +9,7 @@
 #ifndef SQRT_NODE
 #define SQRT_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
 #include <fmt/core.h>
 
 // DocString: cls_sqrt_node
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
index b8f923916c5a377242c0439c90dc3b8ebf519320..6c747532f449c488e9d5a455dd43ede128cc681e 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp"
 
 BOOST_SERIALIZATION_ASSUME_ABSTRACT(SubParamNode)
 
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
index 0c4330ebe199fedf17d3bac3e83a2f03007d5742..9cdfab904e9fa851afb2cba91a0fb18669932550 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp
@@ -9,8 +9,8 @@
 #ifndef PARAM_SUB_NODE
 #define PARAM_SUB_NODE
 
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
 
 // DocString: cls_param_add_node
 /**
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
index fcb3d97112f5d80ed838c7da998e22fd4cf1a3dc..cdae89498909082864a286c4e9917903b1ec2d34 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
 
 void generateSubNode(std::vector<node_ptr>& feat_list, const node_ptr feat_1, const node_ptr feat_2, unsigned long int& feat_ind, const double l_bound, const double u_bound)
 {
diff --git a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
index 3631dc12f82e8a720569ea7d08a568b094e87f2a..9039a9718b8b607774bbd05d7693605dad3bba48 100644
--- a/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp
@@ -9,9 +9,10 @@
 #ifndef SUB_NODE
 #define SUB_NODE
 
-#include <feature_creation/node/operator_nodes/OperatorNode.hpp>
 #include <fmt/core.h>
 
+#include "feature_creation/node/operator_nodes/OperatorNode.hpp"
+
 // DocString: cls_sub_node
 /**
  * @brief Node for the subtraction operator
diff --git a/src/feature_creation/node/operator_nodes/allowed_ops.cpp b/src/feature_creation/node/operator_nodes/allowed_ops.cpp
index e5115555dc2e6a23f6632d980bff6af3d63ea90d..2fea7d7d941c3dba6088b4a26295b8f831d15c50 100644
--- a/src/feature_creation/node/operator_nodes/allowed_ops.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_ops.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
 
 std::map<std::string, un_op_node_gen> allowed_op_maps::unary_operator_map;
 std::map<std::string, bin_op_node_gen> allowed_op_maps::binary_operator_map;
diff --git a/src/feature_creation/node/operator_nodes/allowed_ops.hpp b/src/feature_creation/node/operator_nodes/allowed_ops.hpp
index 8676e617d6e0f6dfe75afba0f5146e150d9841a2..b609fbb9bf19c27f67dd808cdeccacd64632c27c 100644
--- a/src/feature_creation/node/operator_nodes/allowed_ops.hpp
+++ b/src/feature_creation/node/operator_nodes/allowed_ops.hpp
@@ -8,41 +8,41 @@
 #define ALLOWED_OP_NODES
 
 #ifdef PARAMETERIZE
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/parameterized_add.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/parameterized_subtract.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/parameterized_absolute_value.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/parameterized_absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/parameterized_multiply.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/parameterized_divide.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/parameterized_inverse.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/parameterized_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/parameterized_negative_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/parameterized_log.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/parameterized_square.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/parameterized_cube.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/parameterized_sixth_power.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/parameterized_square_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/parameterized_cube_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/parameterized_sin.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/parameterized_cos.hpp"
 #else
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp>
-#include <feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp>
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/add/add.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sub/subtract.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs/absolute_value.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/abs_diff/absolute_difference.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/mult/multiply.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/div/divide.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/inv/inverse.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/exp/exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/neg_exp/negative_exponential.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/log/log.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sq/square.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cb/cube.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/six_pow/sixth_power.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sqrt/square_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cbrt/cube_root.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/sin/sin.hpp"
+#include "feature_creation/node/operator_nodes/allowed_operator_nodes/cos/cos.hpp"
 #endif
 
 #include <map>
diff --git a/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp b/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
index 17fea3f1a1cf2be10cdb7ad1a1fb6dd1ff3f7c5c..719d6318888876aed4cbe7227630f198bce3da96 100644
--- a/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
+++ b/src/feature_creation/node/operator_nodes/allowed_parameter_ops.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
 
 std::map<std::string, un_param_op_node_gen> allowed_op_maps::unary_param_operator_map;
 std::map<std::string, bin_param_op_node_gen> allowed_op_maps::binary_param_operator_map;
diff --git a/src/feature_creation/node/utils.cpp b/src/feature_creation/node/utils.cpp
index c87aa906cae8405fb99adecac58a3611c3adecb3..cff334885e651247d0b57e1f376d0a8fb7a53f1f 100644
--- a/src/feature_creation/node/utils.cpp
+++ b/src/feature_creation/node/utils.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/utils.hpp>
+#include "feature_creation/node/utils.hpp"
 
 #ifdef PARAMETERIZE
 void str2node::set_parameters(node_ptr feat, const std::vector<std::string> op_terms)
diff --git a/src/feature_creation/node/utils.hpp b/src/feature_creation/node/utils.hpp
index b3c7567d6029eeac275b46854314129e256619d1..547efe2c7c16e551f3ad10390a8e461a457cdf5d 100644
--- a/src/feature_creation/node/utils.hpp
+++ b/src/feature_creation/node/utils.hpp
@@ -8,12 +8,12 @@
 #define NODE_UTILS
 
 #include <fstream>
-#include <feature_creation/node/FeatureNode.hpp>
-#include <feature_creation/node/ModelNode.hpp>
-#include <feature_creation/node/operator_nodes/allowed_ops.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
 
-#include <utils/string_utils.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
+#include "feature_creation/node/ModelNode.hpp"
+#include "feature_creation/node/operator_nodes/allowed_ops.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
+#include "utils/string_utils.hpp"
 
 namespace str2node
 {
diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.cpp b/src/feature_creation/node/value_storage/nodes_value_containers.cpp
index ba603c17cf63f5feeea4ed9e652f8fa21d5c9088..06b10625ad13bde4d465b59159b58763eb32cafb 100644
--- a/src/feature_creation/node/value_storage/nodes_value_containers.cpp
+++ b/src/feature_creation/node/value_storage/nodes_value_containers.cpp
@@ -1,5 +1,4 @@
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
-#include <iostream>
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
 
 int node_value_arrs::N_SELECTED = 0;
 int node_value_arrs::N_SAMPLES = 0;
diff --git a/src/feature_creation/node/value_storage/nodes_value_containers.hpp b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
index 6f0937bfea1a379482f9c5a0b29407c756c0caae..a0b1039c576704f794ffa1e62796fcd813a05af6 100644
--- a/src/feature_creation/node/value_storage/nodes_value_containers.hpp
+++ b/src/feature_creation/node/value_storage/nodes_value_containers.hpp
@@ -19,7 +19,7 @@
 
 #include <omp.h>
 
-#include<utils/enum.hpp>
+#include"utils/enum.hpp"
 
 namespace node_value_arrs
 {
diff --git a/src/feature_creation/units/Unit.cpp b/src/feature_creation/units/Unit.cpp
index 91cf989a49f3a1d220303d878ef2a4e2e10789b4..72a822e0a6ec2e6e6cfd4a77b88aa8855562cd17 100644
--- a/src/feature_creation/units/Unit.cpp
+++ b/src/feature_creation/units/Unit.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/units/Unit.hpp>
+#include "feature_creation/units/Unit.hpp"
 
 Unit::Unit() :
     _dct()
diff --git a/src/feature_creation/units/Unit.hpp b/src/feature_creation/units/Unit.hpp
index f6189df245e1b99ef445082ad801a0771b2d41e7..810885db114873f1ad22c1cd4a49409dc72ad80a 100644
--- a/src/feature_creation/units/Unit.hpp
+++ b/src/feature_creation/units/Unit.hpp
@@ -22,7 +22,7 @@
 #include <boost/serialization/map.hpp>
 #include <boost/serialization/string.hpp>
 
-#include <utils/string_utils.hpp>
+#include "utils/string_utils.hpp"
 
 using StringRange = boost::iterator_range<std::string::const_iterator>;
 
diff --git a/src/inputs/InputParser.cpp b/src/inputs/InputParser.cpp
index 0ac618f5e4584eaff1661190844f4c879de808ee..d568c109b67612f4bd1c1ecd59feb097b3156afa 100644
--- a/src/inputs/InputParser.cpp
+++ b/src/inputs/InputParser.cpp
@@ -1,4 +1,4 @@
-#include <inputs/InputParser.hpp>
+#include "inputs/InputParser.hpp"
 
 InputParser::InputParser(pt::ptree IP, std::string fn, std::shared_ptr<MPI_Interface> comm) :
     _opset(as_vector<std::string>(IP, "opset")),
diff --git a/src/inputs/InputParser.hpp b/src/inputs/InputParser.hpp
index e0b00ea653297535185df9b987ef8eeac4ab531c..39fedcaddebe69160596a50273d4c52cf4219169 100644
--- a/src/inputs/InputParser.hpp
+++ b/src/inputs/InputParser.hpp
@@ -23,8 +23,8 @@
 #include <random>
 #include <chrono>
 
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <feature_creation/node/value_storage/nodes_value_containers.hpp>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "feature_creation/node/value_storage/nodes_value_containers.hpp"
 
 namespace pt = boost::property_tree;
 
diff --git a/src/main.cpp b/src/main.cpp
index 06c0ce1f268868eb6f8d6baafbdec9091aa21743..584c2e5841e3d46556427d32010737670216b4fc 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,18 +1,15 @@
-#include <inputs/InputParser.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
 #include <iostream>
-// #include <gflags/gflags.h>
+
+#include "inputs/InputParser.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 int main(int argc, char const *argv[])
 {
 
     allowed_op_maps::set_node_maps();
     #ifdef PARAMETERIZE
-        // google::InitGoogleLogging("XXX");
-        // google::SetCommandLineOption("GLOG_minloglevel", "3");
-        // google::SetCommandLineOption("stderrthreshold", "3");
         allowed_op_maps::set_param_node_maps();
     #endif
 
diff --git a/src/mpi_interface/MPI_Interface.cpp b/src/mpi_interface/MPI_Interface.cpp
index ad56fdb37702c3a372aa61f3593728eb54388497..96b7b3af8f6009cd9caa7ee8846d6a2953b46a0b 100644
--- a/src/mpi_interface/MPI_Interface.cpp
+++ b/src/mpi_interface/MPI_Interface.cpp
@@ -1,4 +1,4 @@
-#include <mpi_interface/MPI_Interface.hpp>
+#include "mpi_interface/MPI_Interface.hpp"
 
 MPI_Interface::MPI_Interface() : boost::mpi::communicator()
 {}
diff --git a/src/mpi_interface/MPI_ops.cpp b/src/mpi_interface/MPI_ops.cpp
index e647fc3f8e62cb7cdc1e0f90cc6ad935a4be866e..543cbc48dc25ae7202137de3c675377dbbc151b5 100644
--- a/src/mpi_interface/MPI_ops.cpp
+++ b/src/mpi_interface/MPI_ops.cpp
@@ -1,4 +1,4 @@
-#include<mpi_interface/MPI_ops.hpp>
+#include "mpi_interface/MPI_ops.hpp"
 
 // MPI_Op top_feats;
 std::function<bool(const double*, const int, const double, const std::vector<node_sc_pair>&, const double)> mpi_reduce_op::IS_VALID;
diff --git a/src/mpi_interface/MPI_ops.hpp b/src/mpi_interface/MPI_ops.hpp
index 7441e263c811ab9f363c674b3a21574f16a3f56c..6a2b7ea70c1aaf502365701e6f06e03824cbd22e 100644
--- a/src/mpi_interface/MPI_ops.hpp
+++ b/src/mpi_interface/MPI_ops.hpp
@@ -10,8 +10,9 @@
 #define SISSO_MPI_OPS
 
 #include <boost/mpi.hpp>
-#include <feature_creation/node/Node.hpp>
-#include <utils/compare_features.hpp>
+
+#include "feature_creation/node/Node.hpp"
+#include "utils/compare_features.hpp"
 
 namespace mpi_reduce_op
 {
diff --git a/src/nl_opt/NLOptWrapper.cpp b/src/nl_opt/NLOptWrapper.cpp
index 9487dcdfc032aefa235f86334ac297a32fd50c46..cd258a6c1f93f9ef7d975e862cbb190b2be5b1f5 100644
--- a/src/nl_opt/NLOptWrapper.cpp
+++ b/src/nl_opt/NLOptWrapper.cpp
@@ -1,4 +1,5 @@
-#include <nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
+
 int nlopt_wrapper::MAX_PARAM_DEPTH = -1;
 NLOptimizer::NLOptimizer(
     const std::vector<int>& task_sizes,
diff --git a/src/nl_opt/NLOptWrapper.hpp b/src/nl_opt/NLOptWrapper.hpp
index f288cfdde2390dd2e69b7d76bdf9c772e631ac7d..f262e5f34be6518f7211ba550b3ba44a7a5c23ca 100644
--- a/src/nl_opt/NLOptWrapper.hpp
+++ b/src/nl_opt/NLOptWrapper.hpp
@@ -8,8 +8,8 @@
 #define NL_OPT_WRAPPER
 
 #include <nlopt.hpp>
-#include <feature_creation/node/Node.hpp>
-#include <classification/ConvexHull1D.hpp>
+#include "feature_creation/node/Node.hpp"
+#include "classification/ConvexHull1D.hpp"
 
 class NLOptimizer
 {
diff --git a/src/python/bindings_docstring_keyed.cpp b/src/python/bindings_docstring_keyed.cpp
index 91ddcc9c0b1a9d7651244e8812904200a622ff90..f281022880dff3f80dc59fcd697fa70024af53c5 100644
--- a/src/python/bindings_docstring_keyed.cpp
+++ b/src/python/bindings_docstring_keyed.cpp
@@ -1,4 +1,4 @@
-#include <python/bindings.hpp>
+#include "python/bindings.hpp"
 
 using namespace boost::python;
 
diff --git a/src/python/bindings_docstring_keyed.hpp b/src/python/bindings_docstring_keyed.hpp
index c459f2fa7de97ef01c8b99500825fc99f47d06d4..1bded8609cabef26237063c30ac440f35091df53 100644
--- a/src/python/bindings_docstring_keyed.hpp
+++ b/src/python/bindings_docstring_keyed.hpp
@@ -7,13 +7,13 @@
 #ifndef PYTHON_BINDING
 #define PYTHON_BINDINGS
 
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
-#include <feature_creation/feature_space/FeatureSpace.hpp>
-#include <nl_opt/NLOptWrapper.hpp>
-#include <python/feature_creation/node_utils.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
+#include "feature_creation/feature_space/FeatureSpace.hpp"
+#include "nl_opt/NLOptWrapper.hpp"
+#include "python/feature_creation/node_utils.hpp"
 
 namespace py = boost::python;
 namespace np = boost::python::numpy;
diff --git a/src/python/conversion_utils.hpp b/src/python/conversion_utils.hpp
index 284943027d006c9cc0e7c934870d308bd9339180..94898cf9682374fdb65b9092eff1dccb87959766 100644
--- a/src/python/conversion_utils.hpp
+++ b/src/python/conversion_utils.hpp
@@ -9,13 +9,13 @@
 
 #include <algorithm>
 #include <array>
+#include <iostream>
+#include <map>
 #include <vector>
+
 #include <boost/python.hpp>
 #include <boost/python/numpy.hpp>
 
-#include <iostream>
-#include <map>
-
 namespace python_conv_utils
 {
     namespace py = boost::python;
diff --git a/src/python/descriptor_identifier/Model.cpp b/src/python/descriptor_identifier/Model.cpp
index 2af0586f21823c2a5f8c95fdc7418a3cc2658427..d1778521b8bbea83543336ee22c0fdcd3f3564e5 100644
--- a/src/python/descriptor_identifier/Model.cpp
+++ b/src/python/descriptor_identifier/Model.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/Model.hpp>
+#include "descriptor_identifier/Model/Model.hpp"
 
 np::ndarray Model::eval_many_py(np::ndarray x_in) const
 {
diff --git a/src/python/descriptor_identifier/ModelClassifier.cpp b/src/python/descriptor_identifier/ModelClassifier.cpp
index d5a0555f996ec60cf48148b763bee1b3ae0cd42d..a6dd3c52cf1dab3106234575f94de49bdd31808b 100644
--- a/src/python/descriptor_identifier/ModelClassifier.cpp
+++ b/src/python/descriptor_identifier/ModelClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/Model/ModelClassifier.hpp>
+#include "descriptor_identifier/Model/ModelClassifier.hpp"
 
 ModelClassifier::ModelClassifier(const ModelClassifier& o, py::list new_coefs, np::ndarray prop_train_est, np::ndarray prop_test_est) :
     Model(o),
diff --git a/src/python/descriptor_identifier/SISSOClassifier.cpp b/src/python/descriptor_identifier/SISSOClassifier.cpp
index ce949e2a4cd14df2b06c3463df984c6cdc09b863..a4857b067905b1bd1bd6f9834ce06d9703227a4e 100644
--- a/src/python/descriptor_identifier/SISSOClassifier.cpp
+++ b/src/python/descriptor_identifier/SISSOClassifier.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOClassifier.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOClassifier.hpp"
 
 SISSOClassifier::SISSOClassifier(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSOLogRegressor.cpp b/src/python/descriptor_identifier/SISSOLogRegressor.cpp
index 97b56c2488b5c688475668a627bf8e7f7a0b7f91..97ff8ad17589a54182a26eba22554b2f0d317f6c 100644
--- a/src/python/descriptor_identifier/SISSOLogRegressor.cpp
+++ b/src/python/descriptor_identifier/SISSOLogRegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSOLogRegressor.hpp"
 
 SISSOLogRegressor::SISSOLogRegressor(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSORegressor.cpp b/src/python/descriptor_identifier/SISSORegressor.cpp
index 2b88aa109e8feeb2438c1b0930c5242eeb7435c5..98c507d15a6726b931572f98a466b75b44423ff6 100644
--- a/src/python/descriptor_identifier/SISSORegressor.cpp
+++ b/src/python/descriptor_identifier/SISSORegressor.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSORegressor.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSORegressor.hpp"
 
 SISSORegressor::SISSORegressor(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/descriptor_identifier/SISSO_DI.cpp b/src/python/descriptor_identifier/SISSO_DI.cpp
index c7920cc4acbc39b3b1dd6148759f9371b847765c..4d8998cbaffab2c6bbefcf13cfddd8c6c96fe38e 100644
--- a/src/python/descriptor_identifier/SISSO_DI.cpp
+++ b/src/python/descriptor_identifier/SISSO_DI.cpp
@@ -1,4 +1,4 @@
-#include <descriptor_identifier/SISSO_DI/SISSO_DI.hpp>
+#include "descriptor_identifier/SISSO_DI/SISSO_DI.hpp"
 
 SISSO_DI::SISSO_DI(
     std::shared_ptr<FeatureSpace> feat_space,
diff --git a/src/python/feature_creation/FeatureNode.cpp b/src/python/feature_creation/FeatureNode.cpp
index d4c84529a82942fbf5ab4f143cd0882ff244ccc0..998e720c1c8ba2960bae4fa5b804dfa21bc4c238 100644
--- a/src/python/feature_creation/FeatureNode.cpp
+++ b/src/python/feature_creation/FeatureNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/FeatureNode.hpp>
+#include "feature_creation/node/FeatureNode.hpp"
 
 FeatureNode::FeatureNode(unsigned long int feat_ind, std::string expr, np::ndarray value, np::ndarray test_value, Unit unit) :
     Node(feat_ind, value.shape(0), test_value.shape(0)),
diff --git a/src/python/feature_creation/FeatureSpace.cpp b/src/python/feature_creation/FeatureSpace.cpp
index 1bf6218883278acfb7006e3d0c5e72e788a3cb2c..15be757a2f642c95e528f879d490f30ac1c2f749 100644
--- a/src/python/feature_creation/FeatureSpace.cpp
+++ b/src/python/feature_creation/FeatureSpace.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/feature_space/FeatureSpace.hpp>
+#include "feature_creation/feature_space/FeatureSpace.hpp"
 
 #ifdef PARAMETERIZE
 FeatureSpace::FeatureSpace(
diff --git a/src/python/feature_creation/ModelNode.cpp b/src/python/feature_creation/ModelNode.cpp
index f98ed0e55a996b3bf568e4424f31fd6eebaef38c..e48203c344137d7bb1cd9702dedd24691fae5e0e 100644
--- a/src/python/feature_creation/ModelNode.cpp
+++ b/src/python/feature_creation/ModelNode.cpp
@@ -1,4 +1,4 @@
-#include <feature_creation/node/ModelNode.hpp>
+#include "feature_creation/node/ModelNode.hpp"
 
 np::ndarray ModelNode::eval_many_py(np::ndarray x_in)
 {
diff --git a/src/python/feature_creation/node_utils.cpp b/src/python/feature_creation/node_utils.cpp
index 5411a1d05b9de1554f6db944aed805f34aad7061..bd844593d9f3517d8920d46a35472f79b3701aa3 100644
--- a/src/python/feature_creation/node_utils.cpp
+++ b/src/python/feature_creation/node_utils.cpp
@@ -1,4 +1,4 @@
-#include <python/feature_creation/node_utils.hpp>
+#include "python/feature_creation/node_utils.hpp"
 
 py::list str2node::phi_selected_from_file_py(std::string filename, py::list phi_0)
 {
diff --git a/src/python/feature_creation/node_utils.hpp b/src/python/feature_creation/node_utils.hpp
index 5d3d7e9a5fa63721642587f70fa0b0279a4e1563..149e3e3dc52fde96c4fcb258084aecf8c8e3a6c8 100644
--- a/src/python/feature_creation/node_utils.hpp
+++ b/src/python/feature_creation/node_utils.hpp
@@ -7,7 +7,7 @@
 #ifndef NODE_UTILS_PY
 #define NODE_UTILS_PY
 
-#include <feature_creation/node/utils.hpp>
+#include "feature_creation/node/utils.hpp"
 
 namespace py = boost::python;
 
@@ -25,4 +25,4 @@ namespace str2node
     py::list phi_selected_from_file_py(std::string filename, py::list phi_0);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/utils/compare_features.cpp b/src/utils/compare_features.cpp
index eb991c7239a691539c62a6b60d77104181187c20..024ec5bbf79735c6da562078619ee325e3a7b646 100644
--- a/src/utils/compare_features.cpp
+++ b/src/utils/compare_features.cpp
@@ -1,4 +1,4 @@
-#include <utils/compare_features.hpp>
+#include "utils/compare_features.hpp"
 std::vector<double> comp_feats::CORR_CHECK;
 std::vector<double> comp_feats::RANK;
 std::vector<int> comp_feats::INDEX;
diff --git a/src/utils/compare_features.hpp b/src/utils/compare_features.hpp
index d21d806c221a328beb348277e999b6c8ab20f97c..955fa39755d7f2364888bce92892c4f46d3efdcd 100644
--- a/src/utils/compare_features.hpp
+++ b/src/utils/compare_features.hpp
@@ -9,7 +9,7 @@
 
 #include <tuple>
 
-#include <feature_creation/node/Node.hpp>
+#include "feature_creation/node/Node.hpp"
 
 typedef std::tuple<node_ptr, double> node_sc_pair;
 
diff --git a/src/utils/math_funcs.cpp b/src/utils/math_funcs.cpp
index b853a0e27f2d756dfc31bdea4da23ac8f5a479a3..1efd66c153d61364b612c10cf6fb19841dc5a597 100644
--- a/src/utils/math_funcs.cpp
+++ b/src/utils/math_funcs.cpp
@@ -1,4 +1,4 @@
-#include <utils/math_funcs.hpp>
+#include "utils/math_funcs.hpp"
 
 bool util_funcs::iterate(std::vector<int>& inds, int size, int incriment)
 {
diff --git a/src/utils/math_funcs.hpp b/src/utils/math_funcs.hpp
index c505163456fa842d2fdeaddb5211c50fb205d2ac..80ccd010ae5f0119f600d0656d5fef8daaab8bda 100644
--- a/src/utils/math_funcs.hpp
+++ b/src/utils/math_funcs.hpp
@@ -9,12 +9,12 @@
 
 #include <algorithm>
 #include <functional>
+#include <iostream>
 #include <numeric>
 #include <vector>
 #include <math.h>
-#include <utils/mkl_interface.hpp>
 
-#include<iostream>
+#include "utils/mkl_interface.hpp"
 
 namespace util_funcs
 {
diff --git a/src/utils/project.cpp b/src/utils/project.cpp
index c79fb028fd7e272281217cad6ad85a9675d4a3b0..376e9bbf39d908d8c08dcfdacfc2fb5d5b8f13fa 100644
--- a/src/utils/project.cpp
+++ b/src/utils/project.cpp
@@ -1,4 +1,4 @@
-#include <utils/project.hpp>
+#include "utils/project.hpp"
 
 void project_funcs::set_project_fxn(
     const std::string project_type,
diff --git a/src/utils/project.hpp b/src/utils/project.hpp
index 1ddf020a0b80712a9ed470105a0af2a3a7e1108a..f3ac91513bf79a8fa58a3adffe6e7850b757a9e8 100644
--- a/src/utils/project.hpp
+++ b/src/utils/project.hpp
@@ -11,10 +11,10 @@
 #include <iostream>
 #include <omp.h>
 
-#include <classification/ConvexHull1D.hpp>
-#include <feature_creation/node/Node.hpp>
+#include "classification/ConvexHull1D.hpp"
+#include "feature_creation/node/Node.hpp"
 #ifdef PARAMETERIZE
-#include <nl_opt/NLOptWrapper.hpp>
+#include "nl_opt/NLOptWrapper.hpp"
 #endif
 
 namespace project_funcs
diff --git a/src/utils/string_utils.cpp b/src/utils/string_utils.cpp
index 7fd20aa793437651918838b513b93d8ee638bb89..e7b71b8c2ca1a6dbe758072c3cb325d3e790b672 100644
--- a/src/utils/string_utils.cpp
+++ b/src/utils/string_utils.cpp
@@ -1,4 +1,4 @@
-#include <utils/string_utils.hpp>
+#include "utils/string_utils.hpp"
 
 std::vector<std::string> str_utils::split_string_trim(const std::string str, const std::string split_tokens)
 {