-#include "can-signals.hpp"
-#include "can-message.hpp"
-#include "openxc-utils.hpp"
+#include "configuration.hpp"
+#include "can/can-bus.hpp"
+#include "can/can-signals.hpp"
+#include "can/can-message.hpp"
+#include "utils/timer.hpp"
+#include "utils/signals.hpp"
+#include "utils/openxc-utils.hpp"