From 0fa406c5d16e2305434565133cab4483904cf549 Mon Sep 17 00:00:00 2001
From: Gergely Nagy <algernon@keyboard.io>
Date: Fri, 21 Aug 2020 12:56:31 +0200
Subject: [PATCH] wip: drop the executor namespace

Signed-off-by: Gergely Nagy <algernon@keyboard.io>
---
 .../simulator/{executor => }/AglaisInterface.cpp   | 12 +++++-------
 .../simulator/{executor => }/AglaisInterface.h     |  3 ---
 .../simulator/{executor => }/Executor.cpp          | 14 ++++++--------
 .../simulator/{executor => }/Executor.h            |  3 ---
 src/kaleidoscope/simulator/Simulator.h             | 14 ++++++--------
 .../simulator/{executor => }/SimulatorCore.cpp     |  6 ++----
 .../simulator/{executor => }/SimulatorCore.h       |  2 --
 .../{executor => }/actions/AssertLayerIsActive.h   |  2 --
 .../actions/AssertTopActiveLayerIs.h               |  2 --
 .../actions/generic_report/GenerateHostEvent.cpp   | 12 +++++-------
 .../actions/generic_report/GenerateHostEvent.h     |  2 --
 .../simulator/{executor => }/aux/exceptions.h      |  2 --
 .../{executor => }/reports/AbsoluteMouseReport.cpp |  4 +---
 .../{executor => }/reports/AbsoluteMouseReport.h   |  2 --
 .../{executor => }/reports/BootKeyboardReport.cpp  |  6 ++----
 .../{executor => }/reports/BootKeyboardReport.h    |  2 --
 .../{executor => }/reports/KeyboardReport.cpp      |  6 ++----
 .../{executor => }/reports/KeyboardReport.h        |  2 --
 .../{executor => }/reports/MouseReport.cpp         |  4 +---
 .../simulator/{executor => }/reports/MouseReport.h |  2 --
 .../{executor => }/vendors/keyboardio/model01.cpp  |  2 +-
 .../{executor => }/vendors/keyboardio/model01.h    |  0
 test/simulator/HelloWorld/tests.h                  |  4 +---
 23 files changed, 32 insertions(+), 76 deletions(-)
 rename src/kaleidoscope/simulator/{executor => }/AglaisInterface.cpp (93%)
 rename src/kaleidoscope/simulator/{executor => }/AglaisInterface.h (95%)
 rename src/kaleidoscope/simulator/{executor => }/Executor.cpp (84%)
 rename src/kaleidoscope/simulator/{executor => }/Executor.h (96%)
 rename src/kaleidoscope/simulator/{executor => }/SimulatorCore.cpp (98%)
 rename src/kaleidoscope/simulator/{executor => }/SimulatorCore.h (97%)
 rename src/kaleidoscope/simulator/{executor => }/actions/AssertLayerIsActive.h (97%)
 rename src/kaleidoscope/simulator/{executor => }/actions/AssertTopActiveLayerIs.h (97%)
 rename src/kaleidoscope/simulator/{executor => }/actions/generic_report/GenerateHostEvent.cpp (96%)
 rename src/kaleidoscope/simulator/{executor => }/actions/generic_report/GenerateHostEvent.h (98%)
 rename src/kaleidoscope/simulator/{executor => }/aux/exceptions.h (96%)
 rename src/kaleidoscope/simulator/{executor => }/reports/AbsoluteMouseReport.cpp (97%)
 rename src/kaleidoscope/simulator/{executor => }/reports/AbsoluteMouseReport.h (99%)
 rename src/kaleidoscope/simulator/{executor => }/reports/BootKeyboardReport.cpp (96%)
 rename src/kaleidoscope/simulator/{executor => }/reports/BootKeyboardReport.h (99%)
 rename src/kaleidoscope/simulator/{executor => }/reports/KeyboardReport.cpp (97%)
 rename src/kaleidoscope/simulator/{executor => }/reports/KeyboardReport.h (99%)
 rename src/kaleidoscope/simulator/{executor => }/reports/MouseReport.cpp (97%)
 rename src/kaleidoscope/simulator/{executor => }/reports/MouseReport.h (99%)
 rename src/kaleidoscope/simulator/{executor => }/vendors/keyboardio/model01.cpp (98%)
 rename src/kaleidoscope/simulator/{executor => }/vendors/keyboardio/model01.h (100%)

diff --git a/src/kaleidoscope/simulator/executor/AglaisInterface.cpp b/src/kaleidoscope/simulator/AglaisInterface.cpp
similarity index 93%
rename from src/kaleidoscope/simulator/executor/AglaisInterface.cpp
rename to src/kaleidoscope/simulator/AglaisInterface.cpp
index fe9cf851..ec9374d7 100644
--- a/src/kaleidoscope/simulator/executor/AglaisInterface.cpp
+++ b/src/kaleidoscope/simulator/AglaisInterface.cpp
@@ -18,11 +18,11 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/AglaisInterface.h"
-#include "kaleidoscope/simulator/executor/reports/KeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/BootKeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/MouseReport.h"
-#include "kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h"
+#include "kaleidoscope/simulator/AglaisInterface.h"
+#include "kaleidoscope/simulator/reports/KeyboardReport.h"
+#include "kaleidoscope/simulator/reports/BootKeyboardReport.h"
+#include "kaleidoscope/simulator/reports/MouseReport.h"
+#include "kaleidoscope/simulator/reports/AbsoluteMouseReport.h"
 #include "kaleidoscope/simulator/LogProtocol.h"
 #include "kaleidoscope/simulator/log_protocol/Consumer_.h"
 #include "kaleidoscope/simulator/interface/actions/generic_report/AssertReportEquals.h"
@@ -31,7 +31,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 /// @private
 ///
@@ -160,7 +159,6 @@ void processAglaisDocument(const char *code, interface::Simulator_ &simulator) {
   simulator.setErrorIfReportWithoutQueuedActions(rwqa_state);
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/AglaisInterface.h b/src/kaleidoscope/simulator/AglaisInterface.h
similarity index 95%
rename from src/kaleidoscope/simulator/executor/AglaisInterface.h
rename to src/kaleidoscope/simulator/AglaisInterface.h
index db9dcca3..ceaac3aa 100644
--- a/src/kaleidoscope/simulator/executor/AglaisInterface.h
+++ b/src/kaleidoscope/simulator/AglaisInterface.h
@@ -26,11 +26,8 @@ namespace interface {
 class Simulator_;
 } // namespace interface
 
-namespace executor {
-
 void processAglaisDocument(const char *code, interface::Simulator_ &sim);
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/Executor.cpp b/src/kaleidoscope/simulator/Executor.cpp
similarity index 84%
rename from src/kaleidoscope/simulator/executor/Executor.cpp
rename to src/kaleidoscope/simulator/Executor.cpp
index 4713b43e..bb591fd1 100644
--- a/src/kaleidoscope/simulator/executor/Executor.cpp
+++ b/src/kaleidoscope/simulator/Executor.cpp
@@ -18,12 +18,12 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/Executor.h"
-#include "kaleidoscope/simulator/executor/SimulatorCore.h"
-#include "kaleidoscope/simulator/executor/reports/KeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/BootKeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/MouseReport.h"
-#include "kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h"
+#include "kaleidoscope/simulator/Executor.h"
+#include "kaleidoscope/simulator/SimulatorCore.h"
+#include "kaleidoscope/simulator/reports/KeyboardReport.h"
+#include "kaleidoscope/simulator/reports/BootKeyboardReport.h"
+#include "kaleidoscope/simulator/reports/MouseReport.h"
+#include "kaleidoscope/simulator/reports/AbsoluteMouseReport.h"
 
 #include "Kaleidoscope.h"
 #include "HIDReportObserver.h"
@@ -32,7 +32,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 Executor::Executor(std::ostream &out) : interface::Simulator_{out} {
   this->setCore(
@@ -84,7 +83,6 @@ void Executor::processHIDReport(uint8_t id, const void* data,
   }
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/Executor.h b/src/kaleidoscope/simulator/Executor.h
similarity index 96%
rename from src/kaleidoscope/simulator/executor/Executor.h
rename to src/kaleidoscope/simulator/Executor.h
index b0f0cf4d..307aa11c 100644
--- a/src/kaleidoscope/simulator/executor/Executor.h
+++ b/src/kaleidoscope/simulator/Executor.h
@@ -30,8 +30,6 @@ namespace kaleidoscope {
 ///
 namespace simulator {
 
-namespace executor {
-
 /// @brief A Kaleidoscope specific simulator class.
 ///
 class Executor : public interface::Simulator_ {
@@ -49,7 +47,6 @@ class Executor : public interface::Simulator_ {
                                int len, int result);
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/Simulator.h b/src/kaleidoscope/simulator/Simulator.h
index 925a5d33..92c3d6c1 100644
--- a/src/kaleidoscope/simulator/Simulator.h
+++ b/src/kaleidoscope/simulator/Simulator.h
@@ -40,13 +40,13 @@ uint8_t toKeycode(Key key) {
 } // namespace kaleidoscope
 
 #include "kaleidoscope/simulator/Interface.h"
-#include "kaleidoscope/simulator/executor/Executor.h"
-#include "kaleidoscope/simulator/executor/AglaisInterface.h"
+#include "kaleidoscope/simulator/Executor.h"
+#include "kaleidoscope/simulator/AglaisInterface.h"
 #include "kaleidoscope/simulator/interface/Visualization.h"
 
-#include "kaleidoscope/simulator/executor/actions/AssertLayerIsActive.h"
-#include "kaleidoscope/simulator/executor/actions/AssertTopActiveLayerIs.h"
-#include "kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.h"
+#include "kaleidoscope/simulator/actions/AssertLayerIsActive.h"
+#include "kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h"
+#include "kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h"
 
 #include <iostream>
 
@@ -60,10 +60,8 @@ extern void executeTestFunction();
                                                                                \
    namespace kaleidoscope {                                                    \
    namespace simulator {                                                       \
-   namespace executor {                                                        \
    /* Forward declare the actual test function */                              \
    void runSimulator(Executor &simulator);                                     \
-   } /* namespace executor */                                                  \
    } /* namespace simulator */                                                 \
    } /* namespace kaleidoscope */                                              \
                                                                                \
@@ -72,6 +70,6 @@ extern void executeTestFunction();
     */                                                                         \
    void executeTestFunction() {                                                \
       setup(); /* setup Kaleidoscope */                                        \
-      using namespace kaleidoscope::simulator::executor;                       \
+      using namespace kaleidoscope::simulator;                                 \
       runSimulator(Executor::getInstance());                                   \
    }
diff --git a/src/kaleidoscope/simulator/executor/SimulatorCore.cpp b/src/kaleidoscope/simulator/SimulatorCore.cpp
similarity index 98%
rename from src/kaleidoscope/simulator/executor/SimulatorCore.cpp
rename to src/kaleidoscope/simulator/SimulatorCore.cpp
index 7ea26012..0908cf0a 100644
--- a/src/kaleidoscope/simulator/executor/SimulatorCore.cpp
+++ b/src/kaleidoscope/simulator/SimulatorCore.cpp
@@ -18,7 +18,7 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/SimulatorCore.h"
+#include "kaleidoscope/simulator/SimulatorCore.h"
 
 #include "Kaleidoscope.h"
 
@@ -29,7 +29,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 std::map<uint8_t, const char*> hid_code_to_string = {
   { 0x04, "A   " },  // HID_KEYBOARD_A_AND_A
@@ -466,12 +465,11 @@ void SimulatorCore::loop() {
   ::loop();
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
 unsigned long millis(void) {
-  return kaleidoscope::simulator::executor::millis;
+  return kaleidoscope::simulator::millis;
 }
 
 #endif // KALEIDOSCOPE_VIRTUAL_BUILD
diff --git a/src/kaleidoscope/simulator/executor/SimulatorCore.h b/src/kaleidoscope/simulator/SimulatorCore.h
similarity index 97%
rename from src/kaleidoscope/simulator/executor/SimulatorCore.h
rename to src/kaleidoscope/simulator/SimulatorCore.h
index 408470fa..37eac7cd 100644
--- a/src/kaleidoscope/simulator/executor/SimulatorCore.h
+++ b/src/kaleidoscope/simulator/SimulatorCore.h
@@ -24,7 +24,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 /// @brief A Kaleidoscope specific simulator core class.
 ///
@@ -58,7 +57,6 @@ class SimulatorCore : public interface::SimulatorCore_ {
   virtual void loop() override;
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/actions/AssertLayerIsActive.h b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
similarity index 97%
rename from src/kaleidoscope/simulator/executor/actions/AssertLayerIsActive.h
rename to src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
index f63b9ead..c03ac8fa 100644
--- a/src/kaleidoscope/simulator/executor/actions/AssertLayerIsActive.h
+++ b/src/kaleidoscope/simulator/actions/AssertLayerIsActive.h
@@ -26,7 +26,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 namespace actions {
 
 /// @brief Asserts that a given layer is active.
@@ -72,7 +71,6 @@ class AssertLayerIsActive {
 };
 
 } // namespace actions
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/actions/AssertTopActiveLayerIs.h b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
similarity index 97%
rename from src/kaleidoscope/simulator/executor/actions/AssertTopActiveLayerIs.h
rename to src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
index 20f2deeb..7308cfef 100644
--- a/src/kaleidoscope/simulator/executor/actions/AssertTopActiveLayerIs.h
+++ b/src/kaleidoscope/simulator/actions/AssertTopActiveLayerIs.h
@@ -26,7 +26,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 namespace actions {
 
 /// @brief Asserts that a given layer is the current top layer.
@@ -71,7 +70,6 @@ class AssertTopActiveLayerIs {
 };
 
 } // namespace actions
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.cpp b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.cpp
similarity index 96%
rename from src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.cpp
rename to src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.cpp
index 64569811..e50d95a6 100644
--- a/src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.cpp
+++ b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.cpp
@@ -18,11 +18,11 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.h"
-#include "kaleidoscope/simulator/executor/reports/BootKeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/KeyboardReport.h"
-#include "kaleidoscope/simulator/executor/reports/MouseReport.h"
-#include "kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h"
+#include "kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h"
+#include "kaleidoscope/simulator/reports/BootKeyboardReport.h"
+#include "kaleidoscope/simulator/reports/KeyboardReport.h"
+#include "kaleidoscope/simulator/reports/MouseReport.h"
+#include "kaleidoscope/simulator/reports/AbsoluteMouseReport.h"
 #include "kaleidoscope/simulator/interface/Simulator_.h"
 
 #ifdef __unix__ /* __unix__ is usually defined by compilers targeting Unix systems */
@@ -39,7 +39,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 namespace actions {
 
 HostEventAction::HostEventAction()
@@ -390,7 +389,6 @@ bool GenerateHostEvent<AbsoluteMouseReport>::Action::evalInternal() {
 }
 
 } // namespace actions
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.h b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
similarity index 98%
rename from src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.h
rename to src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
index 8804138e..9ffbcb01 100644
--- a/src/kaleidoscope/simulator/executor/actions/generic_report/GenerateHostEvent.h
+++ b/src/kaleidoscope/simulator/actions/generic_report/GenerateHostEvent.h
@@ -27,7 +27,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 namespace actions {
 
 /// @private
@@ -85,7 +84,6 @@ class GenerateHostEvent {
 };
 
 } // namespace actions
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/aux/exceptions.h b/src/kaleidoscope/simulator/aux/exceptions.h
similarity index 96%
rename from src/kaleidoscope/simulator/executor/aux/exceptions.h
rename to src/kaleidoscope/simulator/aux/exceptions.h
index c5e867a6..665a2718 100644
--- a/src/kaleidoscope/simulator/executor/aux/exceptions.h
+++ b/src/kaleidoscope/simulator/aux/exceptions.h
@@ -25,7 +25,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 /// @private
 ///
@@ -46,7 +45,6 @@ struct OStringStreamWrapper {
 #define KS_T_EXCEPTION(...)                                                    \
    throw std::runtime_error(OStringStreamWrapper() << __VA_ARGS__);
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.cpp b/src/kaleidoscope/simulator/reports/AbsoluteMouseReport.cpp
similarity index 97%
rename from src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.cpp
rename to src/kaleidoscope/simulator/reports/AbsoluteMouseReport.cpp
index f2575f36..635da8a4 100644
--- a/src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.cpp
+++ b/src/kaleidoscope/simulator/reports/AbsoluteMouseReport.cpp
@@ -18,12 +18,11 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h"
+#include "kaleidoscope/simulator/reports/AbsoluteMouseReport.h"
 #include "kaleidoscope/simulator/interface/Simulator_.h"
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 AbsoluteMouseReport::AbsoluteMouseReport()
   :  report_data_{} {
@@ -118,7 +117,6 @@ void AbsoluteMouseReport::setReportData(const AbsoluteMouseReport::ReportDataTyp
   memcpy(&report_data_, &report_data, sizeof(report_data_));
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h b/src/kaleidoscope/simulator/reports/AbsoluteMouseReport.h
similarity index 99%
rename from src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h
rename to src/kaleidoscope/simulator/reports/AbsoluteMouseReport.h
index d462b467..77dd24a7 100644
--- a/src/kaleidoscope/simulator/executor/reports/AbsoluteMouseReport.h
+++ b/src/kaleidoscope/simulator/reports/AbsoluteMouseReport.h
@@ -34,7 +34,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 class Simulator;
 
@@ -156,7 +155,6 @@ class AbsoluteMouseReport : public interface::AbsoluteMouseReport_ {
   ReportDataType report_data_;
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.cpp b/src/kaleidoscope/simulator/reports/BootKeyboardReport.cpp
similarity index 96%
rename from src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.cpp
rename to src/kaleidoscope/simulator/reports/BootKeyboardReport.cpp
index 5aa5e1b7..e21eb062 100644
--- a/src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.cpp
+++ b/src/kaleidoscope/simulator/reports/BootKeyboardReport.cpp
@@ -24,8 +24,8 @@
 //
 #include <stdint.h>
 
-#include "kaleidoscope/simulator/executor/reports/BootKeyboardReport.h"
-#include "kaleidoscope/simulator/executor/aux/exceptions.h"
+#include "kaleidoscope/simulator/reports/BootKeyboardReport.h"
+#include "kaleidoscope/simulator/aux/exceptions.h"
 #include "kaleidoscope/simulator/interface/Simulator_.h"
 #include "kaleidoscope/simulator/interface/SimulatorCore_.h"
 #include "MultiReport/Keyboard.h"
@@ -34,7 +34,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 BootKeyboardReport
 ::BootKeyboardReport()
@@ -204,7 +203,6 @@ BootKeyboardReport
   }
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.h b/src/kaleidoscope/simulator/reports/BootKeyboardReport.h
similarity index 99%
rename from src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.h
rename to src/kaleidoscope/simulator/reports/BootKeyboardReport.h
index a28774fb..98eaac10 100644
--- a/src/kaleidoscope/simulator/executor/reports/BootKeyboardReport.h
+++ b/src/kaleidoscope/simulator/reports/BootKeyboardReport.h
@@ -35,7 +35,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 class Simulator;
 
@@ -145,7 +144,6 @@ class BootKeyboardReport : public interface::BootKeyboardReport_ {
   ReportDataType report_data_;
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/KeyboardReport.cpp b/src/kaleidoscope/simulator/reports/KeyboardReport.cpp
similarity index 97%
rename from src/kaleidoscope/simulator/executor/reports/KeyboardReport.cpp
rename to src/kaleidoscope/simulator/reports/KeyboardReport.cpp
index 813c760a..1fa47ea5 100644
--- a/src/kaleidoscope/simulator/executor/reports/KeyboardReport.cpp
+++ b/src/kaleidoscope/simulator/reports/KeyboardReport.cpp
@@ -24,15 +24,14 @@
 //
 #include <stdint.h>
 
-#include "kaleidoscope/simulator/executor/reports/KeyboardReport.h"
-#include "kaleidoscope/simulator/executor/aux/exceptions.h"
+#include "kaleidoscope/simulator/reports/KeyboardReport.h"
+#include "kaleidoscope/simulator/aux/exceptions.h"
 #include "kaleidoscope/simulator/interface/Simulator_.h"
 
 #include <vector>
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 KeyboardReport
 ::KeyboardReport()
@@ -240,7 +239,6 @@ KeyboardReport
   }
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/KeyboardReport.h b/src/kaleidoscope/simulator/reports/KeyboardReport.h
similarity index 99%
rename from src/kaleidoscope/simulator/executor/reports/KeyboardReport.h
rename to src/kaleidoscope/simulator/reports/KeyboardReport.h
index bb15b3b4..058f0bb7 100644
--- a/src/kaleidoscope/simulator/executor/reports/KeyboardReport.h
+++ b/src/kaleidoscope/simulator/reports/KeyboardReport.h
@@ -37,7 +37,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 class Simulator;
 
@@ -147,7 +146,6 @@ class KeyboardReport : public interface::KeyboardReport_ {
   ReportDataType report_data_;
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/MouseReport.cpp b/src/kaleidoscope/simulator/reports/MouseReport.cpp
similarity index 97%
rename from src/kaleidoscope/simulator/executor/reports/MouseReport.cpp
rename to src/kaleidoscope/simulator/reports/MouseReport.cpp
index a659d304..e3ab5b66 100644
--- a/src/kaleidoscope/simulator/executor/reports/MouseReport.cpp
+++ b/src/kaleidoscope/simulator/reports/MouseReport.cpp
@@ -18,13 +18,12 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/reports/MouseReport.h"
+#include "kaleidoscope/simulator/reports/MouseReport.h"
 
 #include "kaleidoscope/simulator/interface/Simulator_.h"
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 MouseReport::MouseReport()
   :  report_data_{} {
@@ -111,7 +110,6 @@ void MouseReport::setReportData(const HID_MouseReport_Data_t &report_data) {
   memcpy(&report_data_, &report_data, sizeof(report_data_));
 }
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/reports/MouseReport.h b/src/kaleidoscope/simulator/reports/MouseReport.h
similarity index 99%
rename from src/kaleidoscope/simulator/executor/reports/MouseReport.h
rename to src/kaleidoscope/simulator/reports/MouseReport.h
index 7748eb76..dd8f53f3 100644
--- a/src/kaleidoscope/simulator/executor/reports/MouseReport.h
+++ b/src/kaleidoscope/simulator/reports/MouseReport.h
@@ -34,7 +34,6 @@
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 class Simulator;
 
@@ -153,7 +152,6 @@ class MouseReport : public interface::MouseReport_ {
   HID_MouseReport_Data_t report_data_;
 };
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope
 
diff --git a/src/kaleidoscope/simulator/executor/vendors/keyboardio/model01.cpp b/src/kaleidoscope/simulator/vendors/keyboardio/model01.cpp
similarity index 98%
rename from src/kaleidoscope/simulator/executor/vendors/keyboardio/model01.cpp
rename to src/kaleidoscope/simulator/vendors/keyboardio/model01.cpp
index a78a5d71..7c3c80cc 100644
--- a/src/kaleidoscope/simulator/executor/vendors/keyboardio/model01.cpp
+++ b/src/kaleidoscope/simulator/vendors/keyboardio/model01.cpp
@@ -18,7 +18,7 @@
 
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
-#include "kaleidoscope/simulator/executor/vendors/keyboardio/model01.h"
+#include "kaleidoscope/simulator/vendors/keyboardio/model01.h"
 
 namespace kaleidoscope {
 namespace simulator {
diff --git a/src/kaleidoscope/simulator/executor/vendors/keyboardio/model01.h b/src/kaleidoscope/simulator/vendors/keyboardio/model01.h
similarity index 100%
rename from src/kaleidoscope/simulator/executor/vendors/keyboardio/model01.h
rename to src/kaleidoscope/simulator/vendors/keyboardio/model01.h
diff --git a/test/simulator/HelloWorld/tests.h b/test/simulator/HelloWorld/tests.h
index a56e8130..22723a96 100644
--- a/test/simulator/HelloWorld/tests.h
+++ b/test/simulator/HelloWorld/tests.h
@@ -17,7 +17,7 @@
 #ifdef KALEIDOSCOPE_VIRTUAL_BUILD
 
 #include "Kaleidoscope-Simulator.h"
-#include "kaleidoscope/simulator/executor/AglaisInterface.h"
+#include "kaleidoscope/simulator/AglaisInterface.h"
 
 #include <iostream>
 #include <sstream>
@@ -26,7 +26,6 @@ KALEIDOSCOPE_SIMULATOR_INIT
 
 namespace kaleidoscope {
 namespace simulator {
-namespace executor {
 
 extern const char aglais_test_recording[];
 
@@ -57,7 +56,6 @@ const char aglais_test_recording[] =
 #include "IO_protocol.agl"
   ;
 
-} // namespace executor
 } // namespace simulator
 } // namespace kaleidoscope