Repo Tidy - Phase 2 (#107)

* Make sub-project dir names more relevant and consistent * Move shared dir and update references. Uses correct include search dirs to avoid rel paths with upward traversal in #includes * Consolidate copies/versions of nng_wrappers.h * Consolidate copies of common_definition_helper * ADM Export Source plugin uses shared bit instead of copies * Shared JUCE Support Resources Closes #92
ebu · Aug 13, 2021 · 7ad2918 · 7ad2918
1 parent f44b63b
commit 7ad2918
Show file tree

Hide file tree

Showing 317 changed files with 700 additions and 93,369 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -37,9 +37,12 @@ include(check_nng)
 find_package(nng REQUIRED QUIET)
 add_subdirectory(submodules)
 
-add_subdirectory(ear-production-suite)
+set(EPS_SHARED_DIR ${CMAKE_CURRENT_SOURCE_DIR}/shared)
+set(JUCE_SUPPORT_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/shared/resources)
+
+add_subdirectory(ear-production-suite-plugins)
 add_subdirectory(reaper-adm-extension)
-add_subdirectory(reaper_adm_stem_plugin)
+add_subdirectory(reaper-adm-export-source-plugin)
 add_subdirectory(tools)
 
 if(EPS_BUILD_PACKAGE)

diff --git a/cmake_modules/juce_helpers.cmake b/cmake_modules/juce_helpers.cmake
@@ -1,12 +1,14 @@
-set(_JUCE_SUPPORT_RESOURCES ${PROJECT_SOURCE_DIR}/resources)
-
 function(add_juce_vst3_plugin PLUGIN_NAME)
   set(options)
-  set(oneValueArgs IDE_FOLDER DESCRIPTION DISPLAY_NAME OUTPUT_NAME CODE_SUFFIX)
+  set(oneValueArgs IDE_FOLDER DESCRIPTION DISPLAY_NAME OUTPUT_NAME CODE_PREFIX CODE_SUFFIX)
   set(multiValueArgs SOURCES)
   cmake_parse_arguments(PLUGIN "${options}" "${oneValueArgs}"
                         "${multiValueArgs}" ${ARGN} )
 
+  if(NOT PLUGIN_CODE_PREFIX)
+    set(PLUGIN_CODE_PREFIX "455053") # Hex for "EPS"
+  endif()
+
   if(NOT PLUGIN_CODE_SUFFIX)
     set(PLUGIN_CODE_SUFFIX "00")
   endif()
@@ -21,12 +23,12 @@ function(add_juce_vst3_plugin PLUGIN_NAME)
 
   set(PRODUCT_BUNDLE_IDENTIFIER "ear.${PLUGIN_NAME}")
   set(_SUPPORT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PLUGIN_NAME}_resources/)
-  configure_file(${_JUCE_SUPPORT_RESOURCES}/juce/AppConfig.h.in ${_SUPPORT_PATH}/AppConfig.h)
-  configure_file(${_JUCE_SUPPORT_RESOURCES}/juce/JuceHeader.h.in ${_SUPPORT_PATH}/JuceHeader.h)
-  configure_file(${_JUCE_SUPPORT_RESOURCES}/osx/VST-Info.plist.in ${_SUPPORT_PATH}/Info.plist)
-  file(COPY ${_JUCE_SUPPORT_RESOURCES}/osx/PkgInfo DESTINATION ${_SUPPORT_PATH})
+  configure_file(${JUCE_SUPPORT_RESOURCES}/juce/AppConfig.h.in ${_SUPPORT_PATH}/AppConfig.h)
+  configure_file(${JUCE_SUPPORT_RESOURCES}/juce/JuceHeader.h.in ${_SUPPORT_PATH}/JuceHeader.h)
+  configure_file(${JUCE_SUPPORT_RESOURCES}/osx/VST-Info.plist.in ${_SUPPORT_PATH}/Info.plist)
+  file(COPY ${JUCE_SUPPORT_RESOURCES}/osx/PkgInfo DESTINATION ${_SUPPORT_PATH})
   add_library(${PLUGIN_NAME}_VST3 MODULE ${PLUGIN_SOURCES} ${_SUPPORT_PATH}/AppConfig.h  ${_SUPPORT_PATH}/JuceHeader.h  ${_SUPPORT_PATH}/Info.plist  ${_SUPPORT_PATH}/PkgInfo)
-  target_include_directories(${PLUGIN_NAME}_VST3 PRIVATE ${_SUPPORT_PATH}/)
+  target_include_directories(${PLUGIN_NAME}_VST3 PRIVATE ${_SUPPORT_PATH}/ ${EPS_SHARED_DIR})
   target_link_libraries(${PLUGIN_NAME}_VST3 PRIVATE Juce::VST3)
 
   set_target_properties(${PLUGIN_NAME}_VST3 PROPERTIES

diff --git a/ear-production-suite/.clang-format → ear-production-suite-plugins/.clang-format b/ear-production-suite/.clang-format → ear-production-suite-plugins/.clang-format
diff --git a/ear-production-suite/.editorconfig → ear-production-suite-plugins/.editorconfig b/ear-production-suite/.editorconfig → ear-production-suite-plugins/.editorconfig
diff --git a/ear-production-suite/CMakeLists.txt → ear-production-suite-plugins/CMakeLists.txt b/ear-production-suite/CMakeLists.txt → ear-production-suite-plugins/CMakeLists.txt
@@ -33,7 +33,8 @@ find_package(spdlog REQUIRED QUIET)
 # add targets
 ############################################################
 
-configure_file(${PROJECT_SOURCE_DIR}/resources/config.h.in ${PROJECT_BINARY_DIR}/ear-plugin-base/config.h)
+configure_file(${JUCE_SUPPORT_RESOURCES}/config.h.in ${PROJECT_BINARY_DIR}/ear-plugin-base/config.h)
+set(EPS_PLUGIN_BASE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib)
 add_subdirectory(lib)
 add_subdirectory(plugins)
 add_subdirectory(tools)

diff --git a/ear-production-suite/README.md → ear-production-suite-plugins/README.md b/ear-production-suite/README.md → ear-production-suite-plugins/README.md
diff --git a/ear-production-suite/lib/CMakeLists.txt → ...oduction-suite-plugins/lib/CMakeLists.txt b/ear-production-suite/lib/CMakeLists.txt → ...oduction-suite-plugins/lib/CMakeLists.txt
diff --git a/...te/lib/include/communication/commands.hpp → ...ns/lib/include/communication/commands.hpp b/...te/lib/include/communication/commands.hpp → ...ns/lib/include/communication/commands.hpp
diff --git a/...ib/include/communication/common_types.hpp → ...ib/include/communication/common_types.hpp b/...ib/include/communication/common_types.hpp → ...ib/include/communication/common_types.hpp
diff --git a/...ation/direct_speakers_metadata_sender.hpp → ...ation/direct_speakers_metadata_sender.hpp b/...ation/direct_speakers_metadata_sender.hpp → ...ation/direct_speakers_metadata_sender.hpp
diff --git a/...ommunication/input_control_connection.hpp → ...ommunication/input_control_connection.hpp b/...ommunication/input_control_connection.hpp → ...ommunication/input_control_connection.hpp
diff --git a/.../include/communication/message_buffer.hpp → .../include/communication/message_buffer.hpp b/.../include/communication/message_buffer.hpp → .../include/communication/message_buffer.hpp
diff --git a/...ication/monitoring_control_connection.hpp → ...ication/monitoring_control_connection.hpp b/...ication/monitoring_control_connection.hpp → ...ication/monitoring_control_connection.hpp
diff --git a/...nication/monitoring_metadata_receiver.hpp → ...nication/monitoring_metadata_receiver.hpp b/...nication/monitoring_metadata_receiver.hpp → ...nication/monitoring_metadata_receiver.hpp
diff --git a/.../communication/object_metadata_sender.hpp → .../communication/object_metadata_sender.hpp b/.../communication/object_metadata_sender.hpp → .../communication/object_metadata_sender.hpp
diff --git a/.../communication/scene_command_receiver.hpp → .../communication/scene_command_receiver.hpp b/.../communication/scene_command_receiver.hpp → .../communication/scene_command_receiver.hpp
diff --git a/...ommunication/scene_connection_manager.hpp → ...ommunication/scene_connection_manager.hpp b/...ommunication/scene_connection_manager.hpp → ...ommunication/scene_connection_manager.hpp
diff --git a/...mmunication/scene_connection_registry.hpp → ...mmunication/scene_connection_registry.hpp b/...mmunication/scene_connection_registry.hpp → ...mmunication/scene_connection_registry.hpp
diff --git a/...communication/scene_metadata_receiver.hpp → ...communication/scene_metadata_receiver.hpp b/...communication/scene_metadata_receiver.hpp → ...communication/scene_metadata_receiver.hpp
diff --git a/...on-suite/lib/include/detail/constants.hpp → ...-plugins/lib/include/detail/constants.hpp b/...on-suite/lib/include/detail/constants.hpp → ...-plugins/lib/include/detail/constants.hpp
diff --git a/...n-suite/lib/include/detail/log_config.hpp → ...plugins/lib/include/detail/log_config.hpp b/...n-suite/lib/include/detail/log_config.hpp → ...plugins/lib/include/detail/log_config.hpp
diff --git a/...n-suite/lib/include/detail/named_type.hpp → ...plugins/lib/include/detail/named_type.hpp b/...n-suite/lib/include/detail/named_type.hpp → ...plugins/lib/include/detail/named_type.hpp
diff --git a/...uite/lib/include/detail/spdl_nng_sink.hpp → ...gins/lib/include/detail/spdl_nng_sink.hpp b/...uite/lib/include/detail/spdl_nng_sink.hpp → ...gins/lib/include/detail/spdl_nng_sink.hpp
diff --git a/...e/lib/include/direct_speakers_backend.hpp → ...s/lib/include/direct_speakers_backend.hpp b/...e/lib/include/direct_speakers_backend.hpp → ...s/lib/include/direct_speakers_backend.hpp
diff --git a/.../helper/eps_to_ear_metadata_converter.hpp → .../helper/eps_to_ear_metadata_converter.hpp b/.../helper/eps_to_ear_metadata_converter.hpp → .../helper/eps_to_ear_metadata_converter.hpp
diff --git a/...duction-suite/lib/include/helper/move.hpp → ...suite-plugins/lib/include/helper/move.hpp b/...duction-suite/lib/include/helper/move.hpp → ...suite-plugins/lib/include/helper/move.hpp
diff --git a/...lib/include/helper/protobuf_utilities.hpp → ...lib/include/helper/protobuf_utilities.hpp b/...lib/include/helper/protobuf_utilities.hpp → ...lib/include/helper/protobuf_utilities.hpp
diff --git a/...oduction-suite/lib/include/item_store.hpp → ...-suite-plugins/lib/include/item_store.hpp b/...oduction-suite/lib/include/item_store.hpp → ...-suite-plugins/lib/include/item_store.hpp
diff --git a/ear-production-suite/lib/include/log.hpp → ...duction-suite-plugins/lib/include/log.hpp b/ear-production-suite/lib/include/log.hpp → ...duction-suite-plugins/lib/include/log.hpp
diff --git a/...ib/include/monitoring_audio_processor.hpp → ...ib/include/monitoring_audio_processor.hpp b/...ib/include/monitoring_audio_processor.hpp → ...ib/include/monitoring_audio_processor.hpp
diff --git a/...-suite/lib/include/monitoring_backend.hpp → ...lugins/lib/include/monitoring_backend.hpp b/...-suite/lib/include/monitoring_backend.hpp → ...lugins/lib/include/monitoring_backend.hpp
diff --git a/...te/lib/include/multichannel_convolver.hpp → ...ns/lib/include/multichannel_convolver.hpp b/...te/lib/include/multichannel_convolver.hpp → ...ns/lib/include/multichannel_convolver.hpp
diff --git a/...ion-suite/lib/include/nng-cpp/asyncio.hpp → ...e-plugins/lib/include/nng-cpp/asyncio.hpp b/...ion-suite/lib/include/nng-cpp/asyncio.hpp → ...e-plugins/lib/include/nng-cpp/asyncio.hpp
diff --git a/...tion-suite/lib/include/nng-cpp/buffer.hpp → ...te-plugins/lib/include/nng-cpp/buffer.hpp b/...tion-suite/lib/include/nng-cpp/buffer.hpp → ...te-plugins/lib/include/nng-cpp/buffer.hpp
diff --git a/...tion-suite/lib/include/nng-cpp/dialer.hpp → ...te-plugins/lib/include/nng-cpp/dialer.hpp b/...tion-suite/lib/include/nng-cpp/dialer.hpp → ...te-plugins/lib/include/nng-cpp/dialer.hpp
diff --git a/...uite/lib/include/nng-cpp/enum_bitmask.hpp → ...gins/lib/include/nng-cpp/enum_bitmask.hpp b/...uite/lib/include/nng-cpp/enum_bitmask.hpp → ...gins/lib/include/nng-cpp/enum_bitmask.hpp
diff --git a/...te/lib/include/nng-cpp/error_handling.hpp → ...ns/lib/include/nng-cpp/error_handling.hpp b/...te/lib/include/nng-cpp/error_handling.hpp → ...ns/lib/include/nng-cpp/error_handling.hpp
diff --git a/...ion-suite/lib/include/nng-cpp/message.hpp → ...e-plugins/lib/include/nng-cpp/message.hpp b/...ion-suite/lib/include/nng-cpp/message.hpp → ...e-plugins/lib/include/nng-cpp/message.hpp
diff --git a/...duction-suite/lib/include/nng-cpp/nng.hpp → ...suite-plugins/lib/include/nng-cpp/nng.hpp b/...duction-suite/lib/include/nng-cpp/nng.hpp → ...suite-plugins/lib/include/nng-cpp/nng.hpp
diff --git a/...uction-suite/lib/include/nng-cpp/pipe.hpp → ...uite-plugins/lib/include/nng-cpp/pipe.hpp b/...uction-suite/lib/include/nng-cpp/pipe.hpp → ...uite-plugins/lib/include/nng-cpp/pipe.hpp
diff --git a/...uite/lib/include/nng-cpp/placeholders.hpp → ...gins/lib/include/nng-cpp/placeholders.hpp b/...uite/lib/include/nng-cpp/placeholders.hpp → ...gins/lib/include/nng-cpp/placeholders.hpp
diff --git a/...ude/nng-cpp/protocols/protocol_traits.hpp → ...ude/nng-cpp/protocols/protocol_traits.hpp b/...ude/nng-cpp/protocols/protocol_traits.hpp → ...ude/nng-cpp/protocols/protocol_traits.hpp
diff --git a/...ite/lib/include/nng-cpp/protocols/pub.hpp → ...ins/lib/include/nng-cpp/protocols/pub.hpp b/...ite/lib/include/nng-cpp/protocols/pub.hpp → ...ins/lib/include/nng-cpp/protocols/pub.hpp
diff --git a/...te/lib/include/nng-cpp/protocols/pull.hpp → ...ns/lib/include/nng-cpp/protocols/pull.hpp b/...te/lib/include/nng-cpp/protocols/pull.hpp → ...ns/lib/include/nng-cpp/protocols/pull.hpp
diff --git a/...te/lib/include/nng-cpp/protocols/push.hpp → ...ns/lib/include/nng-cpp/protocols/push.hpp b/...te/lib/include/nng-cpp/protocols/push.hpp → ...ns/lib/include/nng-cpp/protocols/push.hpp
diff --git a/...ite/lib/include/nng-cpp/protocols/rep.hpp → ...ins/lib/include/nng-cpp/protocols/rep.hpp b/...ite/lib/include/nng-cpp/protocols/rep.hpp → ...ins/lib/include/nng-cpp/protocols/rep.hpp
diff --git a/...ite/lib/include/nng-cpp/protocols/req.hpp → ...ins/lib/include/nng-cpp/protocols/req.hpp b/...ite/lib/include/nng-cpp/protocols/req.hpp → ...ins/lib/include/nng-cpp/protocols/req.hpp
diff --git a/...lude/nng-cpp/protocols/socket_options.hpp → ...lude/nng-cpp/protocols/socket_options.hpp b/...lude/nng-cpp/protocols/socket_options.hpp → ...lude/nng-cpp/protocols/socket_options.hpp
diff --git a/...ite/lib/include/nng-cpp/protocols/sub.hpp → ...ins/lib/include/nng-cpp/protocols/sub.hpp b/...ite/lib/include/nng-cpp/protocols/sub.hpp → ...ins/lib/include/nng-cpp/protocols/sub.hpp
diff --git a/...suite/lib/include/nng-cpp/socket_base.hpp → ...ugins/lib/include/nng-cpp/socket_base.hpp b/...suite/lib/include/nng-cpp/socket_base.hpp → ...ugins/lib/include/nng-cpp/socket_base.hpp
diff --git a/...tion-suite/lib/include/object_backend.hpp → ...te-plugins/lib/include/object_backend.hpp b/...tion-suite/lib/include/object_backend.hpp → ...te-plugins/lib/include/object_backend.hpp
diff --git a/...lib/include/programme_element_visitor.hpp → ...lib/include/programme_element_visitor.hpp b/...lib/include/programme_element_visitor.hpp → ...lib/include/programme_element_visitor.hpp
diff --git a/...include/programme_store_adm_populator.hpp → ...include/programme_store_adm_populator.hpp b/...include/programme_store_adm_populator.hpp → ...include/programme_store_adm_populator.hpp
diff --git a/...nclude/programme_store_adm_serializer.hpp → ...nclude/programme_store_adm_serializer.hpp b/...nclude/programme_store_adm_serializer.hpp → ...nclude/programme_store_adm_serializer.hpp
diff --git a/...ion-suite/lib/include/programme_types.hpp → ...e-plugins/lib/include/programme_types.hpp b/...ion-suite/lib/include/programme_types.hpp → ...e-plugins/lib/include/programme_types.hpp
diff --git a/...tion-suite/lib/include/proto_printers.hpp → ...te-plugins/lib/include/proto_printers.hpp b/...tion-suite/lib/include/proto_printers.hpp → ...te-plugins/lib/include/proto_printers.hpp
diff --git a/...ction-suite/lib/include/scene_backend.hpp → ...ite-plugins/lib/include/scene_backend.hpp b/...ction-suite/lib/include/scene_backend.hpp → ...ite-plugins/lib/include/scene_backend.hpp
diff --git a/...te/lib/include/scene_gains_calculator.hpp → ...ns/lib/include/scene_gains_calculator.hpp b/...te/lib/include/scene_gains_calculator.hpp → ...ns/lib/include/scene_gains_calculator.hpp
diff --git a/...tion-suite/lib/include/speaker_setups.hpp → ...te-plugins/lib/include/speaker_setups.hpp b/...tion-suite/lib/include/speaker_setups.hpp → ...te-plugins/lib/include/speaker_setups.hpp
diff --git a/...t_speakers_frontend_backend_connector.hpp → ...t_speakers_frontend_backend_connector.hpp b/...t_speakers_frontend_backend_connector.hpp → ...t_speakers_frontend_backend_connector.hpp
diff --git a/...tion-suite/lib/include/ui/item_colour.hpp → ...te-plugins/lib/include/ui/item_colour.hpp b/...tion-suite/lib/include/ui/item_colour.hpp → ...te-plugins/lib/include/ui/item_colour.hpp
diff --git a/.../ui/object_frontend_backend_connector.hpp → .../ui/object_frontend_backend_connector.hpp b/.../ui/object_frontend_backend_connector.hpp → .../ui/object_frontend_backend_connector.hpp
diff --git a/...e/ui/scene_frontend_backend_connector.hpp → ...e/ui/scene_frontend_backend_connector.hpp b/...e/ui/scene_frontend_backend_connector.hpp → ...e/ui/scene_frontend_backend_connector.hpp
diff --git a/...te/lib/include/variable_block_adapter.hpp → ...ns/lib/include/variable_block_adapter.hpp b/...te/lib/include/variable_block_adapter.hpp → ...ns/lib/include/variable_block_adapter.hpp
diff --git a/...-suite/lib/messages/common_commands.proto → ...lugins/lib/messages/common_commands.proto b/...-suite/lib/messages/common_commands.proto → ...lugins/lib/messages/common_commands.proto
diff --git a/...ion-suite/lib/messages/common_types.proto → ...e-plugins/lib/messages/common_types.proto b/...ion-suite/lib/messages/common_types.proto → ...e-plugins/lib/messages/common_types.proto
diff --git a/...te/lib/messages/connection_commands.proto → ...ns/lib/messages/connection_commands.proto b/...te/lib/messages/connection_commands.proto → ...ns/lib/messages/connection_commands.proto
diff --git a/...te/lib/messages/input_item_metadata.proto → ...ns/lib/messages/input_item_metadata.proto b/...te/lib/messages/input_item_metadata.proto → ...ns/lib/messages/input_item_metadata.proto
diff --git a/...b/messages/monitoring_item_metadata.proto → ...b/messages/monitoring_item_metadata.proto b/...b/messages/monitoring_item_metadata.proto → ...b/messages/monitoring_item_metadata.proto
diff --git a/...-suite/lib/messages/programme_store.proto → ...lugins/lib/messages/programme_store.proto b/...-suite/lib/messages/programme_store.proto → ...lugins/lib/messages/programme_store.proto
diff --git a/...tion-suite/lib/messages/scene_store.proto → ...te-plugins/lib/messages/scene_store.proto b/...tion-suite/lib/messages/scene_store.proto → ...te-plugins/lib/messages/scene_store.proto
diff --git a/...on-suite/lib/messages/type_metadata.proto → ...-plugins/lib/messages/type_metadata.proto b/...on-suite/lib/messages/type_metadata.proto → ...-plugins/lib/messages/type_metadata.proto
diff --git a/...-suite/lib/src/communication/commands.cpp → ...lugins/lib/src/communication/commands.cpp b/...-suite/lib/src/communication/commands.cpp → ...lugins/lib/src/communication/commands.cpp
diff --git a/...ation/direct_speakers_metadata_sender.cpp → ...ation/direct_speakers_metadata_sender.cpp b/...ation/direct_speakers_metadata_sender.cpp → ...ation/direct_speakers_metadata_sender.cpp
diff --git a/...ommunication/input_control_connection.cpp → ...ommunication/input_control_connection.cpp b/...ommunication/input_control_connection.cpp → ...ommunication/input_control_connection.cpp
diff --git a/...ication/monitoring_control_connection.cpp → ...ication/monitoring_control_connection.cpp b/...ication/monitoring_control_connection.cpp → ...ication/monitoring_control_connection.cpp
diff --git a/...nication/monitoring_metadata_receiver.cpp → ...nication/monitoring_metadata_receiver.cpp b/...nication/monitoring_metadata_receiver.cpp → ...nication/monitoring_metadata_receiver.cpp
diff --git a/.../communication/object_metadata_sender.cpp → .../communication/object_metadata_sender.cpp b/.../communication/object_metadata_sender.cpp → .../communication/object_metadata_sender.cpp
diff --git a/...ommunication/renderer_stream_receiver.cpp → ...ommunication/renderer_stream_receiver.cpp b/...ommunication/renderer_stream_receiver.cpp → ...ommunication/renderer_stream_receiver.cpp
diff --git a/.../communication/scene_command_receiver.cpp → .../communication/scene_command_receiver.cpp b/.../communication/scene_command_receiver.cpp → .../communication/scene_command_receiver.cpp
diff --git a/...ommunication/scene_connection_manager.cpp → ...ommunication/scene_connection_manager.cpp b/...ommunication/scene_connection_manager.cpp → ...ommunication/scene_connection_manager.cpp
diff --git a/...mmunication/scene_connection_registry.cpp → ...mmunication/scene_connection_registry.cpp b/...mmunication/scene_connection_registry.cpp → ...mmunication/scene_connection_registry.cpp
diff --git a/...communication/scene_metadata_receiver.cpp → ...communication/scene_metadata_receiver.cpp b/...communication/scene_metadata_receiver.cpp → ...communication/scene_metadata_receiver.cpp
diff --git a/...suite/lib/src/direct_speakers_backend.cpp → ...ugins/lib/src/direct_speakers_backend.cpp b/...suite/lib/src/direct_speakers_backend.cpp → ...ugins/lib/src/direct_speakers_backend.cpp
diff --git a/...ite/lib/src/helper/protobuf_utilities.cpp → ...ins/lib/src/helper/protobuf_utilities.cpp b/...ite/lib/src/helper/protobuf_utilities.cpp → ...ins/lib/src/helper/protobuf_utilities.cpp
diff --git a/ear-production-suite/lib/src/log.cpp → ear-production-suite-plugins/lib/src/log.cpp b/ear-production-suite/lib/src/log.cpp → ear-production-suite-plugins/lib/src/log.cpp
diff --git a/...te/lib/src/monitoring_audio_processor.cpp → ...ns/lib/src/monitoring_audio_processor.cpp b/...te/lib/src/monitoring_audio_processor.cpp → ...ns/lib/src/monitoring_audio_processor.cpp
diff --git a/...tion-suite/lib/src/monitoring_backend.cpp → ...te-plugins/lib/src/monitoring_backend.cpp b/...tion-suite/lib/src/monitoring_backend.cpp → ...te-plugins/lib/src/monitoring_backend.cpp
diff --git a/...-suite/lib/src/multichannel_convolver.cpp → ...lugins/lib/src/multichannel_convolver.cpp b/...-suite/lib/src/multichannel_convolver.cpp → ...lugins/lib/src/multichannel_convolver.cpp
diff --git a/...-suite/lib/src/nng-cpp/error_handling.cpp → ...lugins/lib/src/nng-cpp/error_handling.cpp b/...-suite/lib/src/nng-cpp/error_handling.cpp → ...lugins/lib/src/nng-cpp/error_handling.cpp
diff --git a/...oduction-suite/lib/src/object_backend.cpp → ...-suite-plugins/lib/src/object_backend.cpp b/...oduction-suite/lib/src/object_backend.cpp → ...-suite-plugins/lib/src/object_backend.cpp
diff --git a/...lib/src/programme_store_adm_populator.cpp → ...lib/src/programme_store_adm_populator.cpp b/...lib/src/programme_store_adm_populator.cpp → ...lib/src/programme_store_adm_populator.cpp
diff --git a/...ib/src/programme_store_adm_serializer.cpp → ...ib/src/programme_store_adm_serializer.cpp b/...ib/src/programme_store_adm_serializer.cpp → ...ib/src/programme_store_adm_serializer.cpp
diff --git a/...duction-suite/lib/src/programme_types.cpp → ...suite-plugins/lib/src/programme_types.cpp b/...duction-suite/lib/src/programme_types.cpp → ...suite-plugins/lib/src/programme_types.cpp
diff --git a/...oduction-suite/lib/src/proto_printers.cpp → ...-suite-plugins/lib/src/proto_printers.cpp b/...oduction-suite/lib/src/proto_printers.cpp → ...-suite-plugins/lib/src/proto_printers.cpp
diff --git a/...roduction-suite/lib/src/scene_backend.cpp → ...n-suite-plugins/lib/src/scene_backend.cpp b/...roduction-suite/lib/src/scene_backend.cpp → ...n-suite-plugins/lib/src/scene_backend.cpp
diff --git a/...-suite/lib/src/scene_gains_calculator.cpp → ...lugins/lib/src/scene_gains_calculator.cpp b/...-suite/lib/src/scene_gains_calculator.cpp → ...lugins/lib/src/scene_gains_calculator.cpp
diff --git a/...t_speakers_frontend_backend_connector.cpp → ...t_speakers_frontend_backend_connector.cpp b/...t_speakers_frontend_backend_connector.cpp → ...t_speakers_frontend_backend_connector.cpp
diff --git a/.../ui/object_frontend_backend_connector.cpp → .../ui/object_frontend_backend_connector.cpp b/.../ui/object_frontend_backend_connector.cpp → .../ui/object_frontend_backend_connector.cpp
diff --git a/...c/ui/scene_frontend_backend_connector.cpp → ...c/ui/scene_frontend_backend_connector.cpp b/...c/ui/scene_frontend_backend_connector.cpp → ...c/ui/scene_frontend_backend_connector.cpp
diff --git a/...production-suite/packaging/CMakeLists.txt → ...on-suite-plugins/packaging/CMakeLists.txt b/...production-suite/packaging/CMakeLists.txt → ...on-suite-plugins/packaging/CMakeLists.txt
diff --git a/ear-production-suite/plugins/CMakeLists.txt → ...tion-suite-plugins/plugins/CMakeLists.txt b/ear-production-suite/plugins/CMakeLists.txt → ...tion-suite-plugins/plugins/CMakeLists.txt
diff --git a/ear-production-suite-plugins/plugins/direct_speakers/CMakeLists.txt b/ear-production-suite-plugins/plugins/direct_speakers/CMakeLists.txt
@@ -0,0 +1,72 @@
+set(SOURCES_DIRECT_SPEAKERS_INPUT
+    ${EPS_SHARED_DIR}/binary_data.cpp
+    ${EPS_SHARED_DIR}/components/look_and_feel/slider.cpp
+    ${EPS_SHARED_DIR}/components/look_and_feel/name_text_editor.cpp
+    ${EPS_SHARED_DIR}/components/ear_combo_box.cpp
+    ${EPS_SHARED_DIR}/components/ear_slider_label.cpp
+    ${EPS_SHARED_DIR}/components/level_meter_calculator.cpp
+    src/direct_speakers_frontend_connector.cpp
+    src/direct_speakers_plugin_editor.cpp
+    src/direct_speakers_plugin_processor.cpp
+)
+
+set(HEADERS_DIRECT_SPEAKERS_INPUT
+	${EPS_PLUGIN_BASE_DIR}/include/detail/constants.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/direct_speakers_backend.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/speaker_setups.hpp
+
+	${EPS_SHARED_DIR}/binary_data.hpp
+
+	${EPS_SHARED_DIR}/components/ear_button.hpp
+	${EPS_SHARED_DIR}/components/ear_combo_box.hpp
+	${EPS_SHARED_DIR}/components/ear_header.hpp
+	${EPS_SHARED_DIR}/components/ear_inverted_slider.hpp
+	${EPS_SHARED_DIR}/components/ear_name_text_editor.hpp
+	${EPS_SHARED_DIR}/components/ear_slider.hpp
+	${EPS_SHARED_DIR}/components/ear_slider_label.hpp
+	${EPS_SHARED_DIR}/components/level_meter.hpp
+	${EPS_SHARED_DIR}/components/level_meter_calculator.hpp
+	${EPS_SHARED_DIR}/components/non_automatable_parameter.hpp
+	${EPS_SHARED_DIR}/components/onboarding.hpp
+	${EPS_SHARED_DIR}/components/onboarding_slide.hpp
+	${EPS_SHARED_DIR}/components/overlay.hpp
+	${EPS_SHARED_DIR}/components/segment_progress_bar.hpp
+	${EPS_SHARED_DIR}/components/speaker_layer.hpp
+
+	${EPS_SHARED_DIR}/components/look_and_feel/colours.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/fonts.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/name_text_editor.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/shadows.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/slider.hpp
+
+	${EPS_SHARED_DIR}/helper/graphics.hpp
+	${EPS_SHARED_DIR}/helper/iso_lang_codes.hpp
+	${EPS_SHARED_DIR}/helper/multi_async_updater.h
+	${EPS_SHARED_DIR}/helper/properties_file.hpp
+
+    src/direct_speakers_frontend_connector.hpp
+    src/direct_speakers_plugin_editor.hpp
+    src/direct_speakers_plugin_processor.hpp
+    src/direct_speakers_component.hpp
+	src/channel_gains_box.hpp
+	src/channel_gain.hpp
+	src/value_box_main.hpp
+	src/value_box_metadata.hpp
+	src/value_box_channel_gain.hpp
+	src/value_box_speaker_layer.hpp
+)
+
+source_group("Header Files" FILES ${HEADERS_DIRECT_SPEAKERS_INPUT})
+
+# Input plugin code suffixes to start from 10
+add_juce_vst3_plugin(direct_speakers
+  SOURCES ${SOURCES_DIRECT_SPEAKERS_INPUT} ${HEADERS_DIRECT_SPEAKERS_INPUT}
+  IDE_FOLDER ${IDE_FOLDER_PLUGINS}
+  CODE_SUFFIX "10"
+  DISPLAY_NAME "EAR DirectSpeakers" 
+  DESCRIPTION "The metadata input plugin for channel-based audio"
+  OUTPUT_NAME "EAR DirectSpeakers")
+
+target_link_libraries(direct_speakers_VST3 PRIVATE ear-plugin-base)
+
+install_juce_vst3_plugin(direct_speakers "${EPS_PLUGIN_INSTALL_PREFIX}VST3/ear-production-suite")
diff --git a/...gins/direct_speakers/src/channel_gain.hpp → ...gins/direct_speakers/src/channel_gain.hpp b/...gins/direct_speakers/src/channel_gain.hpp → ...gins/direct_speakers/src/channel_gain.hpp
@@ -2,8 +2,8 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/...direct_speakers/src/channel_gains_box.hpp → ...direct_speakers/src/channel_gains_box.hpp b/...direct_speakers/src/channel_gains_box.hpp → ...direct_speakers/src/channel_gains_box.hpp
@@ -2,8 +2,8 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
 #include "channel_gain.hpp"
 
 namespace ear {

diff --git a/...peakers/src/direct_speakers_component.hpp → ...peakers/src/direct_speakers_component.hpp b/...peakers/src/direct_speakers_component.hpp → ...peakers/src/direct_speakers_component.hpp
@@ -2,11 +2,11 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/ear_combo_box.hpp"
-#include "../../shared/components/onboarding.hpp"
-#include "../../shared/components/overlay.hpp"
-#include "../../shared/helper/properties_file.hpp"
-#include "../../shared/components/ear_header.hpp"
+#include "components/ear_combo_box.hpp"
+#include "components/onboarding.hpp"
+#include "components/overlay.hpp"
+#include "helper/properties_file.hpp"
+#include "components/ear_header.hpp"
 #include "detail/constants.hpp"
 #include "value_box_channel_gain.hpp"
 #include "value_box_main.hpp"

diff --git a/...rc/direct_speakers_frontend_connector.cpp → ...rc/direct_speakers_frontend_connector.cpp b/...rc/direct_speakers_frontend_connector.cpp → ...rc/direct_speakers_frontend_connector.cpp
@@ -1,7 +1,7 @@
 #include "direct_speakers_frontend_connector.hpp"
 
-#include "../../shared/components/ear_combo_box.hpp"
-#include "../../shared/components/ear_name_text_editor.hpp"
+#include "components/ear_combo_box.hpp"
+#include "components/ear_name_text_editor.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/...rc/direct_speakers_frontend_connector.hpp → ...rc/direct_speakers_frontend_connector.hpp b/...rc/direct_speakers_frontend_connector.hpp → ...rc/direct_speakers_frontend_connector.hpp
@@ -4,9 +4,9 @@
 
 #include "direct_speakers_plugin_processor.hpp"
 #include "ui/direct_speakers_frontend_backend_connector.hpp"
-#include "../../shared/components/ear_combo_box.hpp"
-#include "../../shared/components/ear_name_text_editor.hpp"
-#include "../../shared/helper/multi_async_updater.h"
+#include "components/ear_combo_box.hpp"
+#include "components/ear_name_text_editor.hpp"
+#include "helper/multi_async_updater.h"
 #include "value_box_channel_gain.hpp"
 #include "value_box_speaker_layer.hpp"
 

diff --git a/...ers/src/direct_speakers_plugin_editor.cpp → ...ers/src/direct_speakers_plugin_editor.cpp b/...ers/src/direct_speakers_plugin_editor.cpp → ...ers/src/direct_speakers_plugin_editor.cpp
@@ -1,8 +1,8 @@
 #include "direct_speakers_plugin_editor.hpp"
 
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
-#include "../../shared/components/look_and_feel/shadows.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
+#include "components/look_and_feel/shadows.hpp"
 #include "direct_speakers_plugin_processor.hpp"
 #include "direct_speakers_frontend_connector.hpp"
 

diff --git a/...ers/src/direct_speakers_plugin_editor.hpp → ...ers/src/direct_speakers_plugin_editor.hpp b/...ers/src/direct_speakers_plugin_editor.hpp → ...ers/src/direct_speakers_plugin_editor.hpp
diff --git a/.../src/direct_speakers_plugin_processor.cpp → .../src/direct_speakers_plugin_processor.cpp b/.../src/direct_speakers_plugin_processor.cpp → .../src/direct_speakers_plugin_processor.cpp
@@ -1,7 +1,7 @@
 #include "direct_speakers_plugin_processor.hpp"
 #include "speaker_setups.hpp"
 
-#include "../../shared/components/non_automatable_parameter.hpp"
+#include "components/non_automatable_parameter.hpp"
 #include "direct_speakers_plugin_editor.hpp"
 #include "direct_speakers_frontend_connector.hpp"
 

diff --git a/.../src/direct_speakers_plugin_processor.hpp → .../src/direct_speakers_plugin_processor.hpp b/.../src/direct_speakers_plugin_processor.hpp → .../src/direct_speakers_plugin_processor.hpp
@@ -3,7 +3,7 @@
 #include "JuceHeader.h"
 
 #include "direct_speakers_backend.hpp"
-#include "../../shared/components/level_meter_calculator.hpp"
+#include "components/level_meter_calculator.hpp"
 
 #include <memory>
 

diff --git a/...t_speakers/src/value_box_channel_gain.hpp → ...t_speakers/src/value_box_channel_gain.hpp b/...t_speakers/src/value_box_channel_gain.hpp → ...t_speakers/src/value_box_channel_gain.hpp
@@ -2,12 +2,12 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/ear_slider.hpp"
-#include "../../shared/components/level_meter.hpp"
-#include "../../shared/components/ear_button.hpp"
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
-#include "../../shared/components/look_and_feel/slider.hpp"
+#include "components/ear_slider.hpp"
+#include "components/level_meter.hpp"
+#include "components/ear_button.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
+#include "components/look_and_feel/slider.hpp"
 #include "channel_gains_box.hpp"
 #include "speaker_setups.hpp"
 

diff --git a/...ns/direct_speakers/src/value_box_main.hpp → ...ns/direct_speakers/src/value_box_main.hpp b/...ns/direct_speakers/src/value_box_main.hpp → ...ns/direct_speakers/src/value_box_main.hpp
@@ -2,10 +2,10 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/ear_combo_box.hpp"
-#include "../../shared/components/ear_name_text_editor.hpp"
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
+#include "components/ear_combo_box.hpp"
+#include "components/ear_name_text_editor.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/...irect_speakers/src/value_box_metadata.hpp → ...irect_speakers/src/value_box_metadata.hpp b/...irect_speakers/src/value_box_metadata.hpp → ...irect_speakers/src/value_box_metadata.hpp
@@ -2,10 +2,10 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/ear_combo_box.hpp"
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
-#include "../../shared/helper/iso_lang_codes.hpp"
+#include "components/ear_combo_box.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
+#include "helper/iso_lang_codes.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/..._speakers/src/value_box_speaker_layer.hpp → ..._speakers/src/value_box_speaker_layer.hpp b/..._speakers/src/value_box_speaker_layer.hpp → ..._speakers/src/value_box_speaker_layer.hpp
@@ -2,10 +2,10 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
-#include "../../shared/components/look_and_feel/slider.hpp"
-#include "../../shared/components/speaker_layer.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
+#include "components/look_and_feel/slider.hpp"
+#include "components/speaker_layer.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/...n-suite/plugins/monitoring/CMakeLists.txt → ...plugins/plugins/monitoring/CMakeLists.txt b/...n-suite/plugins/monitoring/CMakeLists.txt → ...plugins/plugins/monitoring/CMakeLists.txt
@@ -1,35 +1,35 @@
 set(SOURCES_MONITORING
-    ${CMAKE_CURRENT_SOURCE_DIR}/../shared/binary_data.cpp
-    ${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/level_meter_calculator.cpp
+    ${EPS_SHARED_DIR}/binary_data.cpp
+    ${EPS_SHARED_DIR}/components/level_meter_calculator.cpp
     src/monitoring_plugin_editor.cpp
     src/monitoring_plugin_processor.cpp
 )
 
 set(HEADERS_MONITORING
-	${CMAKE_CURRENT_SOURCE_DIR}/../../lib/include/detail/constants.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../../lib/include/monitoring_audio_processor.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../../lib/include/monitoring_backend.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../../lib/include/speaker_setups.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../../lib/include/variable_block_adapter.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/detail/constants.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/monitoring_audio_processor.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/monitoring_backend.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/speaker_setups.hpp
+	${EPS_PLUGIN_BASE_DIR}/include/variable_block_adapter.hpp
 
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/binary_data.hpp
+	${EPS_SHARED_DIR}/binary_data.hpp
 
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/ear_button.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/ear_header.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/level_meter.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/level_meter_calculator.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/onboarding.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/onboarding_slide.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/overlay.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/segment_progress_bar.hpp
+	${EPS_SHARED_DIR}/components/ear_button.hpp
+	${EPS_SHARED_DIR}/components/ear_header.hpp
+	${EPS_SHARED_DIR}/components/level_meter.hpp
+	${EPS_SHARED_DIR}/components/level_meter_calculator.hpp
+	${EPS_SHARED_DIR}/components/onboarding.hpp
+	${EPS_SHARED_DIR}/components/onboarding_slide.hpp
+	${EPS_SHARED_DIR}/components/overlay.hpp
+	${EPS_SHARED_DIR}/components/segment_progress_bar.hpp
 
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/look_and_feel/colours.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/look_and_feel/fonts.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/look_and_feel/shadows.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/components/look_and_feel/slider.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/colours.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/fonts.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/shadows.hpp
+	${EPS_SHARED_DIR}/components/look_and_feel/slider.hpp
 
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/helper/graphics.hpp
-	${CMAKE_CURRENT_SOURCE_DIR}/../shared/helper/properties_file.hpp
+	${EPS_SHARED_DIR}/helper/graphics.hpp
+	${EPS_SHARED_DIR}/helper/properties_file.hpp
 
 	src/monitoring_plugin_editor.hpp
 	src/monitoring_plugin_processor.hpp

diff --git a/...nitoring/src/monitoring_plugin_editor.cpp → ...nitoring/src/monitoring_plugin_editor.cpp b/...nitoring/src/monitoring_plugin_editor.cpp → ...nitoring/src/monitoring_plugin_editor.cpp
@@ -1,8 +1,8 @@
 #include "monitoring_plugin_editor.hpp"
 
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
-#include "../../shared/helper/properties_file.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
+#include "helper/properties_file.hpp"
 #include "detail/constants.hpp"
 #include "monitoring_plugin_processor.hpp"
 #include "speaker_setups.hpp"

diff --git a/...nitoring/src/monitoring_plugin_editor.hpp → ...nitoring/src/monitoring_plugin_editor.hpp b/...nitoring/src/monitoring_plugin_editor.hpp → ...nitoring/src/monitoring_plugin_editor.hpp
@@ -2,11 +2,11 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/ear_button.hpp"
-#include "../../shared/components/level_meter.hpp"
-#include "../../shared/components/onboarding.hpp"
-#include "../../shared/components/overlay.hpp"
-#include "../../shared/components/ear_header.hpp"
+#include "components/ear_button.hpp"
+#include "components/level_meter.hpp"
+#include "components/onboarding.hpp"
+#include "components/overlay.hpp"
+#include "components/ear_header.hpp"
 #include "monitoring_plugin_processor.hpp"
 #include "speaker_meter.hpp"
 #include "speaker_meter_box.hpp"

diff --git a/...oring/src/monitoring_plugin_processor.cpp → ...oring/src/monitoring_plugin_processor.cpp b/...oring/src/monitoring_plugin_processor.cpp → ...oring/src/monitoring_plugin_processor.cpp
diff --git a/...oring/src/monitoring_plugin_processor.hpp → ...oring/src/monitoring_plugin_processor.hpp b/...oring/src/monitoring_plugin_processor.hpp → ...oring/src/monitoring_plugin_processor.hpp
@@ -5,7 +5,7 @@
 #include <ear/ear.hpp>
 #include <memory>
 
-#include "../../shared/components/level_meter_calculator.hpp"
+#include "components/level_meter_calculator.hpp"
 
 namespace ear {
 namespace plugin {

diff --git a/.../plugins/monitoring/src/speaker_meter.hpp → .../plugins/monitoring/src/speaker_meter.hpp b/.../plugins/monitoring/src/speaker_meter.hpp → .../plugins/monitoring/src/speaker_meter.hpp
@@ -2,9 +2,9 @@
 
 #include "JuceHeader.h"
 
-#include "../../shared/components/level_meter.hpp"
-#include "../../shared/components/look_and_feel/colours.hpp"
-#include "../../shared/components/look_and_feel/fonts.hpp"
+#include "components/level_meter.hpp"
+#include "components/look_and_feel/colours.hpp"
+#include "components/look_and_feel/fonts.hpp"
 
 namespace ear {
 namespace plugin {