From a11aeab0dd3dea911ff419dbd19494f532dfb88b Mon Sep 17 00:00:00 2001
From: Vincenzo Sicurella <sicurella12@gmail.com>
Date: Sun, 11 Aug 2024 16:48:37 -0400
Subject: [PATCH] reorganize files, start colour dropdown implementation in key
 editor controls

---
 Source/LumatoneEditorFonts.h                  |   12 -
 Source/LumatoneMenu.cpp                       |    1 -
 Source/LumatoneMenu.h                         |    2 +-
 Source/Main.cpp                               |   10 +-
 Source/Main.h                                 |    4 +-
 Source/MainWindow.cpp                         |    7 +-
 Source/MainWindow.h                           |    2 +-
 Source/Settings/CalibrationDlg.cpp            |    2 +-
 Source/Settings/CalibrationDlg.h              |    2 +-
 Source/Settings/FirmwareDlg.cpp               |    4 +-
 Source/Settings/FirmwareDlg.h                 |    6 +-
 Source/Settings/MidiSettingsDlg.cpp           |    2 +-
 Source/Settings/MidiSettingsDlg.h             |    2 +-
 Source/Settings/PresetSettingsDlg.h           |    2 +-
 Source/Settings/SettingsContainer.cpp         |    2 +-
 Source/Settings/SettingsContainer.h           |    2 +-
 Source/actions/BatchColourActions.h           |    2 +-
 Source/actions/EditorControlActions.h         |    2 +-
 Source/actions/KeySelectionControlActions.h   |    2 +-
 .../KeyboardClickListener.cpp                 |    2 +-
 .../KeyboardClickListener.h                   |    2 +-
 .../{ => components}/ColourPaletteWindow.cpp  |    8 +-
 Source/{ => components}/ColourPaletteWindow.h |    6 +-
 .../{ => components}/GlobalSettingsArea.cpp   |  664 +++++-----
 Source/{ => components}/GlobalSettingsArea.h  |  232 ++--
 Source/{ => components}/MainComponent.cpp     |  920 +++++++-------
 Source/{ => components}/MainComponent.h       |  384 +++---
 Source/{ => components}/MidiEditArea.cpp      |    6 +-
 Source/{ => components}/MidiEditArea.h        |    6 +-
 .../mapping}/BatchTools.cpp                   |    2 +-
 .../mapping}/BatchTools.h                     |    2 +-
 .../mapping}/BatchToolsColourControls.cpp     |    6 +-
 .../mapping}/BatchToolsColourControls.h       |    6 +-
 .../mapping}/KeyEditorControls.cpp            |   85 +-
 .../mapping}/KeyEditorControls.h              |   11 +-
 .../mapping}/KeyEditorPanel.cpp               |    2 +-
 .../mapping}/KeyEditorPanel.h                 |    2 +-
 .../{ => components/mapping}/MappingLogic.cpp |  630 +++++-----
 .../{ => components/mapping}/MappingLogic.h   |  346 +++---
 .../mapping}/MappingSettingsControls.cpp      |    4 +-
 .../mapping}/MappingSettingsControls.h        |    4 +-
 .../mapping}/MappingSettingsPanel.cpp         |    2 +-
 .../mapping}/MappingSettingsPanel.h           |    2 +-
 .../mapping}/MultiSelectControls.cpp          |   21 +-
 .../mapping}/MultiSelectControls.h            |    8 +-
 Source/{ => components}/palette_edit_panel.h  |    6 +-
 .../palette_selection_panel.h                 |    2 +-
 .../scale}/NoteNames.cpp                      |    0
 .../scale}/NoteNames.h                        |    2 +-
 .../scale}/ScaleMath.h                        |    0
 .../scale}/ScaleStructure.cpp                 |    4 +-
 .../scale}/ScaleStructure.h                   |    2 +-
 .../scale}/Symmetry.h                         |    0
 .../scale/circle}/GroupHandle.cpp             |    0
 .../scale/circle}/GroupHandle.h               |    0
 .../scale/circle}/GroupingCircle.cpp          |    2 +-
 .../scale/circle}/GroupingCircle.h            |   14 +-
 .../scale/circle}/NumberSelector.cpp          |    0
 .../scale/circle}/NumberSelector.h            |    0
 .../scale/circle}/ScaleDesignWindow.cpp       |    0
 .../scale/circle}/ScaleDesignWindow.h         |    0
 .../scale/circle}/ScaleStructureComponent.cpp |    2 +-
 .../scale/circle}/ScaleStructureComponent.h   |    7 +-
 .../scale/circle}/TransparentDropDown.h       |    0
 .../tables}/CurvesArea.cpp                    |    6 +-
 .../tables}/CurvesArea.h                      |    2 +-
 .../tables}/NoteOnOffVelocityCurveDialog.cpp  |   34 +-
 .../tables}/NoteOnOffVelocityCurveDialog.h    |   84 +-
 .../tables}/VelocityCurveComponents.cpp       |  214 ++--
 .../tables}/VelocityCurveComponents.h         |    0
 .../tables}/VelocityCurveDlgBase.cpp          |  854 ++++++-------
 .../tables}/VelocityCurveDlgBase.h            |  232 ++--
 .../tables}/VelocityCurveEditStrategy.cpp     | 1074 ++++++++---------
 .../tables}/VelocityCurveEditStrategy.h       |  314 ++---
 .../ColourDropdownSelector.cpp                |    9 +-
 .../ColourDropdownSelector.h                  |    0
 Source/{ => controls}/FileBrowserComponent.h  |    0
 .../RangedControl.cpp                         |    2 +-
 .../{components => controls}/RangedControl.h  |    0
 .../colour_palette_component.cpp              |    5 +-
 .../{ => controls}/colour_palette_component.h |    7 +-
 .../{ => controls}/colour_view_component.cpp  |    2 +-
 Source/{ => controls}/colour_view_component.h |    2 +-
 Source/data/LumatoneEditSelectionState.cpp    |    2 +-
 Source/{ => data}/LumatoneEditorState.cpp     |    9 +-
 Source/{ => data}/LumatoneEditorState.h       |    8 +-
 Source/{ => firmware}/FirmwareTransfer.cpp    |    2 +-
 Source/{ => firmware}/FirmwareTransfer.h      |    0
 Source/{ => style}/LocalisationMap.h          |    0
 .../{ => style}/LumatoneEditorFontLibrary.h   |    0
 .../{ => style}/LumatoneEditorLookAndFeel.h   |    0
 .../{ => style}/LumatoneEditorStyleCommon.h   |    6 +-
 92 files changed, 3173 insertions(+), 3167 deletions(-)
 delete mode 100644 Source/LumatoneEditorFonts.h
 rename Source/{mapping_editors => actions}/KeyboardClickListener.cpp (97%)
 rename Source/{mapping_editors => actions}/KeyboardClickListener.h (97%)
 rename Source/{ => components}/ColourPaletteWindow.cpp (97%)
 rename Source/{ => components}/ColourPaletteWindow.h (95%)
 rename Source/{ => components}/GlobalSettingsArea.cpp (97%)
 rename Source/{ => components}/GlobalSettingsArea.h (92%)
 rename Source/{ => components}/MainComponent.cpp (94%)
 rename Source/{ => components}/MainComponent.h (92%)
 rename Source/{ => components}/MidiEditArea.cpp (99%)
 rename Source/{ => components}/MidiEditArea.h (97%)
 rename Source/{mapping_editors => components/mapping}/BatchTools.cpp (98%)
 rename Source/{mapping_editors => components/mapping}/BatchTools.h (95%)
 rename Source/{mapping_editors => components/mapping}/BatchToolsColourControls.cpp (98%)
 rename Source/{mapping_editors => components/mapping}/BatchToolsColourControls.h (90%)
 rename Source/{mapping_editors => components/mapping}/KeyEditorControls.cpp (78%)
 rename Source/{mapping_editors => components/mapping}/KeyEditorControls.h (89%)
 rename Source/{mapping_editors => components/mapping}/KeyEditorPanel.cpp (98%)
 rename Source/{mapping_editors => components/mapping}/KeyEditorPanel.h (97%)
 rename Source/{ => components/mapping}/MappingLogic.cpp (96%)
 rename Source/{ => components/mapping}/MappingLogic.h (95%)
 rename Source/{mapping_editors => components/mapping}/MappingSettingsControls.cpp (98%)
 rename Source/{mapping_editors => components/mapping}/MappingSettingsControls.h (95%)
 rename Source/{mapping_editors => components/mapping}/MappingSettingsPanel.cpp (97%)
 rename Source/{mapping_editors => components/mapping}/MappingSettingsPanel.h (96%)
 rename Source/{mapping_editors => components/mapping}/MultiSelectControls.cpp (94%)
 rename Source/{mapping_editors => components/mapping}/MultiSelectControls.h (92%)
 rename Source/{ => components}/palette_edit_panel.h (98%)
 rename Source/{ => components}/palette_selection_panel.h (99%)
 rename Source/{ScaleStructureController => components/scale}/NoteNames.cpp (100%)
 rename Source/{ScaleStructureController => components/scale}/NoteNames.h (99%)
 rename Source/{ScaleStructureController => components/scale}/ScaleMath.h (100%)
 rename Source/{ScaleStructureController => components/scale}/ScaleStructure.cpp (99%)
 rename Source/{ScaleStructureController => components/scale}/ScaleStructure.h (99%)
 rename Source/{ScaleStructureController => components/scale}/Symmetry.h (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/GroupHandle.cpp (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/GroupHandle.h (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/GroupingCircle.cpp (99%)
 rename Source/{ScaleStructureController => components/scale/circle}/GroupingCircle.h (98%)
 rename Source/{ScaleStructureController => components/scale/circle}/NumberSelector.cpp (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/NumberSelector.h (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/ScaleDesignWindow.cpp (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/ScaleDesignWindow.h (100%)
 rename Source/{ScaleStructureController => components/scale/circle}/ScaleStructureComponent.cpp (99%)
 rename Source/{ScaleStructureController => components/scale/circle}/ScaleStructureComponent.h (98%)
 rename Source/{ScaleStructureController => components/scale/circle}/TransparentDropDown.h (100%)
 rename Source/{mapping_editors => components/tables}/CurvesArea.cpp (98%)
 rename Source/{mapping_editors => components/tables}/CurvesArea.h (98%)
 rename Source/{ => components/tables}/NoteOnOffVelocityCurveDialog.cpp (97%)
 rename Source/{ => components/tables}/NoteOnOffVelocityCurveDialog.h (96%)
 rename Source/{ => components/tables}/VelocityCurveComponents.cpp (92%)
 rename Source/{ => components/tables}/VelocityCurveComponents.h (100%)
 rename Source/{ => components/tables}/VelocityCurveDlgBase.cpp (95%)
 rename Source/{ => components/tables}/VelocityCurveDlgBase.h (96%)
 rename Source/{ => components/tables}/VelocityCurveEditStrategy.cpp (96%)
 rename Source/{ => components/tables}/VelocityCurveEditStrategy.h (97%)
 rename Source/{components => controls}/ColourDropdownSelector.cpp (99%)
 rename Source/{components => controls}/ColourDropdownSelector.h (100%)
 rename Source/{ => controls}/FileBrowserComponent.h (100%)
 rename Source/{components => controls}/RangedControl.cpp (98%)
 rename Source/{components => controls}/RangedControl.h (100%)
 rename Source/{ => controls}/colour_palette_component.cpp (98%)
 rename Source/{ => controls}/colour_palette_component.h (91%)
 rename Source/{ => controls}/colour_view_component.cpp (99%)
 rename Source/{ => controls}/colour_view_component.h (98%)
 rename Source/{ => data}/LumatoneEditorState.cpp (98%)
 rename Source/{ => data}/LumatoneEditorState.h (97%)
 rename Source/{ => firmware}/FirmwareTransfer.cpp (99%)
 rename Source/{ => firmware}/FirmwareTransfer.h (100%)
 rename Source/{ => style}/LocalisationMap.h (100%)
 rename Source/{ => style}/LumatoneEditorFontLibrary.h (100%)
 rename Source/{ => style}/LumatoneEditorLookAndFeel.h (100%)
 rename Source/{ => style}/LumatoneEditorStyleCommon.h (99%)

diff --git a/Source/LumatoneEditorFonts.h b/Source/LumatoneEditorFonts.h
deleted file mode 100644
index ce213082..00000000
--- a/Source/LumatoneEditorFonts.h
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
-  ==============================================================================
-
-    LumatoneEditorFontLibrary.h
-    Created: 12 Feb 2021 10:52:11pm
-    Author:  Vincenzo
-
-  ==============================================================================
-*/
-
-#pragma once
-#include <JuceHeader.h>
diff --git a/Source/LumatoneMenu.cpp b/Source/LumatoneMenu.cpp
index 8045684a..c6626008 100644
--- a/Source/LumatoneMenu.cpp
+++ b/Source/LumatoneMenu.cpp
@@ -9,7 +9,6 @@
 */
 
 #include "LumatoneMenu.h"
-#include "./LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {
diff --git a/Source/LumatoneMenu.h b/Source/LumatoneMenu.h
index 78458c6d..19118380 100644
--- a/Source/LumatoneMenu.h
+++ b/Source/LumatoneMenu.h
@@ -12,7 +12,7 @@
 
 #include <JuceHeader.h>
 
-#include "LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
 namespace Lumatone {
 	namespace Menu {
diff --git a/Source/Main.cpp b/Source/Main.cpp
index dd6ab0d4..5e313861 100644
--- a/Source/Main.cpp
+++ b/Source/Main.cpp
@@ -12,11 +12,11 @@
 #include "Main.h"
 
 #include "MainWindow.h"
-#include "MainComponent.h"
+#include "./components/MainComponent.h"
 
-#include "FirmwareTransfer.h"
+#include "./firmware/FirmwareTransfer.h"
 
-#include "LumatoneEditorLookAndFeel.h"
+#include "./style/LumatoneEditorLookAndFeel.h"
 
 #include "./actions/KeySelectionControlActions.h"
 
@@ -25,8 +25,8 @@
 #include "./lumatone_editor_library/graphics/view_constants.h"
 #include "./lumatone_editor_library/palettes/colour_palette_file.h"
 
-#include "VelocityCurveDlgBase.h"
-#include "NoteOnOffVelocityCurveDialog.h"
+// #include "VelocityCurveDlgBase.h"
+// #include "NoteOnOffVelocityCurveDialog.h"
 #include "LumatoneMenu.h"
 
 //==============================================================================
diff --git a/Source/Main.h b/Source/Main.h
index 3f7ae1cf..2da2236f 100644
--- a/Source/Main.h
+++ b/Source/Main.h
@@ -14,9 +14,9 @@
 
 #include "./lumatone_editor_library/lumatone_midi_driver/lumatone_midi_driver.h"
 
-#include "./LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
-#include "LocalisationMap.h"
+#include "./style/LocalisationMap.h"
 
 #define CHOOSE_FILE_NOOP [](bool) -> void {}
 
diff --git a/Source/MainWindow.cpp b/Source/MainWindow.cpp
index 403123d3..d4bfd4c5 100644
--- a/Source/MainWindow.cpp
+++ b/Source/MainWindow.cpp
@@ -8,13 +8,12 @@
 */
 
 #include "MainWindow.h"
-#include "MainComponent.h"
-
 #include "LumatoneMenu.h"
 
-#include "LumatoneEditorLookAndFeel.h"
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "./components/MainComponent.h"
+#include "./style/LumatoneEditorLookAndFeel.h"
 
+#include "./lumatone_editor_library/palettes/colour_palette_file.h"
 #include "./lumatone_editor_library/graphics/view_constants.h"
 
 MainWindow::MainWindow(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* cmdManager)
diff --git a/Source/MainWindow.h b/Source/MainWindow.h
index 87e777d8..db4309c4 100644
--- a/Source/MainWindow.h
+++ b/Source/MainWindow.h
@@ -10,7 +10,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "LumatoneEditorState.h"
+#include "./data/LumatoneEditorState.h"
 
 #include "./lumatone_editor_library/listeners/editor_listener.h"
 
diff --git a/Source/Settings/CalibrationDlg.cpp b/Source/Settings/CalibrationDlg.cpp
index 300ff198..da39a1db 100644
--- a/Source/Settings/CalibrationDlg.cpp
+++ b/Source/Settings/CalibrationDlg.cpp
@@ -20,7 +20,7 @@
 //[Headers] You can add your own extra header files here...
 #include "WheelsCalibrationComponent.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 #include "../lumatone_editor_library/graphics/view_constants.h"
 #include "../lumatone_editor_library/device/lumatone_controller.h"
diff --git a/Source/Settings/CalibrationDlg.h b/Source/Settings/CalibrationDlg.h
index 9510a5af..14196a30 100644
--- a/Source/Settings/CalibrationDlg.h
+++ b/Source/Settings/CalibrationDlg.h
@@ -21,7 +21,7 @@
 
 //[Headers]     -- You can add your own extra header files here --
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 
diff --git a/Source/Settings/FirmwareDlg.cpp b/Source/Settings/FirmwareDlg.cpp
index 74a7c90b..c39f8f73 100644
--- a/Source/Settings/FirmwareDlg.cpp
+++ b/Source/Settings/FirmwareDlg.cpp
@@ -10,8 +10,8 @@
 
 #include "FirmwareDlg.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
-#include "../LumatoneEditorFontLibrary.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorFontLibrary.h"
 
 #include "../lumatone_editor_library/device/lumatone_controller.h"
 
diff --git a/Source/Settings/FirmwareDlg.h b/Source/Settings/FirmwareDlg.h
index 34de2e7f..7118cc61 100644
--- a/Source/Settings/FirmwareDlg.h
+++ b/Source/Settings/FirmwareDlg.h
@@ -10,9 +10,9 @@
 
 #pragma once
 
-#include "../LumatoneEditorState.h"
-#include "../FileBrowserComponent.h"
-#include "../FirmwareTransfer.h"
+#include "../data/LumatoneEditorState.h"
+#include "../controls/FileBrowserComponent.h"
+#include "../firmware/FirmwareTransfer.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 
diff --git a/Source/Settings/MidiSettingsDlg.cpp b/Source/Settings/MidiSettingsDlg.cpp
index d02991b9..b8115828 100644
--- a/Source/Settings/MidiSettingsDlg.cpp
+++ b/Source/Settings/MidiSettingsDlg.cpp
@@ -10,7 +10,7 @@
 
 #include "MidiSettingsDlg.h"
 
-#include "../LumatoneEditorFontLibrary.h"
+#include "../style/LumatoneEditorFontLibrary.h"
 
 #include "../lumatone_editor_library/device/lumatone_controller.h"
 
diff --git a/Source/Settings/MidiSettingsDlg.h b/Source/Settings/MidiSettingsDlg.h
index 45601381..d36dbd43 100644
--- a/Source/Settings/MidiSettingsDlg.h
+++ b/Source/Settings/MidiSettingsDlg.h
@@ -10,7 +10,7 @@
 
 #pragma once
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
diff --git a/Source/Settings/PresetSettingsDlg.h b/Source/Settings/PresetSettingsDlg.h
index 263dcb41..cd1874b3 100644
--- a/Source/Settings/PresetSettingsDlg.h
+++ b/Source/Settings/PresetSettingsDlg.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 #include "../lumatone_editor_library/listeners/firmware_listener.h"
 #include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
diff --git a/Source/Settings/SettingsContainer.cpp b/Source/Settings/SettingsContainer.cpp
index 22c91e47..def38268 100644
--- a/Source/Settings/SettingsContainer.cpp
+++ b/Source/Settings/SettingsContainer.cpp
@@ -10,7 +10,7 @@
 
 #include "SettingsContainer.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 #include "CalibrationDlg.h"
 #include "FirmwareDlg.h"
diff --git a/Source/Settings/SettingsContainer.h b/Source/Settings/SettingsContainer.h
index 64df86c4..c631e45f 100644
--- a/Source/Settings/SettingsContainer.h
+++ b/Source/Settings/SettingsContainer.h
@@ -11,7 +11,7 @@
 #pragma once
 #include <JuceHeader.h>
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 typedef enum {
     Calibration = 0,
diff --git a/Source/actions/BatchColourActions.h b/Source/actions/BatchColourActions.h
index e76b397c..f9254a6f 100644
--- a/Source/actions/BatchColourActions.h
+++ b/Source/actions/BatchColourActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_EDITOR_BATCH_COLOUR_ACTIONS_H
 #define LUMATONE_EDITOR_BATCH_COLOUR_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditorBatchColourState.h"
 
diff --git a/Source/actions/EditorControlActions.h b/Source/actions/EditorControlActions.h
index a619aa20..cd802736 100644
--- a/Source/actions/EditorControlActions.h
+++ b/Source/actions/EditorControlActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_EDITOR_CONTROL_ACTIONS_H
 #define LUMATONE_EDITOR_CONTROL_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditSelectionState.h"
 
diff --git a/Source/actions/KeySelectionControlActions.h b/Source/actions/KeySelectionControlActions.h
index f15fe652..0f9cbbc2 100644
--- a/Source/actions/KeySelectionControlActions.h
+++ b/Source/actions/KeySelectionControlActions.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_SELECTION_CONTROL_ACTIONS_H
 #define LUMATONE_SELECTION_CONTROL_ACTIONS_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/actions/lumatone_action.h"
 #include "../data/LumatoneEditSelectionState.h"
 
diff --git a/Source/mapping_editors/KeyboardClickListener.cpp b/Source/actions/KeyboardClickListener.cpp
similarity index 97%
rename from Source/mapping_editors/KeyboardClickListener.cpp
rename to Source/actions/KeyboardClickListener.cpp
index b3ed8ed5..99d749a7 100644
--- a/Source/mapping_editors/KeyboardClickListener.cpp
+++ b/Source/actions/KeyboardClickListener.cpp
@@ -1,6 +1,6 @@
 #include "KeyboardClickListener.h"
 
-#include "../actions/KeySelectionControlActions.h"
+#include "./KeySelectionControlActions.h"
 
 KeyboardClickListener::KeyboardClickListener(const LumatoneEditorState &stateIn, LumatoneKeyboardComponent *keyboardComponentIn)
     : LumatoneEditorState("LumatoneKeyboardClickListener", stateIn)
diff --git a/Source/mapping_editors/KeyboardClickListener.h b/Source/actions/KeyboardClickListener.h
similarity index 97%
rename from Source/mapping_editors/KeyboardClickListener.h
rename to Source/actions/KeyboardClickListener.h
index d073330f..035543dd 100644
--- a/Source/mapping_editors/KeyboardClickListener.h
+++ b/Source/actions/KeyboardClickListener.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_KEY_SELECTION_CONTROLLER_H
 #define LUMATONE_KEY_SELECTION_CONTROLLER_H
 
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 #include "../lumatone_editor_library/ui/keyboard_component.h"
 #include "../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
 // Maybe KeyboardComponentSelectionController
diff --git a/Source/ColourPaletteWindow.cpp b/Source/components/ColourPaletteWindow.cpp
similarity index 97%
rename from Source/ColourPaletteWindow.cpp
rename to Source/components/ColourPaletteWindow.cpp
index 7ab9b530..e36190ec 100644
--- a/Source/ColourPaletteWindow.cpp
+++ b/Source/components/ColourPaletteWindow.cpp
@@ -10,13 +10,13 @@
 
 #include "ColourPaletteWindow.h"
 
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
-#include "./lumatone_editor_library/palettes/colour_picker_panel.h"
+#include "../lumatone_editor_library/palettes/colour_picker_panel.h"
+#include "../lumatone_editor_library/palettes/colour_selection_group.h"
 
-#include "./colour_palette_component.h"
+#include "../controls/colour_palette_component.h"
 #include "./palette_edit_panel.h"
 
-#include "./LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
 
 //==============================================================================
diff --git a/Source/ColourPaletteWindow.h b/Source/components/ColourPaletteWindow.h
similarity index 95%
rename from Source/ColourPaletteWindow.h
rename to Source/components/ColourPaletteWindow.h
index d864b390..5205085d 100644
--- a/Source/ColourPaletteWindow.h
+++ b/Source/components/ColourPaletteWindow.h
@@ -10,12 +10,12 @@
 
 #pragma once
 
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "./../lumatone_editor_library/palettes/colour_selection_group.h"
+#include "./../lumatone_editor_library/palettes/colour_palette_file.h"
 
 #include "./palette_selection_panel.h"
 
-#include "./LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 class ColourSelectionGroup;
 class ColourPaletteComponent;
diff --git a/Source/GlobalSettingsArea.cpp b/Source/components/GlobalSettingsArea.cpp
similarity index 97%
rename from Source/GlobalSettingsArea.cpp
rename to Source/components/GlobalSettingsArea.cpp
index 1c23e13a..9e272bdd 100644
--- a/Source/GlobalSettingsArea.cpp
+++ b/Source/components/GlobalSettingsArea.cpp
@@ -1,332 +1,332 @@
-/*
-  ==============================================================================
-
-  This is an automatically generated GUI class created by the Projucer!
-
-  Be careful when adding custom code to these files, as only the code within
-  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
-  and re-saved.
-
-  Created with Projucer version: 6.0.8
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-//[Headers] You can add your own extra header files here...
-#include "LumatoneEditorLookAndFeel.h"
-
-#include "./Settings/SettingsContainer.h"
-
-//[/Headers]
-
-#include "GlobalSettingsArea.h"
-
-
-//[MiscUserDefs] You can add your own user definitions and misc code here...
-//[/MiscUserDefs]
-
-//==============================================================================
-GlobalSettingsArea::GlobalSettingsArea (const LumatoneEditorState& stateIn)
-    : LumatoneEditorState("GlobalSettingsArea", stateIn)
-{
-    //[Constructor_pre] You can add your own custom stuff here..
-    //[/Constructor_pre]
-
-    lblPresetButtonColours.reset (new juce::Label ("lblPresetButtonColours",
-                                                   juce::translate("Preset Button Colours:")));
-    addAndMakeVisible (lblPresetButtonColours.get());
-    lblPresetButtonColours->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
-    lblPresetButtonColours->setJustificationType (juce::Justification::centredLeft);
-    lblPresetButtonColours->setEditable (false, false, false);
-    lblPresetButtonColours->setColour (juce::TextEditor::textColourId, juce::Colours::black);
-    lblPresetButtonColours->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
-
-    lblColourInactiveMacroButton.reset (new juce::Label ("lblColourInactiveMacroButton",
-                                                         juce::translate("inactive")));
-    addAndMakeVisible (lblColourInactiveMacroButton.get());
-    lblColourInactiveMacroButton->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
-    lblColourInactiveMacroButton->setJustificationType (juce::Justification::centredLeft);
-    lblColourInactiveMacroButton->setEditable (false, false, false);
-    lblColourInactiveMacroButton->setColour (juce::TextEditor::textColourId, juce::Colours::black);
-    lblColourInactiveMacroButton->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
-
-    lblColourActiveMacroButton.reset (new juce::Label ("lblColourActiveMacroButton",
-                                                       juce::translate("active")));
-    addAndMakeVisible (lblColourActiveMacroButton.get());
-    lblColourActiveMacroButton->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
-    lblColourActiveMacroButton->setJustificationType (juce::Justification::centredLeft);
-    lblColourActiveMacroButton->setEditable (false, false, false);
-    lblColourActiveMacroButton->setColour (juce::TextEditor::textColourId, juce::Colours::black);
-    lblColourActiveMacroButton->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
-
-    settingsButton.reset (new juce::TextButton ("buttonCalibrate"));
-    addAndMakeVisible (settingsButton.get());
-    settingsButton->setTooltip (juce::translate("Show controls for calibration, setting controller MIDI channels, and updating firmware"));
-    settingsButton->setButtonText (juce::translate("Settings"));
-    settingsButton->addListener (this);
-
-
-    //[UserPreSize]
-    activeMacroButtonColourEdit.reset(new ColourViewComponent());
-    addAndMakeVisible(activeMacroButtonColourEdit.get());
-    activeMacroButtonColourEdit->addChangeListener(this);
-    activeMacroButtonColourEdit->setColour(getActiveMacroButtonColour().toString(), false);
-
-    inactiveMacroButtonColourEdit.reset(new ColourViewComponent());
-    addAndMakeVisible(inactiveMacroButtonColourEdit.get());
-    inactiveMacroButtonColourEdit->addChangeListener(this);
-    inactiveMacroButtonColourEdit->setColour(getInactiveMacroButtonColour().toString(), false);
-
-    lblDeveloperMode.reset(new juce::Label("DeveloperModeLabel", "Developer Mode"));
-    addChildComponent(lblDeveloperMode.get());
-    setDeveloperMode(getInDeveloperMode());
-
-    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
-    lblColourActiveMacroButton->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
-    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
-
-    addStatusListener(this);
-    addEditorListener(this);
-
-    settingsButton->setEnabled(false);
-
-    lblPresetButtonColours->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
-
-    lblColourActiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
-    lblColourInactiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
-
-    settingsButton->setColour(TextButton::ColourIds::buttonColourId, Colour(0xff383b3d));
-    settingsButton->setColour(TextButton::ColourIds::textColourOffId, Colour(0xffffffff));
-
-    connectionStateChanged(getConnectionState());
-
-    /* We don't want a resize here
-    /*
-    //[/UserPreSize]
-
-    setSize (456, 64);
-
-
-    //[Constructor] You can add your own custom stuff here..
-    */
-
-
-	// Set values according to the properties files
-	// restoreStateFromPropertiesFile(TerpstraSysExApplication::getApp().getPropertiesFile());
-    //[/Constructor]
-}
-
-GlobalSettingsArea::~GlobalSettingsArea()
-{
-    //[Destructor_pre]. You can add your own custom destruction code here..
-	inactiveMacroButtonColourEdit = nullptr;
-	activeMacroButtonColourEdit = nullptr;
-    //[/Destructor_pre]
-
-    lblPresetButtonColours = nullptr;
-    lblColourInactiveMacroButton = nullptr;
-    lblColourActiveMacroButton = nullptr;
-    settingsButton = nullptr;
-
-
-    //[Destructor]. You can add your own custom destruction code here..
-    //[/Destructor]
-}
-
-void GlobalSettingsArea::macroButtonInactiveColourChanged(juce::Colour colour)
-{
-    inactiveMacroButtonColourEdit->setColour(colour.toString(), false);
-}
-
-void GlobalSettingsArea::macroButtonActiveColourChanged(juce::Colour colour)
-{
-    activeMacroButtonColourEdit->setColour(colour.toString(), false);
-}
-
-//==============================================================================
-void GlobalSettingsArea::paint (juce::Graphics& g)
-{
-    //[UserPrePaint] Add your own custom painting code here..
-    //[/UserPrePaint]
-
-    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
-    g.fillAll();
-
-    //[UserPaint] Add your own custom painting code here..
-    //[/UserPaint]
-}
-
-void GlobalSettingsArea::resized()
-{
-    //[UserPreResize] Add your own custom resize code here..
-
-    // Build right-to-left
-
-    int calbrateBtnHeight = roundToInt(getHeight() * calibrateHeight);
-    int calibrateWidth = getLookAndFeel().getTextButtonWidthToFitText(*settingsButton, calbrateBtnHeight);
-
-    float controlsMargin = roundToInt(getHeight() * 0.1f);
-    float colourEditHeight = proportionOfHeight(controlsHeight);
-    float controlY = proportionOfHeight((1 - controlsHeight) / 2.0f);
-    float colourButtonWidth = colourEditHeight * colourButtonAspect;
-    Font colourLabelsFont = getAppFonts().getFont(LumatoneEditorFont::FranklinGothic, colourEditHeight * 1.1f);
-
-    int startMargin = proportionOfWidth(marginXRatio);
-    settingsButton->setSize(calibrateWidth, calbrateBtnHeight);
-    settingsButton->setTopRightPosition(getWidth() - startMargin, roundToInt((getHeight() - settingsButton->getHeight()) * 0.5f));
-
-    lblColourInactiveMacroButton->setFont(colourLabelsFont);
-    resizeLabelWithHeight(lblColourInactiveMacroButton.get(), colourEditHeight);
-    lblColourInactiveMacroButton->setTopRightPosition(settingsButton->getX() - controlsMargin, controlY);
-
-    inactiveMacroButtonColourEdit->setSize(colourButtonWidth, colourEditHeight);
-    inactiveMacroButtonColourEdit->setTopRightPosition(lblColourInactiveMacroButton->getX() - controlsMargin, controlY);
-
-    lblColourActiveMacroButton->setFont(colourLabelsFont);
-    resizeLabelWithHeight(lblColourActiveMacroButton.get(), colourEditHeight);
-    lblColourActiveMacroButton->setTopRightPosition(inactiveMacroButtonColourEdit->getX() - controlsMargin, controlY);
-
-    activeMacroButtonColourEdit->setSize(colourButtonWidth, colourEditHeight);
-    activeMacroButtonColourEdit->setTopRightPosition(lblColourActiveMacroButton->getX() - controlsMargin, controlY);
-
-    resizeLabelWithHeight(lblPresetButtonColours.get(), colourEditHeight);
-    lblPresetButtonColours->setTopRightPosition(activeMacroButtonColourEdit->getX() - controlsMargin, controlY);
-
-    resizeLabelWithHeight(lblDeveloperMode.get(), getHeight());
-    lblDeveloperMode->setCentrePosition(getLocalBounds().getCentre());
-
-    //[/UserPreResize]
-
-    //[UserResized] Add your own custom resize handling here..
-    //[/UserResized]
-}
-
-void GlobalSettingsArea::buttonClicked (juce::Button* buttonThatWasClicked)
-{
-    //[UserbuttonClicked_Pre]
-    //[/UserbuttonClicked_Pre]
-
-    if (buttonThatWasClicked == settingsButton.get())
-    {
-        //[UserButtonCode_buttonCalibrate] -- add your button handler code here..
-
-		auto settingsComponent = new SettingsContainer(*this);
-        settingsComponent->setLookAndFeel(&getLookAndFeel());
-
-		DialogWindow::LaunchOptions launchOptions;
-		launchOptions.content.setOwned(settingsComponent);
-		launchOptions.content->setSize(480, 240);
-
-		launchOptions.dialogTitle = "Settings";
-		launchOptions.escapeKeyTriggersCloseButton = true;
-		launchOptions.useNativeTitleBar = false;
-		launchOptions.resizable = false;
-
-        launchOptions.dialogBackgroundColour = Colour();
-
-		auto settingsDialog = launchOptions.launchAsync();
-        settingsDialog->setLookAndFeel(static_cast<juce::LookAndFeel_V4*>(&getEditorLookAndFeel().compactWindowStyle));
-        settingsDialog->centreWithSize(548, 240);
-
-        // TerpstraSysExApplication::getApp().setOpenDialogWindow(settingsDialog);
-
-        //[/UserButtonCode_buttonCalibrate]
-    }
-
-    //[UserbuttonClicked_Post]
-    //[/UserbuttonClicked_Post]
-}
-
-
-
-//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-
-void GlobalSettingsArea::changeListenerCallback(ChangeBroadcaster *source)
-{
-	if (source == inactiveMacroButtonColourEdit.get())
-	{
-        setInactiveMacroButtonColour(inactiveMacroButtonColourEdit->getColourAsObject());
-	}
-	else if (source == activeMacroButtonColourEdit.get())
-	{
-        setActiveMacroButtonColour(activeMacroButtonColourEdit->getColourAsObject());
-	}
-}
-
-void GlobalSettingsArea::listenToColourEditButtons(Button::Listener* listenerIn)
-{
-    inactiveMacroButtonColourEdit->addListener(listenerIn);
-    activeMacroButtonColourEdit->addListener(listenerIn);
-}
-
-void GlobalSettingsArea::setDeveloperMode(bool devModeOn)
-{
-    showDeveloperMode = devModeOn;
-    lblDeveloperMode->setVisible(showDeveloperMode);
-    if (devModeOn)
-        settingsButton->setEnabled(true);
-    repaint();
-}
-
-void GlobalSettingsArea::connectionStateChanged(ConnectionState state)
-{
-    settingsButton->setEnabled(state == ConnectionState::ONLINE);
-    inactiveMacroButtonColourEdit->setEnabled(state == ConnectionState::ONLINE);
-    activeMacroButtonColourEdit->setEnabled(state == ConnectionState::ONLINE);
-}
-
-// void GlobalSettingsArea::connectionFaile()
-// {
-//     settingsButton->setEnabled(false);
-// }
-
-//[/MiscUserCode]
-
-
-//==============================================================================
-#if 0
-/*  -- Projucer information section --
-
-    This is where the Projucer stores the metadata that describe this GUI layout, so
-    make changes in here at your peril!
-
-BEGIN_JUCER_METADATA
-
-<JUCER_COMPONENT documentType="Component" className="GlobalSettingsArea" componentName=""
-                 parentClasses="public juce::Component, public ChangeListener, public LumatoneEditor::StatusListener"
-                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
-                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="456"
-                 initialHeight="64">
-  <BACKGROUND backgroundColour="0"/>
-  <LABEL name="lblPresetButtonColours" id="988da53c99fc73f2" memberName="lblPresetButtonColours"
-         virtualName="" explicitFocusOrder="0" pos="0 8 150 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="Preset Button Colours:" editableSingleClick="0"
-         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
-         fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="33"/>
-  <LABEL name="lblColourInactiveMacroButton" id="9c5cddfcc2966280" memberName="lblColourInactiveMacroButton"
-         virtualName="" explicitFocusOrder="0" pos="152 32 64 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="inactive" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
-         kerning="0.0" bold="0" italic="0" justification="33"/>
-  <LABEL name="lblColourActiveMacroButton" id="79f93468a20f174" memberName="lblColourActiveMacroButton"
-         virtualName="" explicitFocusOrder="0" pos="152 8 56 24" edTextCol="ff000000"
-         edBkgCol="0" labelText="active" editableSingleClick="0" editableDoubleClick="0"
-         focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
-         kerning="0.0" bold="0" italic="0" justification="33"/>
-  <TEXTBUTTON name="settingsButton" id="47242594c34a8de9" memberName="settingsButton"
-              virtualName="" explicitFocusOrder="0" pos="336 8 112 24" tooltip="Show controls for calibration, setting controller MIDI channels, and updating firmware"
-              buttonText="Settings" connectedEdges="0" needsCallback="1" radioGroupId="0"/>
-</JUCER_COMPONENT>
-
-END_JUCER_METADATA
-*/
-#endif
-
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 6.0.8
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+#include "../style/LumatoneEditorLookAndFeel.h"
+
+#include "../Settings/SettingsContainer.h"
+
+//[/Headers]
+
+#include "GlobalSettingsArea.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+GlobalSettingsArea::GlobalSettingsArea (const LumatoneEditorState& stateIn)
+    : LumatoneEditorState("GlobalSettingsArea", stateIn)
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+    //[/Constructor_pre]
+
+    lblPresetButtonColours.reset (new juce::Label ("lblPresetButtonColours",
+                                                   juce::translate("Preset Button Colours:")));
+    addAndMakeVisible (lblPresetButtonColours.get());
+    lblPresetButtonColours->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
+    lblPresetButtonColours->setJustificationType (juce::Justification::centredLeft);
+    lblPresetButtonColours->setEditable (false, false, false);
+    lblPresetButtonColours->setColour (juce::TextEditor::textColourId, juce::Colours::black);
+    lblPresetButtonColours->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
+
+    lblColourInactiveMacroButton.reset (new juce::Label ("lblColourInactiveMacroButton",
+                                                         juce::translate("inactive")));
+    addAndMakeVisible (lblColourInactiveMacroButton.get());
+    lblColourInactiveMacroButton->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
+    lblColourInactiveMacroButton->setJustificationType (juce::Justification::centredLeft);
+    lblColourInactiveMacroButton->setEditable (false, false, false);
+    lblColourInactiveMacroButton->setColour (juce::TextEditor::textColourId, juce::Colours::black);
+    lblColourInactiveMacroButton->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
+
+    lblColourActiveMacroButton.reset (new juce::Label ("lblColourActiveMacroButton",
+                                                       juce::translate("active")));
+    addAndMakeVisible (lblColourActiveMacroButton.get());
+    lblColourActiveMacroButton->setFont (juce::Font (15.00f, juce::Font::plain).withTypefaceStyle ("Regular"));
+    lblColourActiveMacroButton->setJustificationType (juce::Justification::centredLeft);
+    lblColourActiveMacroButton->setEditable (false, false, false);
+    lblColourActiveMacroButton->setColour (juce::TextEditor::textColourId, juce::Colours::black);
+    lblColourActiveMacroButton->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
+
+    settingsButton.reset (new juce::TextButton ("buttonCalibrate"));
+    addAndMakeVisible (settingsButton.get());
+    settingsButton->setTooltip (juce::translate("Show controls for calibration, setting controller MIDI channels, and updating firmware"));
+    settingsButton->setButtonText (juce::translate("Settings"));
+    settingsButton->addListener (this);
+
+
+    //[UserPreSize]
+    activeMacroButtonColourEdit.reset(new ColourViewComponent());
+    addAndMakeVisible(activeMacroButtonColourEdit.get());
+    activeMacroButtonColourEdit->addChangeListener(this);
+    activeMacroButtonColourEdit->setColour(getActiveMacroButtonColour().toString(), false);
+
+    inactiveMacroButtonColourEdit.reset(new ColourViewComponent());
+    addAndMakeVisible(inactiveMacroButtonColourEdit.get());
+    inactiveMacroButtonColourEdit->addChangeListener(this);
+    inactiveMacroButtonColourEdit->setColour(getInactiveMacroButtonColour().toString(), false);
+
+    lblDeveloperMode.reset(new juce::Label("DeveloperModeLabel", "Developer Mode"));
+    addChildComponent(lblDeveloperMode.get());
+    setDeveloperMode(getInDeveloperMode());
+
+    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+    lblColourActiveMacroButton->setFont(getAppFonts().getFont(LumatoneEditorFont::GothamNarrowMedium));
+    lblPresetButtonColours->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+
+    addStatusListener(this);
+    addEditorListener(this);
+
+    settingsButton->setEnabled(false);
+
+    lblPresetButtonColours->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelPink));
+
+    lblColourActiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+    lblColourInactiveMacroButton->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::DescriptionText));
+
+    settingsButton->setColour(TextButton::ColourIds::buttonColourId, Colour(0xff383b3d));
+    settingsButton->setColour(TextButton::ColourIds::textColourOffId, Colour(0xffffffff));
+
+    connectionStateChanged(getConnectionState());
+
+    /* We don't want a resize here
+    /*
+    //[/UserPreSize]
+
+    setSize (456, 64);
+
+
+    //[Constructor] You can add your own custom stuff here..
+    */
+
+
+	// Set values according to the properties files
+	// restoreStateFromPropertiesFile(TerpstraSysExApplication::getApp().getPropertiesFile());
+    //[/Constructor]
+}
+
+GlobalSettingsArea::~GlobalSettingsArea()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+	inactiveMacroButtonColourEdit = nullptr;
+	activeMacroButtonColourEdit = nullptr;
+    //[/Destructor_pre]
+
+    lblPresetButtonColours = nullptr;
+    lblColourInactiveMacroButton = nullptr;
+    lblColourActiveMacroButton = nullptr;
+    settingsButton = nullptr;
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+    //[/Destructor]
+}
+
+void GlobalSettingsArea::macroButtonInactiveColourChanged(juce::Colour colour)
+{
+    inactiveMacroButtonColourEdit->setColour(colour.toString(), false);
+}
+
+void GlobalSettingsArea::macroButtonActiveColourChanged(juce::Colour colour)
+{
+    activeMacroButtonColourEdit->setColour(colour.toString(), false);
+}
+
+//==============================================================================
+void GlobalSettingsArea::paint (juce::Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    //[/UserPrePaint]
+
+    g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
+    g.fillAll();
+
+    //[UserPaint] Add your own custom painting code here..
+    //[/UserPaint]
+}
+
+void GlobalSettingsArea::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+
+    // Build right-to-left
+
+    int calbrateBtnHeight = roundToInt(getHeight() * calibrateHeight);
+    int calibrateWidth = getLookAndFeel().getTextButtonWidthToFitText(*settingsButton, calbrateBtnHeight);
+
+    float controlsMargin = roundToInt(getHeight() * 0.1f);
+    float colourEditHeight = proportionOfHeight(controlsHeight);
+    float controlY = proportionOfHeight((1 - controlsHeight) / 2.0f);
+    float colourButtonWidth = colourEditHeight * colourButtonAspect;
+    Font colourLabelsFont = getAppFonts().getFont(LumatoneEditorFont::FranklinGothic, colourEditHeight * 1.1f);
+
+    int startMargin = proportionOfWidth(marginXRatio);
+    settingsButton->setSize(calibrateWidth, calbrateBtnHeight);
+    settingsButton->setTopRightPosition(getWidth() - startMargin, roundToInt((getHeight() - settingsButton->getHeight()) * 0.5f));
+
+    lblColourInactiveMacroButton->setFont(colourLabelsFont);
+    resizeLabelWithHeight(lblColourInactiveMacroButton.get(), colourEditHeight);
+    lblColourInactiveMacroButton->setTopRightPosition(settingsButton->getX() - controlsMargin, controlY);
+
+    inactiveMacroButtonColourEdit->setSize(colourButtonWidth, colourEditHeight);
+    inactiveMacroButtonColourEdit->setTopRightPosition(lblColourInactiveMacroButton->getX() - controlsMargin, controlY);
+
+    lblColourActiveMacroButton->setFont(colourLabelsFont);
+    resizeLabelWithHeight(lblColourActiveMacroButton.get(), colourEditHeight);
+    lblColourActiveMacroButton->setTopRightPosition(inactiveMacroButtonColourEdit->getX() - controlsMargin, controlY);
+
+    activeMacroButtonColourEdit->setSize(colourButtonWidth, colourEditHeight);
+    activeMacroButtonColourEdit->setTopRightPosition(lblColourActiveMacroButton->getX() - controlsMargin, controlY);
+
+    resizeLabelWithHeight(lblPresetButtonColours.get(), colourEditHeight);
+    lblPresetButtonColours->setTopRightPosition(activeMacroButtonColourEdit->getX() - controlsMargin, controlY);
+
+    resizeLabelWithHeight(lblDeveloperMode.get(), getHeight());
+    lblDeveloperMode->setCentrePosition(getLocalBounds().getCentre());
+
+    //[/UserPreResize]
+
+    //[UserResized] Add your own custom resize handling here..
+    //[/UserResized]
+}
+
+void GlobalSettingsArea::buttonClicked (juce::Button* buttonThatWasClicked)
+{
+    //[UserbuttonClicked_Pre]
+    //[/UserbuttonClicked_Pre]
+
+    if (buttonThatWasClicked == settingsButton.get())
+    {
+        //[UserButtonCode_buttonCalibrate] -- add your button handler code here..
+
+		auto settingsComponent = new SettingsContainer(*this);
+        settingsComponent->setLookAndFeel(&getLookAndFeel());
+
+		DialogWindow::LaunchOptions launchOptions;
+		launchOptions.content.setOwned(settingsComponent);
+		launchOptions.content->setSize(480, 240);
+
+		launchOptions.dialogTitle = "Settings";
+		launchOptions.escapeKeyTriggersCloseButton = true;
+		launchOptions.useNativeTitleBar = false;
+		launchOptions.resizable = false;
+
+        launchOptions.dialogBackgroundColour = Colour();
+
+		auto settingsDialog = launchOptions.launchAsync();
+        settingsDialog->setLookAndFeel(static_cast<juce::LookAndFeel_V4*>(&getEditorLookAndFeel().compactWindowStyle));
+        settingsDialog->centreWithSize(548, 240);
+
+        // TerpstraSysExApplication::getApp().setOpenDialogWindow(settingsDialog);
+
+        //[/UserButtonCode_buttonCalibrate]
+    }
+
+    //[UserbuttonClicked_Post]
+    //[/UserbuttonClicked_Post]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+
+void GlobalSettingsArea::changeListenerCallback(ChangeBroadcaster *source)
+{
+	if (source == inactiveMacroButtonColourEdit.get())
+	{
+        setInactiveMacroButtonColour(inactiveMacroButtonColourEdit->getColourAsObject());
+	}
+	else if (source == activeMacroButtonColourEdit.get())
+	{
+        setActiveMacroButtonColour(activeMacroButtonColourEdit->getColourAsObject());
+	}
+}
+
+void GlobalSettingsArea::listenToColourEditButtons(Button::Listener* listenerIn)
+{
+    inactiveMacroButtonColourEdit->addListener(listenerIn);
+    activeMacroButtonColourEdit->addListener(listenerIn);
+}
+
+void GlobalSettingsArea::setDeveloperMode(bool devModeOn)
+{
+    showDeveloperMode = devModeOn;
+    lblDeveloperMode->setVisible(showDeveloperMode);
+    if (devModeOn)
+        settingsButton->setEnabled(true);
+    repaint();
+}
+
+void GlobalSettingsArea::connectionStateChanged(ConnectionState state)
+{
+    settingsButton->setEnabled(state == ConnectionState::ONLINE);
+    inactiveMacroButtonColourEdit->setEnabled(state == ConnectionState::ONLINE);
+    activeMacroButtonColourEdit->setEnabled(state == ConnectionState::ONLINE);
+}
+
+// void GlobalSettingsArea::connectionFaile()
+// {
+//     settingsButton->setEnabled(false);
+// }
+
+//[/MiscUserCode]
+
+
+//==============================================================================
+#if 0
+/*  -- Projucer information section --
+
+    This is where the Projucer stores the metadata that describe this GUI layout, so
+    make changes in here at your peril!
+
+BEGIN_JUCER_METADATA
+
+<JUCER_COMPONENT documentType="Component" className="GlobalSettingsArea" componentName=""
+                 parentClasses="public juce::Component, public ChangeListener, public LumatoneEditor::StatusListener"
+                 constructorParams="" variableInitialisers="" snapPixels="8" snapActive="1"
+                 snapShown="1" overlayOpacity="0.330" fixedSize="0" initialWidth="456"
+                 initialHeight="64">
+  <BACKGROUND backgroundColour="0"/>
+  <LABEL name="lblPresetButtonColours" id="988da53c99fc73f2" memberName="lblPresetButtonColours"
+         virtualName="" explicitFocusOrder="0" pos="0 8 150 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="Preset Button Colours:" editableSingleClick="0"
+         editableDoubleClick="0" focusDiscardsChanges="0" fontname="Default font"
+         fontsize="15.0" kerning="0.0" bold="0" italic="0" justification="33"/>
+  <LABEL name="lblColourInactiveMacroButton" id="9c5cddfcc2966280" memberName="lblColourInactiveMacroButton"
+         virtualName="" explicitFocusOrder="0" pos="152 32 64 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="inactive" editableSingleClick="0" editableDoubleClick="0"
+         focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
+         kerning="0.0" bold="0" italic="0" justification="33"/>
+  <LABEL name="lblColourActiveMacroButton" id="79f93468a20f174" memberName="lblColourActiveMacroButton"
+         virtualName="" explicitFocusOrder="0" pos="152 8 56 24" edTextCol="ff000000"
+         edBkgCol="0" labelText="active" editableSingleClick="0" editableDoubleClick="0"
+         focusDiscardsChanges="0" fontname="Default font" fontsize="15.0"
+         kerning="0.0" bold="0" italic="0" justification="33"/>
+  <TEXTBUTTON name="settingsButton" id="47242594c34a8de9" memberName="settingsButton"
+              virtualName="" explicitFocusOrder="0" pos="336 8 112 24" tooltip="Show controls for calibration, setting controller MIDI channels, and updating firmware"
+              buttonText="Settings" connectedEdges="0" needsCallback="1" radioGroupId="0"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
diff --git a/Source/GlobalSettingsArea.h b/Source/components/GlobalSettingsArea.h
similarity index 92%
rename from Source/GlobalSettingsArea.h
rename to Source/components/GlobalSettingsArea.h
index b2162db9..5993a54c 100644
--- a/Source/GlobalSettingsArea.h
+++ b/Source/components/GlobalSettingsArea.h
@@ -1,116 +1,116 @@
-/*
-  ==============================================================================
-
-  This is an automatically generated GUI class created by the Projucer!
-
-  Be careful when adding custom code to these files, as only the code within
-  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
-  and re-saved.
-
-  Created with Projucer version: 6.0.8
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-
-#include "./LumatoneEditorState.h"
-
-#include "./lumatone_editor_library/listeners/status_listener.h"
-#include "./lumatone_editor_library/listeners/editor_listener.h"
-#include "./colour_view_component.h"
-
-//[/Headers]
-
-
-
-//==============================================================================
-/**
-                                                                    //[Comments]
-    An auto-generated component, created by the Projucer.
-
-    Describe your class and how it works here!
-                                                                    //[/Comments]
-*/
-class GlobalSettingsArea  : public juce::Component,
-                            public LumatoneEditorState,
-                            public ChangeListener,
-                            public LumatoneEditor::StatusListener,
-                            public LumatoneEditor::EditorListener,
-                            public juce::Button::Listener
-{
-public:
-    //==============================================================================
-    GlobalSettingsArea (const LumatoneEditorState& stateIn);
-    ~GlobalSettingsArea() override;
-
-    //==============================================================================
-    //[UserMethods]     -- You can add your own custom methods in this section.
-	void changeListenerCallback(ChangeBroadcaster *source) override;
-
-    void listenToColourEditButtons(Button::Listener* listenerIn);
-
-    void setDeveloperMode(bool devModeOn);
-
-    // LumatoneEditor::StatusListener implementation
-    void connectionStateChanged(ConnectionState newState) override;
-
-    // LumatoneEditor::EditorListener implementation
-    void macroButtonInactiveColourChanged(juce::Colour colour) override;
-    void macroButtonActiveColourChanged(juce::Colour colour) override;
-
-    //[/UserMethods]
-
-    void paint (juce::Graphics& g) override;
-    void resized() override;
-    void buttonClicked (juce::Button* buttonThatWasClicked) override;
-
-
-private:
-    //[UserVariables]   -- You can add your own custom variables in this section.
-	std::unique_ptr<ColourViewComponent> inactiveMacroButtonColourEdit;
-	std::unique_ptr<ColourViewComponent> activeMacroButtonColourEdit;
-
-    std::unique_ptr<Label> lblDeveloperMode;
-
-    bool showDeveloperMode = false;
-
-    //==============================================================================
-    // Style helpers
-    FlexBox flexBox;
-
-    //==============================================================================
-    // Size and position constants
-
-    const float marginXRatio                = 0.02f;
-
-    const float colourButtonAspect          = 1.235294f;
-    const float inactiveButtonAspect        = 4.695652f;
-
-    const float controlsHeight              = 0.333333f;
-
-    const float calibrateX                  = 0.25f;
-    const float calibrateHeight             = 0.55f;
-    //[/UserVariables]
-
-    //==============================================================================
-    std::unique_ptr<juce::Label> lblPresetButtonColours;
-    std::unique_ptr<juce::Label> lblColourInactiveMacroButton;
-    std::unique_ptr<juce::Label> lblColourActiveMacroButton;
-    std::unique_ptr<juce::TextButton> settingsButton;
-
-
-    //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GlobalSettingsArea)
-};
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 6.0.8
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+
+#include "../data/LumatoneEditorState.h"
+
+#include "../lumatone_editor_library/listeners/status_listener.h"
+#include "../lumatone_editor_library/listeners/editor_listener.h"
+#include "../controls/colour_view_component.h"
+
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+    An auto-generated component, created by the Projucer.
+
+    Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class GlobalSettingsArea  : public juce::Component,
+                            public LumatoneEditorState,
+                            public ChangeListener,
+                            public LumatoneEditor::StatusListener,
+                            public LumatoneEditor::EditorListener,
+                            public juce::Button::Listener
+{
+public:
+    //==============================================================================
+    GlobalSettingsArea (const LumatoneEditorState& stateIn);
+    ~GlobalSettingsArea() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+	void changeListenerCallback(ChangeBroadcaster *source) override;
+
+    void listenToColourEditButtons(Button::Listener* listenerIn);
+
+    void setDeveloperMode(bool devModeOn);
+
+    // LumatoneEditor::StatusListener implementation
+    void connectionStateChanged(ConnectionState newState) override;
+
+    // LumatoneEditor::EditorListener implementation
+    void macroButtonInactiveColourChanged(juce::Colour colour) override;
+    void macroButtonActiveColourChanged(juce::Colour colour) override;
+
+    //[/UserMethods]
+
+    void paint (juce::Graphics& g) override;
+    void resized() override;
+    void buttonClicked (juce::Button* buttonThatWasClicked) override;
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+	std::unique_ptr<ColourViewComponent> inactiveMacroButtonColourEdit;
+	std::unique_ptr<ColourViewComponent> activeMacroButtonColourEdit;
+
+    std::unique_ptr<Label> lblDeveloperMode;
+
+    bool showDeveloperMode = false;
+
+    //==============================================================================
+    // Style helpers
+    FlexBox flexBox;
+
+    //==============================================================================
+    // Size and position constants
+
+    const float marginXRatio                = 0.02f;
+
+    const float colourButtonAspect          = 1.235294f;
+    const float inactiveButtonAspect        = 4.695652f;
+
+    const float controlsHeight              = 0.333333f;
+
+    const float calibrateX                  = 0.25f;
+    const float calibrateHeight             = 0.55f;
+    //[/UserVariables]
+
+    //==============================================================================
+    std::unique_ptr<juce::Label> lblPresetButtonColours;
+    std::unique_ptr<juce::Label> lblColourInactiveMacroButton;
+    std::unique_ptr<juce::Label> lblColourActiveMacroButton;
+    std::unique_ptr<juce::TextButton> settingsButton;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (GlobalSettingsArea)
+};
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
diff --git a/Source/MainComponent.cpp b/Source/components/MainComponent.cpp
similarity index 94%
rename from Source/MainComponent.cpp
rename to Source/components/MainComponent.cpp
index b1fcba50..607c4872 100644
--- a/Source/MainComponent.cpp
+++ b/Source/components/MainComponent.cpp
@@ -1,461 +1,459 @@
-/*
-  ==============================================================================
-
-  MainComponent.cpp
-  Created: XXX.2014
-  Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "MainComponent.h"
-
-#include "LumatoneEditorLookAndFeel.h"
-
-#include "LumatoneMenu.h"
-
-#include "MidiEditArea.h"
-
-#include "mapping_editors/KeyboardClickListener.h"
-#include "mapping_editors/KeyEditorPanel.h"
-#include "mapping_editors/MappingSettingsPanel.h"
-#include "GlobalSettingsArea.h"
-
-#include "./ColourPaletteWindow.h"
-
-#include "./lumatone_editor_library/palettes/colour_edit_textbox.h"
-#include "./lumatone_editor_library/ui/keyboard_component.h"
-#include "./lumatone_editor_library/graphics/view_constants.h"
-
-#include "./lumatone_editor_library/actions/edit_actions.h"
-
-
-//==============================================================================
-MainContentComponent::MainContentComponent(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* commandManager)
-	: LumatoneEditorState("MainComponent", stateIn)
-	, LumatoneEditorState::Controller(static_cast<LumatoneEditorState&>(*this))
-	, copiedSubBoardData(std::make_unique<LumatoneBoard>())
-{
-	setName("MainContentComponent");
-
-	// Midi input + output
-	midiEditArea.reset(new MidiEditArea(stateIn));
-	addAndMakeVisible(midiEditArea.get());
-
-	// All keys overview
-	allKeysOverview.reset(new LumatoneKeyboardComponent(*this));
-	allKeysOverview->setUiMode(LumatoneKeyboardComponent::UiMode::Controller);
-	addAndMakeVisible(allKeysOverview.get());
-
-	// Listens to key selection and creates selection edit actions
-	keyboardClickListener = std::make_unique<KeyboardClickListener>(*this, allKeysOverview.get());
-
-	// Edit function area
-	// noteEditArea.reset(new NoteEditArea(stateIn));
-	// noteEditArea->getOctaveBoardSelectorTab()->addChangeListener(this);
-	// noteEditArea->getColourViewComponent()->addListener(this); // Open up ColourPaletteWindow
-
-	keyEditorPanel = std::make_unique<KeyEditorPanel>(stateIn);
-	mappingSettingsComponent = std::make_unique<MappingSettingsPanel>(stateIn);
-
-	// curvesArea.reset(new CurvesArea(stateIn));
-	// addAndMakeVisible(curvesArea.get());
-
-	globalSettingsArea.reset(new GlobalSettingsArea(stateIn));
-	addAndMakeVisible(globalSettingsArea.get());
-	globalSettingsArea->listenToColourEditButtons(this);
-
-	lblSelectedKeys.reset(new Label("lblSelectedKeys", "0 Keys Selected"));
-	lblSelectedKeys->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
-	lblSelectedKeys->setJustificationType(juce::Justification::centredRight);
-	lblSelectedKeys->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::NumKeySelectedText));
-	lblSelectedKeys->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
-	addAndMakeVisible(lblSelectedKeys.get());
-
-	lblEditTitle.reset(new Label("lblEditTitle", "Edit Mapping"));
-	lblEditTitle->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
-	lblEditTitle->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelBlue));
-	lblEditTitle->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
-	addAndMakeVisible(lblEditTitle.get());
-
-	sectionTabs = std::make_unique<juce::TabbedComponent>(juce::TabbedButtonBar::TabsAtTop);
-	sectionTabs->setColour(juce::TabbedComponent::ColourIds::outlineColourId, juce::Colours::transparentBlack);
-	addAndMakeVisible(*sectionTabs);
-	sectionTabs->addTab("Key Editor", juce::Colour(), keyEditorPanel.get(), false);
-	sectionTabs->addTab("AutoGenerator", juce::Colour(), mappingSettingsComponent.get(), false);
-	sectionTabs->addTab("Advanced", juce::Colour(), mappingSettingsComponent.get(), false);
-	sectionTabs->addTab("Mapping Settings", juce::Colour(), mappingSettingsComponent.get(), false);
-
-	sectionTabNames = sectionTabs->getTabNames();
-	sectionTabBar = &sectionTabs->getTabbedButtonBar();
-	sectionTabBar->addChangeListener(this);
-
-	btnLoadFile.reset(new juce::TextButton("btnLoadFile"));
-	addAndMakeVisible(btnLoadFile.get());
-	btnLoadFile->setButtonText(juce::translate("LoadFile"));
-	btnLoadFile->setCommandToTrigger(commandManager, Lumatone::Menu::openSysExMapping, true);
-
-	btnSaveFile.reset(new juce::TextButton("btnSaveFile"));
-	addAndMakeVisible(btnSaveFile.get());
-	btnSaveFile->setButtonText(juce::translate("SaveFile"));
-	btnSaveFile->setCommandToTrigger(commandManager, Lumatone::Menu::saveSysExMappingAs, true);
-
-	btnImportFile.reset(new juce::TextButton("buttonReceive"));
-	addAndMakeVisible(btnImportFile.get());
-	btnImportFile->setTooltip(juce::translate("ImportTooltip"));
-	btnImportFile->setButtonText(juce::translate("Import from Lumatone"));
-	btnImportFile->setCommandToTrigger(commandManager, Lumatone::Menu::importSysExMapping, true);
-
-
-	lblAppName.reset(new Label("lblAppName", getApplicationName()));
-	lblAppName->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
-	lblAppName->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
-	addAndMakeVisible(lblAppName.get());
-
-	lblAppVersion.reset(new Label("lblAppVersion", "v" + getApplicationVersion()));
-	lblAppVersion->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
-	lblAppVersion->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
-	addAndMakeVisible(lblAppVersion.get());
-
-	lblFirmwareVersion = std::make_unique<juce::Label>("lblFirmwareVersion", "");
-	lblFirmwareVersion->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
-	lblFirmwareVersion->setColour(Label::ColourIds::textColourId, juce::Colour(0xff777777));
-	addAndMakeVisible(lblFirmwareVersion.get());
-
-
-	addStatusListener(this);
-	addEditorListener(this);
-
-	// Initial size
-	// setSize(DEFAULTMAINWINDOWWIDTH, DEFAULTMAINWINDOWHEIGHT);
-
-	// Select first board and first key
-	// noteEditArea->getOctaveBoardSelectorTab()->setCurrentTabIndex(0, true);
-	// The above call is supposed to update changeListener - but apparently doesn't... Call it manually then. XXX
-	// changeListenerCallback(noteEditArea->getOctaveBoardSelectorTab());
-    // noteEditArea->changeSingleKeySelection(0);
-
-	btnLoadFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::LoadIcon);
-	btnSaveFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::SaveIcon);
-	btnImportFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::ArrowUp);
-	btnImportFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconPlacement, LumatoneEditorStyleIDs::TextButtonIconPlacement::RightOfText);
-
-	// Only enable when connected
-	btnImportFile->setEnabled(false);
-
-	// DEBUG
-	// sectionTabs->setCurrentTabIndex(3);
-
-    // Initialize mapping structure
-    //deleteAll();
-}
-
-MainContentComponent::~MainContentComponent()
-{
-	keyboardClickListener = nullptr;
-
-	copiedSubBoardData = nullptr;
-
-	lblAppVersion = nullptr;
-	lblAppName = nullptr;
-
-	btnImportFile = nullptr;
-	btnSaveFile = nullptr;
-	btnLoadFile = nullptr;
-
-	sectionTabs = nullptr;
-	lblEditTitle = nullptr;
-	lblSelectedKeys = nullptr;
-
-	globalSettingsArea = nullptr;
-
-	mappingSettingsComponent = nullptr;
-	keyEditorPanel = nullptr;
-
-	allKeysOverview = nullptr;
-	midiEditArea = nullptr;
-}
-
-void MainContentComponent::saveStateToPropertiesFile(PropertiesFile* propertiesFile)
-{
-	// noteEditArea->saveStateToPropertiesFile(propertiesFile);
-	// globalSettingsArea->saveStateToPropertiesFile(propertiesFile);
-}
-
-// TabbedButtonBar *MainContentComponent::getOctaveBoardSelectorTab()
-// {
-// 	return  noteEditArea->getOctaveBoardSelectorTab();
-// }
-
-// LumatoneAction* MainContentComponent::createDeleteCurrentSectionAction()
-// {
-// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-// 	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
-// 	{
-//         auto keySet = LumatoneBoard();
-//         return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, keySet);
-// 	}
-// 	else
-// 		return nullptr;
-// }
-
-// bool MainContentComponent::copyCurrentSubBoardData()
-// {
-// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-// 	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
-// 	{
-// 		*copiedSubBoardData = getBoard(currentSetSelection);
-// 		return true;
-// 	}
-// 	else
-// 		return false;
-// }
-
-// LumatoneAction* MainContentComponent::createPasteCurrentSectionAction()
-// {
-// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-// 	if (currentSetSelection >= 0 && currentSetSelection < getNumBoards()
-// 		&& !copiedSubBoardData->isEmpty())
-// 	{
-// 		return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, *copiedSubBoardData);
-// 	}
-// 	else
-// 		return nullptr;
-// }
-
-// LumatoneAction* MainContentComponent::createModifiedPasteCurrentSectionAction(CommandID commandID)
-// {
-//     auto currentSetSelectionIndex = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
-//     if (currentSetSelectionIndex >= 0 && currentSetSelectionIndex < getNumBoards()
-//         && !copiedSubBoardData->isEmpty())
-//     {
-
-// 		auto modifiedSection = getBoard(currentSetSelectionIndex);
-// 		auto octaveSize = getOctaveBoardSize();
-
-//         for (int i = 0; i < octaveSize; i++)
-//         {
-//             LumatoneKey copiedKey = copiedSubBoardData->getKey(i);
-//             LumatoneKey currentSectionKey = getKey(currentSetSelectionIndex, i);
-
-//             switch (commandID)
-//             {
-//             case Lumatone::Menu::commandIDs::pasteOctaveBoardNotes:
-//                 currentSectionKey.setNoteOrCC(copiedKey.getMidiNumber());
-//                 break;
-
-//             case Lumatone::Menu::commandIDs::pasteOctaveBoardChannels:
-//                 currentSectionKey.setChannelNumber(copiedKey.getMidiChannel());
-//                 break;
-
-//             case Lumatone::Menu::commandIDs::pasteOctaveBoardColours:
-//                 currentSectionKey.setColour(copiedKey.getColour());
-//                 break;
-
-//             case Lumatone::Menu::commandIDs::pasteOctaveBoardTypes:
-//                 currentSectionKey.setKeyType(copiedKey.getType());
-// 				currentSectionKey.setDefaultCCFader(copiedKey.isCCFaderDefault());
-//                 break;
-
-//             default:
-//                 jassertfalse;
-// 				currentSectionKey = copiedKey;
-// 				break;
-//             }
-
-// 			modifiedSection.setKey(currentSectionKey, i);
-//         }
-
-//         return new LumatoneEditAction::SectionEditAction(this, currentSetSelectionIndex, modifiedSection);
-//     }
-//     else
-//         return nullptr;
-// }
-
-bool MainContentComponent::canPasteCopiedSubBoard() const
-{
-    return !copiedSubBoardData->isEmpty();
-}
-
-void MainContentComponent::updateDeveloperMode()
-{
-	// TODO This can just be implemented individually in handleStatePropertyChange
-	// curvesArea->setDeveloperMode(inDeveloperMode);
-    // globalSettingsArea->setDeveloperMode(inDeveloperMode);
-}
-
-void MainContentComponent::connectionStateChanged(ConnectionState state)
-{
-	btnImportFile->setEnabled(state == ConnectionState::ONLINE);
-}
-
-void MainContentComponent::layoutImported(const LumatoneLayout &mappingData)
-{
-	setCurrentFile(juce::File(), false);
-    undoManager->clearUndoHistory();
-	setHasChangesToSave(false);
-}
-
-void MainContentComponent::changeListenerCallback(ChangeBroadcaster *source)
-{
-	// if (source == noteEditArea->getOctaveBoardSelectorTab())
-	// {
-	// 	// allKeysOverview->setCurrentSetSelection(noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex());
-	// }
-
-	// Probably not the cleanest way to do this
-	if (source == sectionTabBar)
-	{
-		resizeEditSectionTabs();
-	}
-}
-
-void MainContentComponent::buttonClicked(Button* btn)
-{
-	ColourViewComponent* colourEdit = dynamic_cast<ColourViewComponent*>(btn);
-
-	if (colourEdit)
-	{
-		// May be better asynchronous on a timer
-		// TerpstraSysExApplication::getApp().loadColourPalettesFromFile();
-
-		auto palettes = getColourPalettes();
-		ColourPaletteWindow* paletteWindow = new ColourPaletteWindow(*this);
-		paletteWindow->setSize(proportionOfWidth(popupWidth), proportionOfHeight(popupHeight));
-
-        // if (btn == noteEditArea->getColourViewComponent())
-        // {
-        //     colourEdit = noteEditArea->getColourViewComponent();
-
-		// 	auto colourTextEditor = noteEditArea->getSingleNoteColourTextEditor();
-        //     paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(colourTextEditor));
-
-        //     // Shouldn't be necessary when Isomorphic is moved from dev to public
-        //     auto isomorphicPanel = noteEditArea->getIsomorphicMassAssignPanel();
-        //     if (isomorphicPanel != nullptr)
-        //         paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(isomorphicPanel));
-
-		// 	paletteWindow->addColourSelectorToGroup(noteEditArea.get());
-		// 	paletteWindow->setCurrentColourSelector(noteEditArea->getSingleNoteColourTextEditor());
-        // }
-
-		Rectangle<int> componentArea = colourEdit->getScreenBounds().translated(-getScreenX(), -getScreenY());
-
-		juce::CallOutBox::launchAsynchronously(
-			std::unique_ptr<juce::Component>(paletteWindow),
-			componentArea,
-			this
-		);
-
-		// else, a preset button colour button was pressed
-		paletteWindow->listenToColourSelection(colourEdit);
-		// TODO: Set swatch # or custom colour as currentSectionKey colour
-	}
-}
-
-void MainContentComponent::paint (Graphics& g)
-{
-	g.fillAll(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
-
-	g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
-	g.fillRect(controlsAreaBackground);
-}
-
-void MainContentComponent::resized()
-{
-    // This is called when the MainContentComponent is resized.
-    // If you add any child components, this is where you should
-    // update their positions.
-	int newWidth = getWidth();
-	// int newHeight = getHeight();
-
-	contentWidth = proportionOfWidth(contentWidthRatio);
-	contentMargin = juce::roundToInt((newWidth - contentWidth) * 0.5);
-
-	// Logo, MIDI edit area and connection state
-	int midiAreaHeight = proportionOfHeight(headerHeight);
-	midiEditArea->setBounds(0, 0, getWidth(), midiAreaHeight);
-
-	// Bounds for controls, where background is darker
-	int footerY = proportionOfHeight(footerAreaY);
-	int footerHeight = getHeight() - footerY;
-
-	controlsAreaBackground = getBounds().withTop(proportionOfHeight(controlsAreaY)).withBottom(footerY);
-	controlsArea = controlsAreaBackground.withSizeKeepingCentre(contentWidth, controlsAreaBackground.getHeight());
-
-	controlsLabelYPos = controlsArea.getY() - proportionOfHeight(controlsLabelHeight);
-
-	allKeysOverview->setBounds(contentMargin, midiAreaHeight, contentWidth, controlsLabelYPos - midiAreaHeight);
-
-	int btnHeight = roundToInt(getHeight() * fileButtonH);
-	int btnMargin = roundToInt(contentWidth * saveLoadMarginW);
-	int saveLoadWidth = roundToInt(getWidth() * saveLoadW);
-	int btnY = allKeysOverview->getY() - (allKeysOverview->getHeight() * btnYFromImageTop);
-
-	int halfWidthX = roundToInt(getWidth() * 0.5f);
-
-	btnLoadFile->setBounds(halfWidthX - btnMargin - saveLoadWidth, btnY, saveLoadWidth, btnHeight);
-	btnSaveFile->setBounds(halfWidthX + btnMargin, btnY, saveLoadWidth, btnHeight);
-
-	int importY = allKeysOverview->getY() - roundToInt(getHeight() * importYFromImageTop);
-	int importWidth = roundToInt(getWidth() * importW);
-	btnImportFile->setBounds(allKeysOverview->getRight() - importWidth, importY, importWidth, btnHeight);
-
-	lblEditTitle->setTopLeftPosition(contentMargin, controlsLabelYPos);
-	resizeLabelWithHeight(lblEditTitle.get(), (controlsArea.getY() - controlsLabelYPos) * 0.8f);
-
-	resizeLabelWithHeight(lblSelectedKeys.get(), lblEditTitle->getHeight(), 0.667f, "____");
-	lblSelectedKeys->setTopRightPosition(controlsArea.getRight(), lblEditTitle->getY());
-
-	sectionTabs->setBounds(contentMargin, controlsLabelYPos, contentWidth, footerY - controlsLabelYPos);
-	resizeEditSectionTabs();
-
-	globalSettingsArea->setBounds(getLocalBounds().withTop(roundToInt(getHeight() * footerAreaY)));
-
-	resizeLabelWithHeight(lblAppName.get(), roundToInt(footerHeight * lumatoneVersionHeight), 1.0f, " ");
-	lblAppName->setTopLeftPosition(
-		proportionOfWidth(lumatoneVersionMarginX),
-		footerY + juce::roundToInt((footerHeight - lblAppName->getHeight()) * 0.5f));
-
-	resizeLabelWithHeight(lblAppVersion.get(), roundToInt(lblAppName->getHeight() * 0.75f));
-	lblAppVersion->setTopLeftPosition(lblAppName->getRight(), lblAppName->getBottom() - lblAppVersion->getHeight());
-
-	juce::Rectangle<int> lumatoneBounds = allKeysOverview->getLocalGraphicBounds().translated(allKeysOverview->getX(), allKeysOverview->getY());
-    lblFirmwareVersion->setBounds(lumatoneBounds.getX(), lumatoneBounds.getBottom(), contentWidth, btnHeight * 0.7f);
-}
-
-void MainContentComponent::resizeEditSectionTabs()
-{
-	int sectionTabsMargin = proportionOfWidth(sectionTabsMarginW);
-	int sectionTabsWidth = 0;
-
-	auto font = getEditorLookAndFeel().getTabBarFont((float)sectionTabBar->getHeight() * 0.7f);
-	for (int i = 0; i < sectionTabNames.size(); i++)
-	{
-		sectionTabsWidth += font.getStringWidth(sectionTabNames[i]) + sectionTabsMargin;
-	}
-
-	int leftMargin = lblEditTitle->getWidth() + roundToInt(sectionTabsMargin * 0.5f);
-	sectionTabBar->setBounds(sectionTabBar->getBounds().withTrimmedLeft(leftMargin).withWidth(sectionTabsWidth));
-}
-
-void MainContentComponent::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property)
-{
-	LumatoneEditorState::handleStatePropertyChange(stateIn, property);
-
-	if (property == LumatoneEditorProperty::DeveloperModeOn)
-	{
-		updateDeveloperMode();
-	}
-	else if (property == LumatoneApplicationProperty::NumKeySelected)
-	{
-		lblSelectedKeys->setText(stateIn[property].toString() + " Keys Selected", juce::NotificationType::dontSendNotification);
-	}
-	else if (property == LumatoneStateProperty::LastConnectedFirmwareVersion)
-	{
-		auto string = juce::String("Firmware version: " + getFirmwareVersion().toDisplayString());
-		lblFirmwareVersion->setText(string, juce::NotificationType::sendNotification);
-
-		requestDeviceGlobalSettings();
-	}
-}
+/*
+  ==============================================================================
+
+  MainComponent.cpp
+  Created: XXX.2014
+  Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "MainComponent.h"
+
+#include "../style/LumatoneEditorLookAndFeel.h"
+
+#include "../LumatoneMenu.h"
+
+#include "./MidiEditArea.h"
+#include "./GlobalSettingsArea.h"
+#include "./ColourPaletteWindow.h"
+
+#include "../actions/KeyboardClickListener.h"
+#include "./mapping/KeyEditorPanel.h"
+#include "./mapping/MappingSettingsPanel.h"
+
+#include "../lumatone_editor_library/palettes/colour_edit_textbox.h"
+#include "../lumatone_editor_library/ui/keyboard_component.h"
+#include "../lumatone_editor_library/graphics/view_constants.h"
+#include "../lumatone_editor_library/actions/edit_actions.h"
+
+
+//==============================================================================
+MainContentComponent::MainContentComponent(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* commandManager)
+	: LumatoneEditorState("MainComponent", stateIn)
+	, LumatoneEditorState::Controller(static_cast<LumatoneEditorState&>(*this))
+	, copiedSubBoardData(std::make_unique<LumatoneBoard>())
+{
+	setName("MainContentComponent");
+
+	// Midi input + output
+	midiEditArea.reset(new MidiEditArea(stateIn));
+	addAndMakeVisible(midiEditArea.get());
+
+	// All keys overview
+	allKeysOverview.reset(new LumatoneKeyboardComponent(*this));
+	allKeysOverview->setUiMode(LumatoneKeyboardComponent::UiMode::Controller);
+	addAndMakeVisible(allKeysOverview.get());
+
+	// Listens to key selection and creates selection edit actions
+	keyboardClickListener = std::make_unique<KeyboardClickListener>(*this, allKeysOverview.get());
+
+	// Edit function area
+	// noteEditArea.reset(new NoteEditArea(stateIn));
+	// noteEditArea->getOctaveBoardSelectorTab()->addChangeListener(this);
+	// noteEditArea->getColourViewComponent()->addListener(this); // Open up ColourPaletteWindow
+
+	keyEditorPanel = std::make_unique<KeyEditorPanel>(stateIn);
+	mappingSettingsComponent = std::make_unique<MappingSettingsPanel>(stateIn);
+
+	// curvesArea.reset(new CurvesArea(stateIn));
+	// addAndMakeVisible(curvesArea.get());
+
+	globalSettingsArea.reset(new GlobalSettingsArea(stateIn));
+	addAndMakeVisible(globalSettingsArea.get());
+	globalSettingsArea->listenToColourEditButtons(this);
+
+	lblSelectedKeys.reset(new Label("lblSelectedKeys", "0 Keys Selected"));
+	lblSelectedKeys->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	lblSelectedKeys->setJustificationType(juce::Justification::centredRight);
+	lblSelectedKeys->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::NumKeySelectedText));
+	lblSelectedKeys->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
+	addAndMakeVisible(lblSelectedKeys.get());
+
+	lblEditTitle.reset(new Label("lblEditTitle", "Edit Mapping"));
+	lblEditTitle->setFont(getAppFonts().getFont(LumatoneEditorFont::UniviaProBold));
+	lblEditTitle->setColour(Label::ColourIds::textColourId, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LabelBlue));
+	lblEditTitle->setColour (juce::TextEditor::backgroundColourId, juce::Colour (0x00000000));
+	addAndMakeVisible(lblEditTitle.get());
+
+	sectionTabs = std::make_unique<juce::TabbedComponent>(juce::TabbedButtonBar::TabsAtTop);
+	sectionTabs->setColour(juce::TabbedComponent::ColourIds::outlineColourId, juce::Colours::transparentBlack);
+	addAndMakeVisible(*sectionTabs);
+	sectionTabs->addTab("Key Editor", juce::Colour(), keyEditorPanel.get(), false);
+	sectionTabs->addTab("AutoGenerator", juce::Colour(), mappingSettingsComponent.get(), false);
+	sectionTabs->addTab("Advanced", juce::Colour(), mappingSettingsComponent.get(), false);
+	sectionTabs->addTab("Mapping Settings", juce::Colour(), mappingSettingsComponent.get(), false);
+
+	sectionTabNames = sectionTabs->getTabNames();
+	sectionTabBar = &sectionTabs->getTabbedButtonBar();
+	sectionTabBar->addChangeListener(this);
+
+	btnLoadFile.reset(new juce::TextButton("btnLoadFile"));
+	addAndMakeVisible(btnLoadFile.get());
+	btnLoadFile->setButtonText(juce::translate("LoadFile"));
+	btnLoadFile->setCommandToTrigger(commandManager, Lumatone::Menu::openSysExMapping, true);
+
+	btnSaveFile.reset(new juce::TextButton("btnSaveFile"));
+	addAndMakeVisible(btnSaveFile.get());
+	btnSaveFile->setButtonText(juce::translate("SaveFile"));
+	btnSaveFile->setCommandToTrigger(commandManager, Lumatone::Menu::saveSysExMappingAs, true);
+
+	btnImportFile.reset(new juce::TextButton("buttonReceive"));
+	addAndMakeVisible(btnImportFile.get());
+	btnImportFile->setTooltip(juce::translate("ImportTooltip"));
+	btnImportFile->setButtonText(juce::translate("Import from Lumatone"));
+	btnImportFile->setCommandToTrigger(commandManager, Lumatone::Menu::importSysExMapping, true);
+
+
+	lblAppName.reset(new Label("lblAppName", getApplicationName()));
+	lblAppName->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
+	lblAppName->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
+	addAndMakeVisible(lblAppName.get());
+
+	lblAppVersion.reset(new Label("lblAppVersion", "v" + getApplicationVersion()));
+	lblAppVersion->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
+	lblAppVersion->setColour(Label::ColourIds::textColourId, Colour(0xff777777));
+	addAndMakeVisible(lblAppVersion.get());
+
+	lblFirmwareVersion = std::make_unique<juce::Label>("lblFirmwareVersion", "");
+	lblFirmwareVersion->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
+	lblFirmwareVersion->setColour(Label::ColourIds::textColourId, juce::Colour(0xff777777));
+	addAndMakeVisible(lblFirmwareVersion.get());
+
+
+	addStatusListener(this);
+	addEditorListener(this);
+
+	// Initial size
+	// setSize(DEFAULTMAINWINDOWWIDTH, DEFAULTMAINWINDOWHEIGHT);
+
+	// Select first board and first key
+	// noteEditArea->getOctaveBoardSelectorTab()->setCurrentTabIndex(0, true);
+	// The above call is supposed to update changeListener - but apparently doesn't... Call it manually then. XXX
+	// changeListenerCallback(noteEditArea->getOctaveBoardSelectorTab());
+    // noteEditArea->changeSingleKeySelection(0);
+
+	btnLoadFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::LoadIcon);
+	btnSaveFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::SaveIcon);
+	btnImportFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconHashCode, LumatoneEditorIcon::ArrowUp);
+	btnImportFile->getProperties().set(LumatoneEditorStyleIDs::textButtonIconPlacement, LumatoneEditorStyleIDs::TextButtonIconPlacement::RightOfText);
+
+	// Only enable when connected
+	btnImportFile->setEnabled(false);
+
+	// DEBUG
+	// sectionTabs->setCurrentTabIndex(3);
+
+    // Initialize mapping structure
+    //deleteAll();
+}
+
+MainContentComponent::~MainContentComponent()
+{
+	keyboardClickListener = nullptr;
+
+	copiedSubBoardData = nullptr;
+
+	lblAppVersion = nullptr;
+	lblAppName = nullptr;
+
+	btnImportFile = nullptr;
+	btnSaveFile = nullptr;
+	btnLoadFile = nullptr;
+
+	sectionTabs = nullptr;
+	lblEditTitle = nullptr;
+	lblSelectedKeys = nullptr;
+
+	globalSettingsArea = nullptr;
+
+	mappingSettingsComponent = nullptr;
+	keyEditorPanel = nullptr;
+
+	allKeysOverview = nullptr;
+	midiEditArea = nullptr;
+}
+
+void MainContentComponent::saveStateToPropertiesFile(PropertiesFile* propertiesFile)
+{
+	// noteEditArea->saveStateToPropertiesFile(propertiesFile);
+	// globalSettingsArea->saveStateToPropertiesFile(propertiesFile);
+}
+
+// TabbedButtonBar *MainContentComponent::getOctaveBoardSelectorTab()
+// {
+// 	return  noteEditArea->getOctaveBoardSelectorTab();
+// }
+
+// LumatoneAction* MainContentComponent::createDeleteCurrentSectionAction()
+// {
+// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
+// 	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
+// 	{
+//         auto keySet = LumatoneBoard();
+//         return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, keySet);
+// 	}
+// 	else
+// 		return nullptr;
+// }
+
+// bool MainContentComponent::copyCurrentSubBoardData()
+// {
+// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
+// 	if (currentSetSelection >= 0 && currentSetSelection < getOctaveBoardSize())
+// 	{
+// 		*copiedSubBoardData = getBoard(currentSetSelection);
+// 		return true;
+// 	}
+// 	else
+// 		return false;
+// }
+
+// LumatoneAction* MainContentComponent::createPasteCurrentSectionAction()
+// {
+// 	auto currentSetSelection = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
+// 	if (currentSetSelection >= 0 && currentSetSelection < getNumBoards()
+// 		&& !copiedSubBoardData->isEmpty())
+// 	{
+// 		return new LumatoneEditAction::SectionEditAction(this, currentSetSelection, *copiedSubBoardData);
+// 	}
+// 	else
+// 		return nullptr;
+// }
+
+// LumatoneAction* MainContentComponent::createModifiedPasteCurrentSectionAction(CommandID commandID)
+// {
+//     auto currentSetSelectionIndex = noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex();
+//     if (currentSetSelectionIndex >= 0 && currentSetSelectionIndex < getNumBoards()
+//         && !copiedSubBoardData->isEmpty())
+//     {
+
+// 		auto modifiedSection = getBoard(currentSetSelectionIndex);
+// 		auto octaveSize = getOctaveBoardSize();
+
+//         for (int i = 0; i < octaveSize; i++)
+//         {
+//             LumatoneKey copiedKey = copiedSubBoardData->getKey(i);
+//             LumatoneKey currentSectionKey = getKey(currentSetSelectionIndex, i);
+
+//             switch (commandID)
+//             {
+//             case Lumatone::Menu::commandIDs::pasteOctaveBoardNotes:
+//                 currentSectionKey.setNoteOrCC(copiedKey.getMidiNumber());
+//                 break;
+
+//             case Lumatone::Menu::commandIDs::pasteOctaveBoardChannels:
+//                 currentSectionKey.setChannelNumber(copiedKey.getMidiChannel());
+//                 break;
+
+//             case Lumatone::Menu::commandIDs::pasteOctaveBoardColours:
+//                 currentSectionKey.setColour(copiedKey.getColour());
+//                 break;
+
+//             case Lumatone::Menu::commandIDs::pasteOctaveBoardTypes:
+//                 currentSectionKey.setKeyType(copiedKey.getType());
+// 				currentSectionKey.setDefaultCCFader(copiedKey.isCCFaderDefault());
+//                 break;
+
+//             default:
+//                 jassertfalse;
+// 				currentSectionKey = copiedKey;
+// 				break;
+//             }
+
+// 			modifiedSection.setKey(currentSectionKey, i);
+//         }
+
+//         return new LumatoneEditAction::SectionEditAction(this, currentSetSelectionIndex, modifiedSection);
+//     }
+//     else
+//         return nullptr;
+// }
+
+bool MainContentComponent::canPasteCopiedSubBoard() const
+{
+    return !copiedSubBoardData->isEmpty();
+}
+
+void MainContentComponent::updateDeveloperMode()
+{
+	// TODO This can just be implemented individually in handleStatePropertyChange
+	// curvesArea->setDeveloperMode(inDeveloperMode);
+    // globalSettingsArea->setDeveloperMode(inDeveloperMode);
+}
+
+void MainContentComponent::connectionStateChanged(ConnectionState state)
+{
+	btnImportFile->setEnabled(state == ConnectionState::ONLINE);
+}
+
+void MainContentComponent::layoutImported(const LumatoneLayout &mappingData)
+{
+	setCurrentFile(juce::File(), false);
+    undoManager->clearUndoHistory();
+	setHasChangesToSave(false);
+}
+
+void MainContentComponent::changeListenerCallback(ChangeBroadcaster *source)
+{
+	// if (source == noteEditArea->getOctaveBoardSelectorTab())
+	// {
+	// 	// allKeysOverview->setCurrentSetSelection(noteEditArea->getOctaveBoardSelectorTab()->getCurrentTabIndex());
+	// }
+
+	// Probably not the cleanest way to do this
+	if (source == sectionTabBar)
+	{
+		resizeEditSectionTabs();
+	}
+}
+
+void MainContentComponent::buttonClicked(Button* btn)
+{
+	ColourViewComponent* colourEdit = dynamic_cast<ColourViewComponent*>(btn);
+
+	if (colourEdit)
+	{
+		// May be better asynchronous on a timer
+		// TerpstraSysExApplication::getApp().loadColourPalettesFromFile();
+
+		auto palettes = getColourPalettes();
+		ColourPaletteWindow* paletteWindow = new ColourPaletteWindow(*this);
+		paletteWindow->setSize(proportionOfWidth(popupWidth), proportionOfHeight(popupHeight));
+
+        // if (btn == noteEditArea->getColourViewComponent())
+        // {
+        //     colourEdit = noteEditArea->getColourViewComponent();
+
+		// 	auto colourTextEditor = noteEditArea->getSingleNoteColourTextEditor();
+        //     paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(colourTextEditor));
+
+        //     // Shouldn't be necessary when Isomorphic is moved from dev to public
+        //     auto isomorphicPanel = noteEditArea->getIsomorphicMassAssignPanel();
+        //     if (isomorphicPanel != nullptr)
+        //         paletteWindow->listenToColourSelection(static_cast<ColourSelectionListener*>(isomorphicPanel));
+
+		// 	paletteWindow->addColourSelectorToGroup(noteEditArea.get());
+		// 	paletteWindow->setCurrentColourSelector(noteEditArea->getSingleNoteColourTextEditor());
+        // }
+
+		Rectangle<int> componentArea = colourEdit->getScreenBounds().translated(-getScreenX(), -getScreenY());
+
+		juce::CallOutBox::launchAsynchronously(
+			std::unique_ptr<juce::Component>(paletteWindow),
+			componentArea,
+			this
+		);
+
+		// else, a preset button colour button was pressed
+		paletteWindow->listenToColourSelection(colourEdit);
+		// TODO: Set swatch # or custom colour as currentSectionKey colour
+	}
+}
+
+void MainContentComponent::paint (Graphics& g)
+{
+	g.fillAll(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::MediumBackground));
+
+	g.setColour(getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::LightBackground));
+	g.fillRect(controlsAreaBackground);
+}
+
+void MainContentComponent::resized()
+{
+    // This is called when the MainContentComponent is resized.
+    // If you add any child components, this is where you should
+    // update their positions.
+	int newWidth = getWidth();
+	// int newHeight = getHeight();
+
+	contentWidth = proportionOfWidth(contentWidthRatio);
+	contentMargin = juce::roundToInt((newWidth - contentWidth) * 0.5);
+
+	// Logo, MIDI edit area and connection state
+	int midiAreaHeight = proportionOfHeight(headerHeight);
+	midiEditArea->setBounds(0, 0, getWidth(), midiAreaHeight);
+
+	// Bounds for controls, where background is darker
+	int footerY = proportionOfHeight(footerAreaY);
+	int footerHeight = getHeight() - footerY;
+
+	controlsAreaBackground = getBounds().withTop(proportionOfHeight(controlsAreaY)).withBottom(footerY);
+	controlsArea = controlsAreaBackground.withSizeKeepingCentre(contentWidth, controlsAreaBackground.getHeight());
+
+	controlsLabelYPos = controlsArea.getY() - proportionOfHeight(controlsLabelHeight);
+
+	allKeysOverview->setBounds(contentMargin, midiAreaHeight, contentWidth, controlsLabelYPos - midiAreaHeight);
+
+	int btnHeight = roundToInt(getHeight() * fileButtonH);
+	int btnMargin = roundToInt(contentWidth * saveLoadMarginW);
+	int saveLoadWidth = roundToInt(getWidth() * saveLoadW);
+	int btnY = allKeysOverview->getY() - (allKeysOverview->getHeight() * btnYFromImageTop);
+
+	int halfWidthX = roundToInt(getWidth() * 0.5f);
+
+	btnLoadFile->setBounds(halfWidthX - btnMargin - saveLoadWidth, btnY, saveLoadWidth, btnHeight);
+	btnSaveFile->setBounds(halfWidthX + btnMargin, btnY, saveLoadWidth, btnHeight);
+
+	int importY = allKeysOverview->getY() - roundToInt(getHeight() * importYFromImageTop);
+	int importWidth = roundToInt(getWidth() * importW);
+	btnImportFile->setBounds(allKeysOverview->getRight() - importWidth, importY, importWidth, btnHeight);
+
+	lblEditTitle->setTopLeftPosition(contentMargin, controlsLabelYPos);
+	resizeLabelWithHeight(lblEditTitle.get(), (controlsArea.getY() - controlsLabelYPos) * 0.8f);
+
+	resizeLabelWithHeight(lblSelectedKeys.get(), lblEditTitle->getHeight(), 0.667f, "____");
+	lblSelectedKeys->setTopRightPosition(controlsArea.getRight(), lblEditTitle->getY());
+
+	sectionTabs->setBounds(contentMargin, controlsLabelYPos, contentWidth, footerY - controlsLabelYPos);
+	resizeEditSectionTabs();
+
+	globalSettingsArea->setBounds(getLocalBounds().withTop(roundToInt(getHeight() * footerAreaY)));
+
+	resizeLabelWithHeight(lblAppName.get(), roundToInt(footerHeight * lumatoneVersionHeight), 1.0f, " ");
+	lblAppName->setTopLeftPosition(
+		proportionOfWidth(lumatoneVersionMarginX),
+		footerY + juce::roundToInt((footerHeight - lblAppName->getHeight()) * 0.5f));
+
+	resizeLabelWithHeight(lblAppVersion.get(), roundToInt(lblAppName->getHeight() * 0.75f));
+	lblAppVersion->setTopLeftPosition(lblAppName->getRight(), lblAppName->getBottom() - lblAppVersion->getHeight());
+
+	juce::Rectangle<int> lumatoneBounds = allKeysOverview->getLocalGraphicBounds().translated(allKeysOverview->getX(), allKeysOverview->getY());
+    lblFirmwareVersion->setBounds(lumatoneBounds.getX(), lumatoneBounds.getBottom(), contentWidth, btnHeight * 0.7f);
+}
+
+void MainContentComponent::resizeEditSectionTabs()
+{
+	int sectionTabsMargin = proportionOfWidth(sectionTabsMarginW);
+	int sectionTabsWidth = 0;
+
+	auto font = getEditorLookAndFeel().getTabBarFont((float)sectionTabBar->getHeight() * 0.7f);
+	for (int i = 0; i < sectionTabNames.size(); i++)
+	{
+		sectionTabsWidth += font.getStringWidth(sectionTabNames[i]) + sectionTabsMargin;
+	}
+
+	int leftMargin = lblEditTitle->getWidth() + roundToInt(sectionTabsMargin * 0.5f);
+	sectionTabBar->setBounds(sectionTabBar->getBounds().withTrimmedLeft(leftMargin).withWidth(sectionTabsWidth));
+}
+
+void MainContentComponent::handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property)
+{
+	LumatoneEditorState::handleStatePropertyChange(stateIn, property);
+
+	if (property == LumatoneEditorProperty::DeveloperModeOn)
+	{
+		updateDeveloperMode();
+	}
+	else if (property == LumatoneApplicationProperty::NumKeySelected)
+	{
+		lblSelectedKeys->setText(stateIn[property].toString() + " Keys Selected", juce::NotificationType::dontSendNotification);
+	}
+	else if (property == LumatoneStateProperty::LastConnectedFirmwareVersion)
+	{
+		auto string = juce::String("Firmware version: " + getFirmwareVersion().toDisplayString());
+		lblFirmwareVersion->setText(string, juce::NotificationType::sendNotification);
+
+		requestDeviceGlobalSettings();
+	}
+}
diff --git a/Source/MainComponent.h b/Source/components/MainComponent.h
similarity index 92%
rename from Source/MainComponent.h
rename to Source/components/MainComponent.h
index 1c790c8d..1d23eb91 100644
--- a/Source/MainComponent.h
+++ b/Source/components/MainComponent.h
@@ -1,192 +1,192 @@
-/*
-  ==============================================================================
-
-    This file was auto-generated!
-	Created: XXX.2014
-	Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include "LumatoneEditorState.h"
-
-#include "./lumatone_editor_library/data/lumatone_layout.h"
-#include "./lumatone_editor_library/listeners/status_listener.h"
-#include "./lumatone_editor_library/listeners/editor_listener.h"
-#include "./lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
-
-class LumatoneKeyboardComponent;
-
-class KeyboardClickListener;
-class MidiEditArea;
-class KeyEditorPanel;
-class MappingSettingsPanel;
-class GlobalSettingsArea;
-
-
-//==============================================================================
-/*
-    This component lives inside our window, and this is where you should put all
-    your controls and content.
-*/
-class MainContentComponent : public juce::Component
-						   , public LumatoneEditorState
-						   , public LumatoneEditorState::Controller
-						   , public LumatoneEditor::StatusListener
-						   , public LumatoneEditor::EditorListener
-						   , public juce::ChangeListener
-						   , public juce::Button::Listener
-{
-public:
-	//==============================================================================
-	MainContentComponent(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* commandManager);
-	~MainContentComponent();
-
-	void saveStateToPropertiesFile(PropertiesFile* propertiesFile);
-
-	juce::TabbedButtonBar* getOctaveBoardSelectorTab();
-	// CurvesArea* getCurvesArea() { return curvesArea.get(); }
-
-	// Board edit operations
-	LumatoneAction* createDeleteCurrentSectionAction(){return nullptr;};
-	bool copyCurrentSubBoardData(){return false;};
-	LumatoneAction* createPasteCurrentSectionAction(){return nullptr;};
-    LumatoneAction* createModifiedPasteCurrentSectionAction(CommandID commandID){return nullptr;};
-    bool canPasteCopiedSubBoard() const;
-
-	// Implementation of ChangeListener
-	void changeListenerCallback(juce::ChangeBroadcaster *source) override;
-
-	// Implementation of Button::Listener
-	void buttonClicked(juce::Button* btn) override;
-
-	// GUI implementation
-    void paint (juce::Graphics&) override;
-    void resized() override;
-
-	void resizeEditSectionTabs();
-
-	//void refreshKeyDataFields();
-	//void refreshAllFields();
-
-	// Implementation of LumatoneEditor::StatusListener
-	void connectionStateChanged(ConnectionState state) override;
-
-	// Implementation of LumatoneEditor::EditorListener
-	void layoutImported(const LumatoneLayout& mappingData) override;
-
-	//==============================================================================
-	// Implementation of LumatoneEditorState
-
-	void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
-
-private:
-
-	void updateDeveloperMode();
-
-private:
-    //==============================================================================
-	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainContentComponent)
-
-	//==============================================================================
-	// GUI components
-
-	// Midi devices and connection state
-	std::unique_ptr<MidiEditArea>			midiEditArea;
-
-	// Sets of 55/56 keys
-	std::unique_ptr<LumatoneKeyboardComponent> 	allKeysOverview;
-
-	// Edit fields for setting key and button parameters, and edits for single keys
-	// std::unique_ptr<NoteEditArea>				noteEditArea;
-	std::unique_ptr<KeyEditorPanel>			keyEditorPanel;
-	std::unique_ptr<MappingSettingsPanel>	mappingSettingsComponent;
-
-	// std::unique_ptr<CurvesArea> 			curvesArea;
-	std::unique_ptr<GlobalSettingsArea>		globalSettingsArea;
-
-	std::unique_ptr<juce::Label>			lblSelectedKeys;
-
-	std::unique_ptr<juce::Label> 			lblEditTitle;
-    std::unique_ptr<juce::TabbedComponent> 	sectionTabs;
-
-	std::unique_ptr<juce::TextButton>		btnLoadFile;
-	std::unique_ptr<juce::TextButton>		btnSaveFile;
-	std::unique_ptr<juce::TextButton>		btnImportFile;
-
-	// Version signature in bottom left of window
-	std::unique_ptr<juce::Label> 			lblAppName;
-	std::unique_ptr<juce::Label> 			lblAppVersion;
-
-    std::unique_ptr<juce::Label>			lblFirmwareVersion;
-
-	// Buffer for copy/paste of sub board data
-	std::unique_ptr<LumatoneBoard>			copiedSubBoardData;
-
-	//==============================================================================
-
-	std::unique_ptr<KeyboardClickListener>	keyboardClickListener;
-
-	//==============================================================================
-	// Position and Size helpers
-
-	int contentMargin;
-	int contentWidth;
-
-	int controlsLabelYPos;
-    juce::Rectangle<int> controlsArea;
-    juce::Rectangle<int> controlsAreaBackground;
-
-	juce::TabbedButtonBar* sectionTabBar;
-	const float sectionTabsMarginW			= 0.013f;
-	juce::StringArray sectionTabNames;
-
-	const float contentWidthRatio 			= 0.871f;
-
-    const float headerHeight                = 0.0837f;
-
-	const float controlSectionTabsY			= 0.63f;
-	const float controlsLabelHeight 		= 0.033f;
-
-    const float controlsAreaY               = 0.662f;
-    const float controlsAreaHeight          = 0.43f;
-
-    const float assignMarginX               = 0.043f;
-    const float assignWidth                 = 0.5385f;
-    const float assignHeight                = 0.44f;
-
-    const float footerAreaY                 = 0.96f;
-
-	const float lumatoneGraphicMarginTop	= 0.1f;
-	const float lumatoneGraphicH			= 0.8f;
-
-	const float fileButtonH					= 0.025f;
-	const float importYFromImageTop			= 0.4f;
-	const float importW						= 0.1f;
-
-	const float btnYFromImageTop			= 0.02;
-	const float saveLoadW					= 0.08f;
-	const float saveLoadMarginW				= 0.0034f;
-
-
-    const float popupWidth                  = 0.4f;
-    const float popupHeight                 = 0.333f;
-
-    const float lumatoneVersionMarginX      = 0.02f;
-	const float lumatoneVersionWidth        = 0.2f;
-	const float lumatoneVersionHeight       = 0.5f;
-
-    const float presetButtonColoursX        = 0.7237f;
-    const float presetButtonColoursHeight   = 0.2258f;
-
-    const float settingsColumnX             = 0.597826f;
-    const float settingsAreaY               = 0.546875f;
-    const float settingsAreaHeight          = 0.148148f;
-
-    const juce::Rectangle<float> generalSettingsBounds = { settingsColumnX, settingsAreaY, 0.17f, settingsAreaHeight };
-    const juce::Rectangle<float>   pedalSettingsBounds = { 0.777778f,       settingsAreaY, 0.18f, settingsAreaHeight };
-    const juce::Rectangle<float>      curvesAreaBounds = { settingsColumnX, 0.7174f,       0.3626f, 0.21f };
-
-};
+/*
+  ==============================================================================
+
+    This file was auto-generated!
+	Created: XXX.2014
+	Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "../data/LumatoneEditorState.h"
+
+#include "../lumatone_editor_library/data/lumatone_layout.h"
+#include "../lumatone_editor_library/listeners/status_listener.h"
+#include "../lumatone_editor_library/listeners/editor_listener.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
+
+class LumatoneKeyboardComponent;
+
+class KeyboardClickListener;
+class MidiEditArea;
+class KeyEditorPanel;
+class MappingSettingsPanel;
+class GlobalSettingsArea;
+
+
+//==============================================================================
+/*
+    This component lives inside our window, and this is where you should put all
+    your controls and content.
+*/
+class MainContentComponent : public juce::Component
+						   , public LumatoneEditorState
+						   , public LumatoneEditorState::Controller
+						   , public LumatoneEditor::StatusListener
+						   , public LumatoneEditor::EditorListener
+						   , public juce::ChangeListener
+						   , public juce::Button::Listener
+{
+public:
+	//==============================================================================
+	MainContentComponent(const LumatoneEditorState& stateIn, juce::ApplicationCommandManager* commandManager);
+	~MainContentComponent();
+
+	void saveStateToPropertiesFile(PropertiesFile* propertiesFile);
+
+	juce::TabbedButtonBar* getOctaveBoardSelectorTab();
+	// CurvesArea* getCurvesArea() { return curvesArea.get(); }
+
+	// Board edit operations
+	LumatoneAction* createDeleteCurrentSectionAction(){return nullptr;};
+	bool copyCurrentSubBoardData(){return false;};
+	LumatoneAction* createPasteCurrentSectionAction(){return nullptr;};
+    LumatoneAction* createModifiedPasteCurrentSectionAction(CommandID commandID){return nullptr;};
+    bool canPasteCopiedSubBoard() const;
+
+	// Implementation of ChangeListener
+	void changeListenerCallback(juce::ChangeBroadcaster *source) override;
+
+	// Implementation of Button::Listener
+	void buttonClicked(juce::Button* btn) override;
+
+	// GUI implementation
+    void paint (juce::Graphics&) override;
+    void resized() override;
+
+	void resizeEditSectionTabs();
+
+	//void refreshKeyDataFields();
+	//void refreshAllFields();
+
+	// Implementation of LumatoneEditor::StatusListener
+	void connectionStateChanged(ConnectionState state) override;
+
+	// Implementation of LumatoneEditor::EditorListener
+	void layoutImported(const LumatoneLayout& mappingData) override;
+
+	//==============================================================================
+	// Implementation of LumatoneEditorState
+
+	void handleStatePropertyChange(juce::ValueTree stateIn, const juce::Identifier& property) override;
+
+private:
+
+	void updateDeveloperMode();
+
+private:
+    //==============================================================================
+	JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR(MainContentComponent)
+
+	//==============================================================================
+	// GUI components
+
+	// Midi devices and connection state
+	std::unique_ptr<MidiEditArea>			midiEditArea;
+
+	// Sets of 55/56 keys
+	std::unique_ptr<LumatoneKeyboardComponent> 	allKeysOverview;
+
+	// Edit fields for setting key and button parameters, and edits for single keys
+	// std::unique_ptr<NoteEditArea>				noteEditArea;
+	std::unique_ptr<KeyEditorPanel>			keyEditorPanel;
+	std::unique_ptr<MappingSettingsPanel>	mappingSettingsComponent;
+
+	// std::unique_ptr<CurvesArea> 			curvesArea;
+	std::unique_ptr<GlobalSettingsArea>		globalSettingsArea;
+
+	std::unique_ptr<juce::Label>			lblSelectedKeys;
+
+	std::unique_ptr<juce::Label> 			lblEditTitle;
+    std::unique_ptr<juce::TabbedComponent> 	sectionTabs;
+
+	std::unique_ptr<juce::TextButton>		btnLoadFile;
+	std::unique_ptr<juce::TextButton>		btnSaveFile;
+	std::unique_ptr<juce::TextButton>		btnImportFile;
+
+	// Version signature in bottom left of window
+	std::unique_ptr<juce::Label> 			lblAppName;
+	std::unique_ptr<juce::Label> 			lblAppVersion;
+
+    std::unique_ptr<juce::Label>			lblFirmwareVersion;
+
+	// Buffer for copy/paste of sub board data
+	std::unique_ptr<LumatoneBoard>			copiedSubBoardData;
+
+	//==============================================================================
+
+	std::unique_ptr<KeyboardClickListener>	keyboardClickListener;
+
+	//==============================================================================
+	// Position and Size helpers
+
+	int contentMargin;
+	int contentWidth;
+
+	int controlsLabelYPos;
+    juce::Rectangle<int> controlsArea;
+    juce::Rectangle<int> controlsAreaBackground;
+
+	juce::TabbedButtonBar* sectionTabBar;
+	const float sectionTabsMarginW			= 0.013f;
+	juce::StringArray sectionTabNames;
+
+	const float contentWidthRatio 			= 0.871f;
+
+    const float headerHeight                = 0.0837f;
+
+	const float controlSectionTabsY			= 0.63f;
+	const float controlsLabelHeight 		= 0.033f;
+
+    const float controlsAreaY               = 0.662f;
+    const float controlsAreaHeight          = 0.43f;
+
+    const float assignMarginX               = 0.043f;
+    const float assignWidth                 = 0.5385f;
+    const float assignHeight                = 0.44f;
+
+    const float footerAreaY                 = 0.96f;
+
+	const float lumatoneGraphicMarginTop	= 0.1f;
+	const float lumatoneGraphicH			= 0.8f;
+
+	const float fileButtonH					= 0.025f;
+	const float importYFromImageTop			= 0.4f;
+	const float importW						= 0.1f;
+
+	const float btnYFromImageTop			= 0.02;
+	const float saveLoadW					= 0.08f;
+	const float saveLoadMarginW				= 0.0034f;
+
+
+    const float popupWidth                  = 0.4f;
+    const float popupHeight                 = 0.333f;
+
+    const float lumatoneVersionMarginX      = 0.02f;
+	const float lumatoneVersionWidth        = 0.2f;
+	const float lumatoneVersionHeight       = 0.5f;
+
+    const float presetButtonColoursX        = 0.7237f;
+    const float presetButtonColoursHeight   = 0.2258f;
+
+    const float settingsColumnX             = 0.597826f;
+    const float settingsAreaY               = 0.546875f;
+    const float settingsAreaHeight          = 0.148148f;
+
+    const juce::Rectangle<float> generalSettingsBounds = { settingsColumnX, settingsAreaY, 0.17f, settingsAreaHeight };
+    const juce::Rectangle<float>   pedalSettingsBounds = { 0.777778f,       settingsAreaY, 0.18f, settingsAreaHeight };
+    const juce::Rectangle<float>      curvesAreaBounds = { settingsColumnX, 0.7174f,       0.3626f, 0.21f };
+
+};
diff --git a/Source/MidiEditArea.cpp b/Source/components/MidiEditArea.cpp
similarity index 99%
rename from Source/MidiEditArea.cpp
rename to Source/components/MidiEditArea.cpp
index d7f5ad61..492ae154 100644
--- a/Source/MidiEditArea.cpp
+++ b/Source/components/MidiEditArea.cpp
@@ -19,9 +19,9 @@
 
 //[Headers] You can add your own extra header files here...
 #include "MidiEditArea.h"
-#include "LumatoneEditorLookAndFeel.h"
-#include "./lumatone_editor_library/device/lumatone_controller.h"
-#include "./lumatone_editor_library/graphics/view_constants.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
+#include "../lumatone_editor_library/device/lumatone_controller.h"
+#include "../lumatone_editor_library/graphics/view_constants.h"
 //[/Headers]
 
 
diff --git a/Source/MidiEditArea.h b/Source/components/MidiEditArea.h
similarity index 97%
rename from Source/MidiEditArea.h
rename to Source/components/MidiEditArea.h
index 5041a586..588e5a50 100644
--- a/Source/MidiEditArea.h
+++ b/Source/components/MidiEditArea.h
@@ -22,10 +22,10 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
-#include "./lumatone_editor_library/listeners/status_listener.h"
-#include "./lumatone_editor_library/listeners/editor_listener.h"
+#include "../lumatone_editor_library/listeners/status_listener.h"
+#include "../lumatone_editor_library/listeners/editor_listener.h"
 
 //[/Headers]
 
diff --git a/Source/mapping_editors/BatchTools.cpp b/Source/components/mapping/BatchTools.cpp
similarity index 98%
rename from Source/mapping_editors/BatchTools.cpp
rename to Source/components/mapping/BatchTools.cpp
index b5a8d30b..316fb15e 100644
--- a/Source/mapping_editors/BatchTools.cpp
+++ b/Source/components/mapping/BatchTools.cpp
@@ -2,7 +2,7 @@
 
 #include "./BatchToolsColourControls.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
 
 BatchTools::BatchTools(const LumatoneEditorState & stateIn)
diff --git a/Source/mapping_editors/BatchTools.h b/Source/components/mapping/BatchTools.h
similarity index 95%
rename from Source/mapping_editors/BatchTools.h
rename to Source/components/mapping/BatchTools.h
index 0eb857c3..f59ea90f 100644
--- a/Source/mapping_editors/BatchTools.h
+++ b/Source/components/mapping/BatchTools.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_EDITOR_BATCH_TOOLS_H
 #define LUMATONE_EDITOR_BATCH_TOOLS_h
 
-#include "../LumatoneEditorState.h"
+#include "../../data/LumatoneEditorState.h"
 
 
 class BatchToolsColourControls;
diff --git a/Source/mapping_editors/BatchToolsColourControls.cpp b/Source/components/mapping/BatchToolsColourControls.cpp
similarity index 98%
rename from Source/mapping_editors/BatchToolsColourControls.cpp
rename to Source/components/mapping/BatchToolsColourControls.cpp
index 1bc03ad3..b94bc1ee 100644
--- a/Source/mapping_editors/BatchToolsColourControls.cpp
+++ b/Source/components/mapping/BatchToolsColourControls.cpp
@@ -1,9 +1,9 @@
 #include "BatchToolsColourControls.h"
 
-#include "../LumatoneEditorStyleCommon.h"
+#include "../../style/LumatoneEditorStyleCommon.h"
 
-#include "../actions/BatchColourActions.h"
-#include "../lumatone_editor_library/actions/edit_actions.h"
+#include "../../actions/BatchColourActions.h"
+#include "../../lumatone_editor_library/actions/edit_actions.h"
 
 BatchToolsColourControls::BatchToolsColourControls(const LumatoneEditorState & stateIn)
     : LumatoneEditorState("BatchToolsColourControls", stateIn)
diff --git a/Source/mapping_editors/BatchToolsColourControls.h b/Source/components/mapping/BatchToolsColourControls.h
similarity index 90%
rename from Source/mapping_editors/BatchToolsColourControls.h
rename to Source/components/mapping/BatchToolsColourControls.h
index 3259ae1d..6dbeeb44 100644
--- a/Source/mapping_editors/BatchToolsColourControls.h
+++ b/Source/components/mapping/BatchToolsColourControls.h
@@ -11,10 +11,10 @@
 #ifndef LUMATONE_EDITOR_BATCH_TOOLS_COLOUR_CONTROLSH
 #define LUMATONE_EDITOR_BATCH_TOOLS_COLOUR_CONTROLSH
 
-#include "../LumatoneEditorState.h"
-#include "../lumatone_editor_library/listeners/editor_listener.h"
+#include "../../data/LumatoneEditorState.h"
+#include "../../lumatone_editor_library/listeners/editor_listener.h"
 
-#include "../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+#include "../../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
 
 
 class BatchToolsColourControls : public LumatoneEditorState
diff --git a/Source/mapping_editors/KeyEditorControls.cpp b/Source/components/mapping/KeyEditorControls.cpp
similarity index 78%
rename from Source/mapping_editors/KeyEditorControls.cpp
rename to Source/components/mapping/KeyEditorControls.cpp
index 4aa184d0..5281513f 100644
--- a/Source/mapping_editors/KeyEditorControls.cpp
+++ b/Source/components/mapping/KeyEditorControls.cpp
@@ -9,21 +9,22 @@
 */
 
 #include "KeyEditorControls.h"
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
-#include "../colour_view_component.h"
-#include "../lumatone_editor_library/palettes/colour_edit_textbox.h"
+// #include "../../controls/colour_view_component.h"
+#include "../../controls/ColourDropdownSelector.h"
+#include "../../lumatone_editor_library/palettes/colour_edit_textbox.h"
 
 #include "../ColourPaletteWindow.h"
 // #include "../lumatone_editor_library/palettes/palette_selection_panel.h"
-#include "../lumatone_editor_library/palettes/colour_picker_panel.h"
-#include "../lumatone_editor_library/palettes/colour_selection_group.h"
+#include "../../lumatone_editor_library/palettes/colour_picker_panel.h"
+#include "../../lumatone_editor_library/palettes/colour_selection_group.h"
 
-#include "../actions/EditorControlActions.h"
+#include "../../actions/EditorControlActions.h"
 
-#include "../components/RangedControl.h"
+#include "../../controls/RangedControl.h"
 
-#include "../actions/EditorControlActions.h"
+#include "../../actions/EditorControlActions.h"
 
 
 KeyEditorControls::KeyEditorControls(const LumatoneEditorState& stateIn)
@@ -36,12 +37,29 @@ KeyEditorControls::KeyEditorControls(const LumatoneEditorState& stateIn)
     lblKeySettings->setFont(getAppFonts().getFont(LumatoneEditorFont::FranklinGothic));
     addAndMakeVisible(lblKeySettings.get());
 
-    colourTextEditor = std::make_unique<ColourTextEditor>("colourTextEditor", "");
-    addAndMakeVisible(colourTextEditor.get());
+    // colourTextEditor = std::make_unique<ColourTextEditor>("colourTextEditor", "");
+    // addAndMakeVisible(colourTextEditor.get());
 
-    colourSubwindow = std::make_unique<ColourViewComponent>(juce::Colour(0xff5398b7));
-    colourSubwindow->setColourButtonMode(ColourViewComponent::ColourButtonMode::Dropper);
-    addAndMakeVisible(colourSubwindow.get());
+    // colourSubwindow = std::make_unique<ColourViewComponent>(juce::Colour(0xff5398b7));
+    // colourSubwindow->setColourButtonMode(ColourViewComponent::ColourButtonMode::Dropper);
+    // addAndMakeVisible(colourSubwindow.get());
+
+    colourDropdown = std::make_unique<ColourDropdownSelector>("AssignColourDropdown");
+    colourDropdown->setOnValueChangeCallback([&]()
+    {
+        performAction(SetKeySettingsAction::NewSetAssignColourAction(*this, colourDropdown->getSelectedColour()));
+        if (colourDropdown->getSelectedColour() != juce::Colours::transparentBlack)
+            performAction(new ApplyAssignmentsToSelectionAction(*this, getEditSelectionData(), *getSelectedKeys()));
+    });
+
+    // addColourSelectionListener(colourDropdown.get());
+    // colourDropdown->setColourPickerChangedCallback([&]()
+    // {
+    //     addColourSelectionListener(colourDropdown.get());
+    // });
+
+    addAndMakeVisible(colourDropdown.get());
+    colourDropdown->setShowPicker(true);
 
     keyTypeCombo = std::make_unique<juce::ComboBox>("keyTypeCombo");
     keyTypeCombo->setEditableText (false);
@@ -110,11 +128,12 @@ KeyEditorControls::KeyEditorControls(const LumatoneEditorState& stateIn)
 
     // ColourSelectionGroup* group = new ColourSelectionGroup("KeyEditorControlColour");
     colourSelectionGroup = colourPalettePanel->getColourSelectionGroup();
-    // colourSelectionGroup = std::make_unique<ColourSelectionGroup>("KeyEditorControlColour");
-    colourSelectionGroup->addSelector(colourTextEditor.get());
-    colourSelectionGroup->addColourSelectionListener(colourSubwindow.get());
-    colourSelectionGroup->addColourSelectionListener(colourTextEditor.get());
+    colourSelectionGroup->addSelector(colourDropdown.get());
+    colourSelectionGroup->addColourSelectionListener(colourDropdown.get());
     colourSelectionGroup->addColourSelectionListener(this);
+    // colourSelectionGroup = std::make_unique<ColourSelectionGroup>("KeyEditorControlColour");
+    // colourSelectionGroup->addSelector(colourTextEditor.get())
+    // colourSelectionGroup->addColourSelectionListener(colourTextEditor.get());
     // group->addSelector(colourTextEditor.get());
     // group->addColourSelectionListener(colourSubwindow.get());
     // group->addColourSelectionListener(colourTextEditor.get());
@@ -136,8 +155,9 @@ KeyEditorControls::~KeyEditorControls()
     noteInput = nullptr;
     keyTypeCombo = nullptr;
 
-    colourSubwindow = nullptr;
-    colourTextEditor = nullptr;
+    // colourSubwindow = nullptr;
+    colourDropdown = nullptr;
+    // colourTextEditor = nullptr;
 
     lblKeySettings = nullptr;
 }
@@ -183,8 +203,9 @@ void KeyEditorControls::resized()
     colourButtonMargin = lblColour->getFont().getStringWidth(" ");
     colourButtonWidth = roundToInt(getParentWidth() * colourButtonParentW) - colourButtonMargin;
 
-    colourTextEditor->setBounds(lblColour->getRight(), lblColour->getY(), keyControlColumnRight - lblColour->getRight() - colourButtonWidth, keyControlHeight);
-    colourSubwindow->setBounds(colourTextEditor->getRight() + colourButtonMargin, colourTextEditor->getY(), colourButtonWidth, keyControlHeight);
+    // colourTextEditor->setBounds(lblColour->getRight(), lblColour->getY(), keyControlColumnRight - lblColour->getRight() - colourButtonWidth, keyControlHeight);
+    // colourSubwindow->setBounds(colourTextEditor->getRight() + colourButtonMargin, colourTextEditor->getY(), colourButtonWidth, keyControlHeight);
+    colourDropdown->setBounds(lblColour->getRight(), lblColour->getY(), keyControlColumnRight - lblColour->getRight(), keyControlHeight);
 
     lblKeyType->setTopLeftPosition(contentMarginWidth, lblColour->getBottom() + keyControlMarginHeight);
     resizeLabelWithHeight(lblKeyType.get(), keyControlHeight, controlLabelFontScalar);
@@ -216,16 +237,19 @@ void KeyEditorControls::selectionChanged()
     {
         setAssignKeyColour(newData.useColour, newData.colour);
         // performAction(SetKeySettingsAction::NewSetAssignColourAction(*this, newData.colour), true, false);
-        colourSubwindow->setColour(newData.colour.toString(), false);
-        if (newData.colour.isTransparent())
-            colourTextEditor->setText("", juce::NotificationType::dontSendNotification);
-        else
-            colourTextEditor->setText(newData.colour.toDisplayString(false), juce::NotificationType::dontSendNotification);
+        // colourSubwindow->setColour(newData.colour.toString(), false);
+        colourDropdown->setSelectedColour(newData.colour);
+
+        // if (newData.colour.isTransparent())
+        //     colourTextEditor->setText("", juce::NotificationType::dontSendNotification);
+        // else
+        //     colourTextEditor->setText(newData.colour.toDisplayString(false), juce::NotificationType::dontSendNotification);
     }
     else
     {
-        colourSubwindow->setColour("", false);
-        colourTextEditor->setText("", juce::NotificationType::dontSendNotification);
+        // colourSubwindow->setColour("", false);
+        colourDropdown->deselectColour();
+        // colourTextEditor->setText("", juce::NotificationType::dontSendNotification);
     }
 
     if (newData.useType)
@@ -253,8 +277,9 @@ void KeyEditorControls::handleStatePropertyChange(juce::ValueTree stateIn, const
     if (property == LumatoneEditSelectionProperty::AssignKeyColour)
     {
         auto colourString = stateIn[property].toString();
-        colourTextEditor->setText(colourString, juce::NotificationType::dontSendNotification);
-        colourSubwindow->setColour(colourString, false);
+        // colourTextEditor->setText(colourString, juce::NotificationType::dontSendNotification);
+        // colourSubwindow->setColour(colourString, false);
+        colourDropdown->setSelectedColour(juce::Colour::fromString(colourString));
     }
     else if (property == LumatoneEditSelectionProperty::AssignKeyType)
     {
diff --git a/Source/mapping_editors/KeyEditorControls.h b/Source/components/mapping/KeyEditorControls.h
similarity index 89%
rename from Source/mapping_editors/KeyEditorControls.h
rename to Source/components/mapping/KeyEditorControls.h
index 0fdaa9f2..9b8b9945 100644
--- a/Source/mapping_editors/KeyEditorControls.h
+++ b/Source/components/mapping/KeyEditorControls.h
@@ -11,16 +11,16 @@
 #ifndef LUMATONE_EDITOR_KEY_EDITOR_CONTROLS_H
 #define LUMATONE_EDITOR_KEY_EDITOR_CONTROLS_H
 
-#include "../LumatoneEditorState.h"
-#include "../lumatone_editor_library/listeners/editor_listener.h"
-
-#include "../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+#include "../../data/LumatoneEditorState.h"
+#include "../../lumatone_editor_library/listeners/editor_listener.h"
+#include "../../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
 
 class ColourSelectionGroup;
 class ColourTextEditor;
 class ColourViewComponent;
 class RangedControl;
 class ColourPaletteWindow;
+class ColourDropdownSelector;
 
 class KeyEditorControls : public juce::Component
                         , public LumatoneEditorState
@@ -48,7 +48,8 @@ class KeyEditorControls : public juce::Component
     std::unique_ptr<juce::Label>            lblKeySettings;
 
     std::unique_ptr<ColourTextEditor>       colourTextEditor;
-    std::unique_ptr<ColourViewComponent>    colourSubwindow;
+    // std::unique_ptr<ColourViewComponent>    colourSubwindow;
+    std::unique_ptr<ColourDropdownSelector> colourDropdown;
 
     std::unique_ptr<juce::ComboBox>         keyTypeCombo;
     std::unique_ptr<RangedControl>           noteInput;
diff --git a/Source/mapping_editors/KeyEditorPanel.cpp b/Source/components/mapping/KeyEditorPanel.cpp
similarity index 98%
rename from Source/mapping_editors/KeyEditorPanel.cpp
rename to Source/components/mapping/KeyEditorPanel.cpp
index 047fa29f..5d90c432 100644
--- a/Source/mapping_editors/KeyEditorPanel.cpp
+++ b/Source/components/mapping/KeyEditorPanel.cpp
@@ -1,5 +1,5 @@
 #include "KeyEditorPanel.h"
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
 #include "./KeyEditorControls.h"
 #include "./MultiSelectControls.h"
diff --git a/Source/mapping_editors/KeyEditorPanel.h b/Source/components/mapping/KeyEditorPanel.h
similarity index 97%
rename from Source/mapping_editors/KeyEditorPanel.h
rename to Source/components/mapping/KeyEditorPanel.h
index 643d86bb..97d41ad0 100644
--- a/Source/mapping_editors/KeyEditorPanel.h
+++ b/Source/components/mapping/KeyEditorPanel.h
@@ -12,7 +12,7 @@
 #define LUMATONE_EDITOR_KEY_EDITOR_PANEL_H
 
 // #include "./lumatone_editor_library/listeners/editor_listener.h"
-#include "../LumatoneEditorState.h"
+#include "../../data/LumatoneEditorState.h"
 
 class KeyEditorControls;
 class MultiSelectControls;
diff --git a/Source/MappingLogic.cpp b/Source/components/mapping/MappingLogic.cpp
similarity index 96%
rename from Source/MappingLogic.cpp
rename to Source/components/mapping/MappingLogic.cpp
index aa41548e..3c02d4e9 100644
--- a/Source/MappingLogic.cpp
+++ b/Source/components/mapping/MappingLogic.cpp
@@ -1,315 +1,315 @@
-/*
-  ==============================================================================
-
-    MappingLogic.cpp
-    Created: 27 Apr 2016 9:20:43pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "MappingLogic.h"
-
-
-//==============================================================================
-// Base class
-
-MappingLogicBase::MappingLogicBase(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
-    : scaleStructure(scaleStructureIn), colourTable(colourTableIn)
-{
-}
-
-void MappingLogicBase::setPeriodSize(int newPeriodSize, bool forceRefresh)
-{
-	if (newPeriodSize != this->periodSize || forceRefresh)
-	{
-		this->periodSize = newPeriodSize;
-
-		// Notify listeners
-		this->listeners.call(&Listener::mappingLogicChanged, this);
-	}
-}
-
-int MappingLogicBase::getIndexFromStartOfMap(int inx) const
-{
-    if (this->getPeriodSize() <= 0) {
-        jassertfalse;
-        return 0;
-    }
-
-    int relativeInx = (inx - getStartOfMap()) % this->getPeriodSize();
-    while (relativeInx < 0)
-        relativeInx += this->getPeriodSize();
-    return relativeInx;
-
-}
-
-juce::Colour MappingLogicBase::indexToColour(int inx) const
-{
-	if (inx < 0 || inx >= this->globalMappingSize() || !this->assignColours)
-        return juce::Colour();
-
-    auto noteRelativeToStart = getIndexFromStartOfMap(inx);
-    auto colourGroupIndex = scaleStructure.getGroupOfDegree(noteRelativeToStart);
-    if (colourGroupIndex < 0 || colourGroupIndex >= colourTable.size())
-    {
-        jassertfalse;
-        return juce::Colour();
-    }
-    return colourTable.getReference(colourGroupIndex);
-}
-
-void MappingLogicBase::indexToTerpstraKey(int inx, LumatoneKey& keyData) const
-{
-    keyData.setKeyType(LumatoneKeyType::noteOnNoteOff);
-	keyData.setChannelNumber(indexToMIDIChannel(inx));
-	keyData.setNoteOrCC(indexToMIDINote(inx));
-
-	if (this->assignColours)
-        keyData.setColour(indexToColour(inx));
-}
-
-LumatoneKey MappingLogicBase::indexToTerpstraKey(int inx) const
-{
-	LumatoneKey keyData;
-	indexToTerpstraKey(inx, keyData);
-	return keyData;
-}
-
-void MappingLogicBase::addListener(MappingLogicBase::Listener* listener)
-{
-	listeners.add(listener);
-}
-
-void MappingLogicBase::removeListener(MappingLogicBase::Listener* listener)
-{
-	listeners.remove(listener);
-}
-
-//==============================================================================
-// Increasing MIDI notes
-
-IncrMidiNotesMappingLogic::IncrMidiNotesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
-    : MappingLogicBase(scaleStructureIn, colourTableIn)
-{
-}
-
-//=============================================================
-// Set parameters
-
-void IncrMidiNotesMappingLogic::setChannelInCaseOfSingleChannel(int newChannelInCaseOfSingleChannel, bool forceRefresh)
-{
-	if (newChannelInCaseOfSingleChannel != this->channelInCaseOfSingleChannel || forceRefresh)
-	{
-		this->channelInCaseOfSingleChannel = newChannelInCaseOfSingleChannel;
-
-		// Notify listeners
-		this->listeners.call(&Listener::mappingLogicChanged, this);
-	}
-}
-
-void IncrMidiNotesMappingLogic::setValues(int newPeriodSize, int newChannelInCaseOfSingleChannel, bool forceRefresh)
-{
-	if (newPeriodSize != this->periodSize || newChannelInCaseOfSingleChannel != this->channelInCaseOfSingleChannel
-        || forceRefresh)
-	{
-		this->periodSize = newPeriodSize;
-		this->channelInCaseOfSingleChannel = newChannelInCaseOfSingleChannel;
-
-		// Notify listeners
-		this->listeners.call(&Listener::mappingLogicChanged, this);
-	}
-}
-
-//============================================================
-// Access mapping data (overrides)
-
-int IncrMidiNotesMappingLogic::globalMappingSize() const
-{
-	if (isSingleChannel())
-		return 128;	// notes start at 0 and go until periodSize-1
-	else
-		return this->periodSize * 16;
-}
-
-int IncrMidiNotesMappingLogic::indexToMIDIChannel(int inx) const
-{
-	if (inx < 0 || inx >= this->globalMappingSize())
-        return 0;
-	else if (this->isSingleChannel())
-        return this->channelInCaseOfSingleChannel;
-    else
-        // Channel is 1-based
-        return (inx / this->periodSize) + 1;
-}
-
-int IncrMidiNotesMappingLogic::indexToMIDINote(int inx) const
-{
-	if (inx < 0 || inx >= this->globalMappingSize())
-        return 0;
-	else if (this->isSingleChannel())
-        return inx;
-    else
-        // Note is 0-based and goes until periodSize-1
-        return inx % this->periodSize;
-
-}
-
-int IncrMidiNotesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
-{
-	if (keyData.isEmpty() || this->globalMappingSize() == 0)
-		return -1;
-
-	if (this->isSingleChannel())
-	{
-	    // notes start at 0 and go until periodSize-1
-		if (!keyData.hasMidiChannel(this->channelInCaseOfSingleChannel) || !keyData.hasMidiNumber(this->periodSize))
-			return -1;
-
-		return keyData.getMidiNumber();
-	}
-	else
-	{
-		if (keyData.getMidiNumber() >= this->periodSize)
-			return -1;
-
-		return (keyData.getMidiChannel() - 1) * this->periodSize + keyData.getMidiNumber();
-	}
-}
-
-
-//==============================================================================
-// KBM files
-
-// KBMFilesMappingLogic::KBMFilesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
-//     : MappingLogicBase(scaleStructureIn, colourTableIn)
-// {
-// }
-
-// //==============================================================
-// // Set parameters
-
-// void KBMFilesMappingLogic::setMapping(int subDlgIndex, int midiChannel, KBMMappingDataStructure kbmMappingStructure)
-// {
-//     jassert(subDlgIndex >= 0 && subDlgIndex < noOfChannels);
-
-//     KBMMappingWithChannel channelMapping;
-//     channelMapping.channelNumber = midiChannel;
-//     channelMapping.mapping = kbmMappingStructure;
-
-//     channelMappingData[subDlgIndex] = channelMapping;
-
-//     createMappingTable();
-// }
-
-// void KBMFilesMappingLogic::createMappingTable()
-// {
-//     mappingTable.clear();
-
-//     for ( int subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
-//     {
-//         if (channelMappingData[subTableIndex].channelNumber > 0)
-//         {
-//             KBMMappingDataStructure::NoteAndFrequencyTable noteAndFrequencyTable =
-//                 channelMappingData[subTableIndex].mapping.createNoteFrequencyTable();
-
-//             for ( int k = 0; k < noteAndFrequencyTable.size(); k++)
-//             {
-//                 KBMMappingTableEntry tableEntry;
-//                 tableEntry.channelNumber = channelMappingData[subTableIndex].channelNumber;
-//                 tableEntry.noteNumber = noteAndFrequencyTable[k].noteNumber;
-//                 tableEntry.frequency = noteAndFrequencyTable[k].frequency;
-
-//                 mappingTable.add(tableEntry);   // This adds entry only if there is no other entry woth the same frequency.
-//             }
-//         }
-//     }
-
-//     // Notify listeners
-//     this->listeners.call(&Listener::mappingLogicChanged, this);
-// }
-
-// int KBMFilesMappingLogic::getStartOfMap() const
-// {
-//     // Start of map is supposed to be the same for all KBM files
-//     // ToDo display error/warning message if not so
-//     int subTableIndex;
-//     for (subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
-//     {
-//         if (channelMappingData[subTableIndex].channelNumber > 0)
-//             break;
-//     }
-
-//     if (subTableIndex == noOfChannels)
-//     {
-//         jassert(false);
-//         return 0;
-//     }
-
-//     LumatoneKey keyData;
-//     keyData.setChannelNumber(channelMappingData[subTableIndex].channelNumber);
-//     keyData.setNoteOrCC(channelMappingData[subTableIndex].mapping.noteNrWhereMappingStarts);
-
-//     return terpstraKeyToIndex(keyData);
-// }
-
-// /*
-// int KBMFilesMappingLogic::getPeriodSize() const
-// {
-//     // Period size is supposed to be the same for all KBM files
-//     // ToDo display error/warning message if not so
-//     int subTableIndex;
-//     for (subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
-//     {
-//         if (channelMappingData[subTableIndex].channelNumber > 0)
-//             break;
-//     }
-
-//     if (subTableIndex == noOfChannels)
-//     {
-//         jassert(false);
-//         return 0;
-//     }
-//     else
-//         return channelMappingData[subTableIndex].mapping.scaleSize;
-// }
-// */
-
-// //=================================================================
-// // Access mapping data (overrides)
-
-// int KBMFilesMappingLogic::globalMappingSize() const
-// {
-//     return mappingTable.size();
-// }
-
-// int KBMFilesMappingLogic::indexToMIDIChannel(int inx) const
-// {
-// 	if (inx < 0 || inx >= globalMappingSize())
-//         return 0;
-//     else
-//         return mappingTable[inx].channelNumber;
-// }
-
-// int KBMFilesMappingLogic::indexToMIDINote(int inx) const
-// {
-// 	if (inx < 0 || inx >= globalMappingSize())
-//         return 0;
-//     else
-//         return mappingTable[inx].noteNumber;
-// }
-
-// int KBMFilesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
-// {
-// 	if (keyData.isEmpty() || globalMappingSize() == 0)
-// 		return -1;
-
-// 	int inx;
-//     for ( inx = 0; inx < globalMappingSize(); inx++)
-//     {
-//         if (keyData.hasMidiChannel(mappingTable[inx].channelNumber) && keyData.hasMidiNumber(mappingTable[inx].noteNumber))
-//             break;
-//     }
-
-//     return inx < globalMappingSize() ? inx : -1;
-// }
+/*
+  ==============================================================================
+
+    MappingLogic.cpp
+    Created: 27 Apr 2016 9:20:43pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "MappingLogic.h"
+
+
+//==============================================================================
+// Base class
+
+MappingLogicBase::MappingLogicBase(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
+    : scaleStructure(scaleStructureIn), colourTable(colourTableIn)
+{
+}
+
+void MappingLogicBase::setPeriodSize(int newPeriodSize, bool forceRefresh)
+{
+	if (newPeriodSize != this->periodSize || forceRefresh)
+	{
+		this->periodSize = newPeriodSize;
+
+		// Notify listeners
+		this->listeners.call(&Listener::mappingLogicChanged, this);
+	}
+}
+
+int MappingLogicBase::getIndexFromStartOfMap(int inx) const
+{
+    if (this->getPeriodSize() <= 0) {
+        jassertfalse;
+        return 0;
+    }
+
+    int relativeInx = (inx - getStartOfMap()) % this->getPeriodSize();
+    while (relativeInx < 0)
+        relativeInx += this->getPeriodSize();
+    return relativeInx;
+
+}
+
+juce::Colour MappingLogicBase::indexToColour(int inx) const
+{
+	if (inx < 0 || inx >= this->globalMappingSize() || !this->assignColours)
+        return juce::Colour();
+
+    auto noteRelativeToStart = getIndexFromStartOfMap(inx);
+    auto colourGroupIndex = scaleStructure.getGroupOfDegree(noteRelativeToStart);
+    if (colourGroupIndex < 0 || colourGroupIndex >= colourTable.size())
+    {
+        jassertfalse;
+        return juce::Colour();
+    }
+    return colourTable.getReference(colourGroupIndex);
+}
+
+void MappingLogicBase::indexToTerpstraKey(int inx, LumatoneKey& keyData) const
+{
+    keyData.setKeyType(LumatoneKeyType::noteOnNoteOff);
+	keyData.setChannelNumber(indexToMIDIChannel(inx));
+	keyData.setNoteOrCC(indexToMIDINote(inx));
+
+	if (this->assignColours)
+        keyData.setColour(indexToColour(inx));
+}
+
+LumatoneKey MappingLogicBase::indexToTerpstraKey(int inx) const
+{
+	LumatoneKey keyData;
+	indexToTerpstraKey(inx, keyData);
+	return keyData;
+}
+
+void MappingLogicBase::addListener(MappingLogicBase::Listener* listener)
+{
+	listeners.add(listener);
+}
+
+void MappingLogicBase::removeListener(MappingLogicBase::Listener* listener)
+{
+	listeners.remove(listener);
+}
+
+//==============================================================================
+// Increasing MIDI notes
+
+IncrMidiNotesMappingLogic::IncrMidiNotesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
+    : MappingLogicBase(scaleStructureIn, colourTableIn)
+{
+}
+
+//=============================================================
+// Set parameters
+
+void IncrMidiNotesMappingLogic::setChannelInCaseOfSingleChannel(int newChannelInCaseOfSingleChannel, bool forceRefresh)
+{
+	if (newChannelInCaseOfSingleChannel != this->channelInCaseOfSingleChannel || forceRefresh)
+	{
+		this->channelInCaseOfSingleChannel = newChannelInCaseOfSingleChannel;
+
+		// Notify listeners
+		this->listeners.call(&Listener::mappingLogicChanged, this);
+	}
+}
+
+void IncrMidiNotesMappingLogic::setValues(int newPeriodSize, int newChannelInCaseOfSingleChannel, bool forceRefresh)
+{
+	if (newPeriodSize != this->periodSize || newChannelInCaseOfSingleChannel != this->channelInCaseOfSingleChannel
+        || forceRefresh)
+	{
+		this->periodSize = newPeriodSize;
+		this->channelInCaseOfSingleChannel = newChannelInCaseOfSingleChannel;
+
+		// Notify listeners
+		this->listeners.call(&Listener::mappingLogicChanged, this);
+	}
+}
+
+//============================================================
+// Access mapping data (overrides)
+
+int IncrMidiNotesMappingLogic::globalMappingSize() const
+{
+	if (isSingleChannel())
+		return 128;	// notes start at 0 and go until periodSize-1
+	else
+		return this->periodSize * 16;
+}
+
+int IncrMidiNotesMappingLogic::indexToMIDIChannel(int inx) const
+{
+	if (inx < 0 || inx >= this->globalMappingSize())
+        return 0;
+	else if (this->isSingleChannel())
+        return this->channelInCaseOfSingleChannel;
+    else
+        // Channel is 1-based
+        return (inx / this->periodSize) + 1;
+}
+
+int IncrMidiNotesMappingLogic::indexToMIDINote(int inx) const
+{
+	if (inx < 0 || inx >= this->globalMappingSize())
+        return 0;
+	else if (this->isSingleChannel())
+        return inx;
+    else
+        // Note is 0-based and goes until periodSize-1
+        return inx % this->periodSize;
+
+}
+
+int IncrMidiNotesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
+{
+	if (keyData.isEmpty() || this->globalMappingSize() == 0)
+		return -1;
+
+	if (this->isSingleChannel())
+	{
+	    // notes start at 0 and go until periodSize-1
+		if (!keyData.hasMidiChannel(this->channelInCaseOfSingleChannel) || !keyData.hasMidiNumber(this->periodSize))
+			return -1;
+
+		return keyData.getMidiNumber();
+	}
+	else
+	{
+		if (keyData.getMidiNumber() >= this->periodSize)
+			return -1;
+
+		return (keyData.getMidiChannel() - 1) * this->periodSize + keyData.getMidiNumber();
+	}
+}
+
+
+//==============================================================================
+// KBM files
+
+// KBMFilesMappingLogic::KBMFilesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn)
+//     : MappingLogicBase(scaleStructureIn, colourTableIn)
+// {
+// }
+
+// //==============================================================
+// // Set parameters
+
+// void KBMFilesMappingLogic::setMapping(int subDlgIndex, int midiChannel, KBMMappingDataStructure kbmMappingStructure)
+// {
+//     jassert(subDlgIndex >= 0 && subDlgIndex < noOfChannels);
+
+//     KBMMappingWithChannel channelMapping;
+//     channelMapping.channelNumber = midiChannel;
+//     channelMapping.mapping = kbmMappingStructure;
+
+//     channelMappingData[subDlgIndex] = channelMapping;
+
+//     createMappingTable();
+// }
+
+// void KBMFilesMappingLogic::createMappingTable()
+// {
+//     mappingTable.clear();
+
+//     for ( int subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
+//     {
+//         if (channelMappingData[subTableIndex].channelNumber > 0)
+//         {
+//             KBMMappingDataStructure::NoteAndFrequencyTable noteAndFrequencyTable =
+//                 channelMappingData[subTableIndex].mapping.createNoteFrequencyTable();
+
+//             for ( int k = 0; k < noteAndFrequencyTable.size(); k++)
+//             {
+//                 KBMMappingTableEntry tableEntry;
+//                 tableEntry.channelNumber = channelMappingData[subTableIndex].channelNumber;
+//                 tableEntry.noteNumber = noteAndFrequencyTable[k].noteNumber;
+//                 tableEntry.frequency = noteAndFrequencyTable[k].frequency;
+
+//                 mappingTable.add(tableEntry);   // This adds entry only if there is no other entry woth the same frequency.
+//             }
+//         }
+//     }
+
+//     // Notify listeners
+//     this->listeners.call(&Listener::mappingLogicChanged, this);
+// }
+
+// int KBMFilesMappingLogic::getStartOfMap() const
+// {
+//     // Start of map is supposed to be the same for all KBM files
+//     // ToDo display error/warning message if not so
+//     int subTableIndex;
+//     for (subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
+//     {
+//         if (channelMappingData[subTableIndex].channelNumber > 0)
+//             break;
+//     }
+
+//     if (subTableIndex == noOfChannels)
+//     {
+//         jassert(false);
+//         return 0;
+//     }
+
+//     LumatoneKey keyData;
+//     keyData.setChannelNumber(channelMappingData[subTableIndex].channelNumber);
+//     keyData.setNoteOrCC(channelMappingData[subTableIndex].mapping.noteNrWhereMappingStarts);
+
+//     return terpstraKeyToIndex(keyData);
+// }
+
+// /*
+// int KBMFilesMappingLogic::getPeriodSize() const
+// {
+//     // Period size is supposed to be the same for all KBM files
+//     // ToDo display error/warning message if not so
+//     int subTableIndex;
+//     for (subTableIndex = 0; subTableIndex < noOfChannels; subTableIndex++)
+//     {
+//         if (channelMappingData[subTableIndex].channelNumber > 0)
+//             break;
+//     }
+
+//     if (subTableIndex == noOfChannels)
+//     {
+//         jassert(false);
+//         return 0;
+//     }
+//     else
+//         return channelMappingData[subTableIndex].mapping.scaleSize;
+// }
+// */
+
+// //=================================================================
+// // Access mapping data (overrides)
+
+// int KBMFilesMappingLogic::globalMappingSize() const
+// {
+//     return mappingTable.size();
+// }
+
+// int KBMFilesMappingLogic::indexToMIDIChannel(int inx) const
+// {
+// 	if (inx < 0 || inx >= globalMappingSize())
+//         return 0;
+//     else
+//         return mappingTable[inx].channelNumber;
+// }
+
+// int KBMFilesMappingLogic::indexToMIDINote(int inx) const
+// {
+// 	if (inx < 0 || inx >= globalMappingSize())
+//         return 0;
+//     else
+//         return mappingTable[inx].noteNumber;
+// }
+
+// int KBMFilesMappingLogic::terpstraKeyToIndex(LumatoneKey keyData) const
+// {
+// 	if (keyData.isEmpty() || globalMappingSize() == 0)
+// 		return -1;
+
+// 	int inx;
+//     for ( inx = 0; inx < globalMappingSize(); inx++)
+//     {
+//         if (keyData.hasMidiChannel(mappingTable[inx].channelNumber) && keyData.hasMidiNumber(mappingTable[inx].noteNumber))
+//             break;
+//     }
+
+//     return inx < globalMappingSize() ? inx : -1;
+// }
diff --git a/Source/MappingLogic.h b/Source/components/mapping/MappingLogic.h
similarity index 95%
rename from Source/MappingLogic.h
rename to Source/components/mapping/MappingLogic.h
index fced0670..d6a6ca7c 100644
--- a/Source/MappingLogic.h
+++ b/Source/components/mapping/MappingLogic.h
@@ -1,173 +1,173 @@
-/*
-  ==============================================================================
-
-    MappingLogic.h
-    Created: 27 Apr 2016 9:20:43pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include "./lumatone_editor_library/data/lumatone_layout.h"
-// #include "KBMMappingDataStructure.h"
-#include "ScaleStructureController/ScaleStructure.h"
-
-
-//==============================================================================
-// Logic for the transformation between an abstract index and the concrete MIDI specifications, depending on the chosen mapping
-class MappingLogicBase
-{
-public:
-    MappingLogicBase(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
-    virtual ~MappingLogicBase() {}
-
-	void setPeriodSize(int newPeriodSize, bool forceRefresh = false);
-    void setAssignColours(bool value) { assignColours = value; };
-
-    void setColourTable(Array<Colour>& colourTableIn) { colourTable = colourTableIn; }
-
-	// Global number of notes in the mapping
-	virtual int globalMappingSize() const = 0;
-
-	virtual int indexToMIDIChannel(int inx) const = 0;
-	virtual int indexToMIDINote(int inx) const = 0;
-	virtual juce::Colour indexToColour(int inx) const;
-
-	// sets the Terpstra key specification for the "inx"-th note
-	virtual void indexToTerpstraKey(int inx, LumatoneKey& keyData) const;
-
-	// Returns the Terpstra key specification for the "inx"-th note
-	virtual LumatoneKey indexToTerpstraKey(int inx) const;
-
-	virtual int terpstraKeyToIndex(LumatoneKey keyData) const = 0;
-
-	// Listener class, to notify changes
-	class Listener
-	{
-	public:
-		// Destructor
-		virtual ~Listener() {}
-
-		// Called when mapping logic changes
-		virtual void mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged) = 0;
-	};
-
-	/** Registers a listener that will be called when the box's content changes. */
-	void addListener(Listener* listener);
-
-	/** Deregisters a previously-registered listener. */
-	void removeListener(Listener* listener);
-
-protected:
-    virtual int getStartOfMap() const { return 0; }
-    virtual int getPeriodSize() const { return periodSize; };
-    virtual int getIndexFromStartOfMap(int inx) const;
-
-	int periodSize = 12;
-    bool assignColours = false;
-    ScaleStructure& scaleStructure;
-	Array<Colour>& colourTable;
-
-	ListenerList<Listener> listeners;
-};
-
-//#ifndef DOXYGEN
-/** This typedef is just for compatibility with old code and VC6 - newer code should use Button::Listener instead. */
-//typedef MappingLogicBase::Listener MappingLogicListener;
-//#endif
-
-
-//==============================================================================
-// Mapping logic for MIDI notes, increasing order
-class IncrMidiNotesMappingLogic : public MappingLogicBase
-{
-public:
-	IncrMidiNotesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
-
-    //===============================
-	// Set parameters
-	void setChannelInCaseOfSingleChannel(int newChannelInCaseOfSingleChannel, bool forceRefresh = false);
-	void setValues(int newPeriodSize, int newChannelInCaseOfSingleChannel, bool forceRefresh = false);
-
-    //===============================
-	// Access mapping data (overrides)
-
-	int globalMappingSize() const override;
-
-	int indexToMIDIChannel(int inx) const override;
-	int indexToMIDINote(int inx) const override;
-
-	virtual int terpstraKeyToIndex(LumatoneKey keyData) const override;
-
-	bool isSingleChannel() const { return this->channelInCaseOfSingleChannel > 0; }
-
-private:
-	int channelInCaseOfSingleChannel = 0;
-};
-
-
-//==============================================================================
-// Mapping logic for KBM files
-// class KBMFilesMappingLogic: public MappingLogicBase
-// {
-//     //===============================
-//     // Types
-// private:
-//     struct KBMMappingWithChannel
-//     {
-//         int channelNumber = 0;
-//         KBMMappingDataStructure mapping;
-//     };
-
-//     class KBMMappingTableEntry : public KBMMappingDataStructure::noteAndFrequency
-//     {
-//     public:
-//         int channelNumber;
-
-//     public:
-//         // Comparison operators, so a list of it can be sorted
-//         bool operator==(const KBMMappingTableEntry& second) const { return this->frequency == second.frequency; }
-//         bool operator<(const KBMMappingTableEntry& second) const { return this->frequency < second.frequency; }
-//         bool operator>(const KBMMappingTableEntry& second) const { return this->frequency > second.frequency; }
-//         bool operator<=(const KBMMappingTableEntry& second) const { return this->frequency <= second.frequency; }
-//         bool operator>=(const KBMMappingTableEntry& second) const { return this->frequency >= second.frequency; }
-//     };
-
-// public:
-//     KBMFilesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
-//     virtual ~KBMFilesMappingLogic() {}
-
-//     //===============================
-// 	// Set parameters
-
-// 	void setMapping(int subDlgIndex, int midiChannel, KBMMappingDataStructure kbmMappingStructure);
-
-// protected:
-//     void createMappingTable();
-//     virtual int getStartOfMap() const override;
-
-//     //===============================
-// 	// Access mapping data (overrides)
-// public:
-//  	int globalMappingSize() const override;
-
-// 	int indexToMIDIChannel(int inx) const override;
-// 	int indexToMIDINote(int inx) const override;
-
-// 	virtual int terpstraKeyToIndex(LumatoneKey keyData) const override;
-
-//     //===============================
-//     // Attributes
-
-//     // Number of channels that can have a KBM file specified (Limited by the amount of space on the screen)
-//     static const int noOfChannels = 4;
-
-// private:
-//     KBMMappingWithChannel channelMappingData[noOfChannels];
-
-//     // Frequency to key definition mapping. Key must be integer for the default hash function to work
-//     SortedSet<KBMMappingTableEntry> mappingTable;
-
-// };
+/*
+  ==============================================================================
+
+    MappingLogic.h
+    Created: 27 Apr 2016 9:20:43pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "../../lumatone_editor_library/data/lumatone_layout.h"
+// #include "KBMMappingDataStructure.h"
+#include "../scale/ScaleStructure.h"
+
+
+//==============================================================================
+// Logic for the transformation between an abstract index and the concrete MIDI specifications, depending on the chosen mapping
+class MappingLogicBase
+{
+public:
+    MappingLogicBase(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
+    virtual ~MappingLogicBase() {}
+
+	void setPeriodSize(int newPeriodSize, bool forceRefresh = false);
+    void setAssignColours(bool value) { assignColours = value; };
+
+    void setColourTable(Array<Colour>& colourTableIn) { colourTable = colourTableIn; }
+
+	// Global number of notes in the mapping
+	virtual int globalMappingSize() const = 0;
+
+	virtual int indexToMIDIChannel(int inx) const = 0;
+	virtual int indexToMIDINote(int inx) const = 0;
+	virtual juce::Colour indexToColour(int inx) const;
+
+	// sets the Terpstra key specification for the "inx"-th note
+	virtual void indexToTerpstraKey(int inx, LumatoneKey& keyData) const;
+
+	// Returns the Terpstra key specification for the "inx"-th note
+	virtual LumatoneKey indexToTerpstraKey(int inx) const;
+
+	virtual int terpstraKeyToIndex(LumatoneKey keyData) const = 0;
+
+	// Listener class, to notify changes
+	class Listener
+	{
+	public:
+		// Destructor
+		virtual ~Listener() {}
+
+		// Called when mapping logic changes
+		virtual void mappingLogicChanged(MappingLogicBase* mappingLogicThatChanged) = 0;
+	};
+
+	/** Registers a listener that will be called when the box's content changes. */
+	void addListener(Listener* listener);
+
+	/** Deregisters a previously-registered listener. */
+	void removeListener(Listener* listener);
+
+protected:
+    virtual int getStartOfMap() const { return 0; }
+    virtual int getPeriodSize() const { return periodSize; };
+    virtual int getIndexFromStartOfMap(int inx) const;
+
+	int periodSize = 12;
+    bool assignColours = false;
+    ScaleStructure& scaleStructure;
+	Array<Colour>& colourTable;
+
+	ListenerList<Listener> listeners;
+};
+
+//#ifndef DOXYGEN
+/** This typedef is just for compatibility with old code and VC6 - newer code should use Button::Listener instead. */
+//typedef MappingLogicBase::Listener MappingLogicListener;
+//#endif
+
+
+//==============================================================================
+// Mapping logic for MIDI notes, increasing order
+class IncrMidiNotesMappingLogic : public MappingLogicBase
+{
+public:
+	IncrMidiNotesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
+
+    //===============================
+	// Set parameters
+	void setChannelInCaseOfSingleChannel(int newChannelInCaseOfSingleChannel, bool forceRefresh = false);
+	void setValues(int newPeriodSize, int newChannelInCaseOfSingleChannel, bool forceRefresh = false);
+
+    //===============================
+	// Access mapping data (overrides)
+
+	int globalMappingSize() const override;
+
+	int indexToMIDIChannel(int inx) const override;
+	int indexToMIDINote(int inx) const override;
+
+	virtual int terpstraKeyToIndex(LumatoneKey keyData) const override;
+
+	bool isSingleChannel() const { return this->channelInCaseOfSingleChannel > 0; }
+
+private:
+	int channelInCaseOfSingleChannel = 0;
+};
+
+
+//==============================================================================
+// Mapping logic for KBM files
+// class KBMFilesMappingLogic: public MappingLogicBase
+// {
+//     //===============================
+//     // Types
+// private:
+//     struct KBMMappingWithChannel
+//     {
+//         int channelNumber = 0;
+//         KBMMappingDataStructure mapping;
+//     };
+
+//     class KBMMappingTableEntry : public KBMMappingDataStructure::noteAndFrequency
+//     {
+//     public:
+//         int channelNumber;
+
+//     public:
+//         // Comparison operators, so a list of it can be sorted
+//         bool operator==(const KBMMappingTableEntry& second) const { return this->frequency == second.frequency; }
+//         bool operator<(const KBMMappingTableEntry& second) const { return this->frequency < second.frequency; }
+//         bool operator>(const KBMMappingTableEntry& second) const { return this->frequency > second.frequency; }
+//         bool operator<=(const KBMMappingTableEntry& second) const { return this->frequency <= second.frequency; }
+//         bool operator>=(const KBMMappingTableEntry& second) const { return this->frequency >= second.frequency; }
+//     };
+
+// public:
+//     KBMFilesMappingLogic(ScaleStructure& scaleStructureIn, Array<Colour>& colourTableIn);
+//     virtual ~KBMFilesMappingLogic() {}
+
+//     //===============================
+// 	// Set parameters
+
+// 	void setMapping(int subDlgIndex, int midiChannel, KBMMappingDataStructure kbmMappingStructure);
+
+// protected:
+//     void createMappingTable();
+//     virtual int getStartOfMap() const override;
+
+//     //===============================
+// 	// Access mapping data (overrides)
+// public:
+//  	int globalMappingSize() const override;
+
+// 	int indexToMIDIChannel(int inx) const override;
+// 	int indexToMIDINote(int inx) const override;
+
+// 	virtual int terpstraKeyToIndex(LumatoneKey keyData) const override;
+
+//     //===============================
+//     // Attributes
+
+//     // Number of channels that can have a KBM file specified (Limited by the amount of space on the screen)
+//     static const int noOfChannels = 4;
+
+// private:
+//     KBMMappingWithChannel channelMappingData[noOfChannels];
+
+//     // Frequency to key definition mapping. Key must be integer for the default hash function to work
+//     SortedSet<KBMMappingTableEntry> mappingTable;
+
+// };
diff --git a/Source/mapping_editors/MappingSettingsControls.cpp b/Source/components/mapping/MappingSettingsControls.cpp
similarity index 98%
rename from Source/mapping_editors/MappingSettingsControls.cpp
rename to Source/components/mapping/MappingSettingsControls.cpp
index cc8c2fb2..d1088811 100644
--- a/Source/mapping_editors/MappingSettingsControls.cpp
+++ b/Source/components/mapping/MappingSettingsControls.cpp
@@ -10,9 +10,9 @@
 
 #include "MappingSettingsControls.h"
 
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
-#include "../lumatone_editor_library/graphics/view_constants.h"
+#include "../../lumatone_editor_library/graphics/view_constants.h"
 
 //==============================================================================
 MappingSettingsControls::MappingSettingsControls (const LumatoneEditorState& stateIn)
diff --git a/Source/mapping_editors/MappingSettingsControls.h b/Source/components/mapping/MappingSettingsControls.h
similarity index 95%
rename from Source/mapping_editors/MappingSettingsControls.h
rename to Source/components/mapping/MappingSettingsControls.h
index 75e0b976..31b42fb7 100644
--- a/Source/mapping_editors/MappingSettingsControls.h
+++ b/Source/components/mapping/MappingSettingsControls.h
@@ -11,8 +11,8 @@
 #ifndef LUMATONE_EDITOR_MAPPING_SETTINGS_COMPONENT_H
 #define LUMATONE_EDITOR_MAPPING_SETTINGS_COMPONENT_H
 
-#include "../lumatone_editor_library/listeners/editor_listener.h"
-#include "../LumatoneEditorState.h"
+#include "../../lumatone_editor_library/listeners/editor_listener.h"
+#include "../../data/LumatoneEditorState.h"
 
 class MappingSettingsControls : public juce::Component
                                , public LumatoneEditorState
diff --git a/Source/mapping_editors/MappingSettingsPanel.cpp b/Source/components/mapping/MappingSettingsPanel.cpp
similarity index 97%
rename from Source/mapping_editors/MappingSettingsPanel.cpp
rename to Source/components/mapping/MappingSettingsPanel.cpp
index 22fa8a8e..0010d019 100644
--- a/Source/mapping_editors/MappingSettingsPanel.cpp
+++ b/Source/components/mapping/MappingSettingsPanel.cpp
@@ -10,7 +10,7 @@
 
 #include "./MappingSettingsPanel.h"
 #include "./MappingSettingsControls.h"
-#include "./CurvesArea.h"
+#include "../tables/CurvesArea.h"
 
 MappingSettingsPanel::MappingSettingsPanel(const LumatoneEditorState& stateIn)
   : juce::Component("MappingSettingsPanel")
diff --git a/Source/mapping_editors/MappingSettingsPanel.h b/Source/components/mapping/MappingSettingsPanel.h
similarity index 96%
rename from Source/mapping_editors/MappingSettingsPanel.h
rename to Source/components/mapping/MappingSettingsPanel.h
index 9a04b493..33808998 100644
--- a/Source/mapping_editors/MappingSettingsPanel.h
+++ b/Source/components/mapping/MappingSettingsPanel.h
@@ -12,7 +12,7 @@
 #define LUMATONE_EDITOR_MAPPING_SETTINGS_PANEL_H
 
 // #include "./lumatone_editor_library/listeners/editor_listener.h"
-#include "../LumatoneEditorState.h"
+#include "../../data/LumatoneEditorState.h"
 
 class MappingSettingsControls;
 class CurvesArea;
diff --git a/Source/mapping_editors/MultiSelectControls.cpp b/Source/components/mapping/MultiSelectControls.cpp
similarity index 94%
rename from Source/mapping_editors/MultiSelectControls.cpp
rename to Source/components/mapping/MultiSelectControls.cpp
index e3c2d189..63162de3 100644
--- a/Source/mapping_editors/MultiSelectControls.cpp
+++ b/Source/components/mapping/MultiSelectControls.cpp
@@ -9,14 +9,14 @@
 */
 
 #include "MultiSelectControls.h"
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
-#include "../colour_view_component.h"
-#include "../actions/KeySelectionControlActions.h"
-#include "../components/RangedControl.h"
-#include "../lumatone_editor_library/palettes/colour_edit_textbox.h"
+// #include "../../controls/colour_view_component.h"
+#include "../../actions/KeySelectionControlActions.h"
+#include "../../controls/RangedControl.h"
+#include "../../lumatone_editor_library/palettes/colour_edit_textbox.h"
 
-#include "../components/ColourDropdownSelector.h"
+#include "../../controls/ColourDropdownSelector.h"
 
 MultiSelectControls::MultiSelectControls(const LumatoneEditorState& stateIn)
         : LumatoneEditorState("MultiSelectControls", stateIn)
@@ -31,10 +31,11 @@ MultiSelectControls::MultiSelectControls(const LumatoneEditorState& stateIn)
     colourTextEditor = std::make_unique<ColourTextEditor>("colourSelectEditor", "000000");
     // addAndMakeVisible(colourTextEditor.get());
 
-    colourSubwindow = std::make_unique<ColourViewComponent>(juce::Colour(0xff5398b7));
-    colourSubwindow->setColourButtonMode(ColourViewComponent::ColourButtonMode::Dropper);
+    // colourSubwindow = std::make_unique<ColourViewComponent>(juce::Colour(0xff5398b7));
+    // colourSubwindow->setColourButtonMode(ColourViewComponent::ColourButtonMode::Dropper);
     // addAndMakeVisible(colourSubwindow.get());
 
+
     colourDropdown = std::make_unique<ColourDropdownSelector>("MultiSelectColourEdit");
     colourDropdown->setOnValueChangeCallback([&]()
     {
@@ -137,7 +138,7 @@ MultiSelectControls::~MultiSelectControls()
     keyTypeCombo = nullptr;
 
     colourDropdown = nullptr;
-    colourSubwindow = nullptr;
+    // colourSubwindow = nullptr;
     colourTextEditor = nullptr;
 }
 
@@ -187,7 +188,7 @@ void MultiSelectControls::resized()
 
     colourTextBoxWidth = colourTypeColumnWidth - colourButtonWidth - colourButtonMargin;
     colourTextEditor->setBounds(contentMarginWidth, lblColour->getBottom(), colourTextBoxWidth, controlHeight);
-    colourSubwindow->setBounds(colourTextEditor->getRight() + colourButtonMargin, colourTextEditor->getY(), colourButtonWidth, controlHeight);
+    // colourSubwindow->setBounds(colourTextEditor->getRight() + colourButtonMargin, colourTextEditor->getY(), colourButtonWidth, controlHeight);
 
     colourDropdown->setBounds(contentMarginWidth, lblColour->getBottom(), colourTextBoxWidth + colourButtonWidth, controlHeight);
 
diff --git a/Source/mapping_editors/MultiSelectControls.h b/Source/components/mapping/MultiSelectControls.h
similarity index 92%
rename from Source/mapping_editors/MultiSelectControls.h
rename to Source/components/mapping/MultiSelectControls.h
index 15c8c6b7..a58829ee 100644
--- a/Source/mapping_editors/MultiSelectControls.h
+++ b/Source/components/mapping/MultiSelectControls.h
@@ -11,10 +11,10 @@
 #ifndef LUMATONE_EDITOR_MULTI_SELECT_CONTROLS_H
 #define LUMATONE_EDITOR_MULTI_SELECT_CONTROLS_H
 
-#include "../LumatoneEditorState.h"
-#include "../lumatone_editor_library/listeners/editor_listener.h"
+#include "../../data/LumatoneEditorState.h"
+#include "../../lumatone_editor_library/listeners/editor_listener.h"
 
-class ColourViewComponent;
+// class ColourViewComponent;
 class ColourTextEditor;
 class RangedControl;
 
@@ -44,7 +44,7 @@ class MultiSelectControls : public LumatoneEditorState
     std::unique_ptr<juce::Label>    lblMultiSelect;
 
     std::unique_ptr<ColourTextEditor>       colourTextEditor;
-    std::unique_ptr<ColourViewComponent>    colourSubwindow;
+    // std::unique_ptr<ColourViewComponent>    colourSubwindow;
     std::unique_ptr<ColourDropdownSelector> colourDropdown;
 
     std::unique_ptr<juce::ComboBox>   keyTypeCombo;
diff --git a/Source/palette_edit_panel.h b/Source/components/palette_edit_panel.h
similarity index 98%
rename from Source/palette_edit_panel.h
rename to Source/components/palette_edit_panel.h
index 815583de..16decf3c 100644
--- a/Source/palette_edit_panel.h
+++ b/Source/components/palette_edit_panel.h
@@ -12,9 +12,9 @@
 #define LUMATONE_PALETTE_EDIT_PANEL_H
 
 
-#include "./colour_palette_component.h"
-#include "LumatoneEditorLookAndFeel.h"
-#include "LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
+#include "../controls/colour_palette_component.h"
 
 //==============================================================================
 /*
diff --git a/Source/palette_selection_panel.h b/Source/components/palette_selection_panel.h
similarity index 99%
rename from Source/palette_selection_panel.h
rename to Source/components/palette_selection_panel.h
index 4fbb86f7..567903f7 100644
--- a/Source/palette_selection_panel.h
+++ b/Source/components/palette_selection_panel.h
@@ -11,7 +11,7 @@
 #ifndef LUMATONE_PALETTE_SELECTION_PANEL_H
 #define LUMATONE_PALETTE_SELECTION_PANEL_H
 
-#include "./colour_palette_component.h"
+#include "../controls/colour_palette_component.h"
 
 //==============================================================================
 /*
diff --git a/Source/ScaleStructureController/NoteNames.cpp b/Source/components/scale/NoteNames.cpp
similarity index 100%
rename from Source/ScaleStructureController/NoteNames.cpp
rename to Source/components/scale/NoteNames.cpp
diff --git a/Source/ScaleStructureController/NoteNames.h b/Source/components/scale/NoteNames.h
similarity index 99%
rename from Source/ScaleStructureController/NoteNames.h
rename to Source/components/scale/NoteNames.h
index 13abe097..d170ade9 100644
--- a/Source/ScaleStructureController/NoteNames.h
+++ b/Source/components/scale/NoteNames.h
@@ -61,4 +61,4 @@ class NoteNames
 	void useAlphabeticalDefault();
 	void useNumericalDefault();
 	void useGenericAccidentals();
-};
\ No newline at end of file
+};
diff --git a/Source/ScaleStructureController/ScaleMath.h b/Source/components/scale/ScaleMath.h
similarity index 100%
rename from Source/ScaleStructureController/ScaleMath.h
rename to Source/components/scale/ScaleMath.h
diff --git a/Source/ScaleStructureController/ScaleStructure.cpp b/Source/components/scale/ScaleStructure.cpp
similarity index 99%
rename from Source/ScaleStructureController/ScaleStructure.cpp
rename to Source/components/scale/ScaleStructure.cpp
index eeb3f3b3..223cd883 100644
--- a/Source/ScaleStructureController/ScaleStructure.cpp
+++ b/Source/components/scale/ScaleStructure.cpp
@@ -11,8 +11,8 @@
 
 #include "ScaleStructure.h"
 
-#include "../lumatone_editor_library/common/math.h"
-#include "../lumatone_editor_library/common/utility.h"
+#include "../../lumatone_editor_library/common/math.h"
+#include "../../lumatone_editor_library/common/utility.h"
 
 ScaleStructure::ScaleStructure()
 {
diff --git a/Source/ScaleStructureController/ScaleStructure.h b/Source/components/scale/ScaleStructure.h
similarity index 99%
rename from Source/ScaleStructureController/ScaleStructure.h
rename to Source/components/scale/ScaleStructure.h
index b0d4a1d1..81ef52ad 100644
--- a/Source/ScaleStructureController/ScaleStructure.h
+++ b/Source/components/scale/ScaleStructure.h
@@ -10,7 +10,7 @@
 
 #pragma once
 #include <JuceHeader.h>
-#include "../lumatone_editor_library/common/data.h"
+#include "../../lumatone_editor_library/common/data.h"
 #include "Symmetry.h"
 
 class ScaleStructure
diff --git a/Source/ScaleStructureController/Symmetry.h b/Source/components/scale/Symmetry.h
similarity index 100%
rename from Source/ScaleStructureController/Symmetry.h
rename to Source/components/scale/Symmetry.h
diff --git a/Source/ScaleStructureController/GroupHandle.cpp b/Source/components/scale/circle/GroupHandle.cpp
similarity index 100%
rename from Source/ScaleStructureController/GroupHandle.cpp
rename to Source/components/scale/circle/GroupHandle.cpp
diff --git a/Source/ScaleStructureController/GroupHandle.h b/Source/components/scale/circle/GroupHandle.h
similarity index 100%
rename from Source/ScaleStructureController/GroupHandle.h
rename to Source/components/scale/circle/GroupHandle.h
diff --git a/Source/ScaleStructureController/GroupingCircle.cpp b/Source/components/scale/circle/GroupingCircle.cpp
similarity index 99%
rename from Source/ScaleStructureController/GroupingCircle.cpp
rename to Source/components/scale/circle/GroupingCircle.cpp
index 52809882..e84266f4 100644
--- a/Source/ScaleStructureController/GroupingCircle.cpp
+++ b/Source/components/scale/circle/GroupingCircle.cpp
@@ -11,7 +11,7 @@
 #include <JuceHeader.h>
 #include "GroupingCircle.h"
 
-#include "../lumatone_editor_library/common/utility.h"
+#include "../../../lumatone_editor_library/common/utility.h"
 
 //==============================================================================
 GroupingCircle::GroupingCircle(const ScaleStructure& structureIn, Array<Colour>& groupColoursIn)
diff --git a/Source/ScaleStructureController/GroupingCircle.h b/Source/components/scale/circle/GroupingCircle.h
similarity index 98%
rename from Source/ScaleStructureController/GroupingCircle.h
rename to Source/components/scale/circle/GroupingCircle.h
index d37aabf1..690ffa0c 100644
--- a/Source/ScaleStructureController/GroupingCircle.h
+++ b/Source/components/scale/circle/GroupingCircle.h
@@ -11,9 +11,9 @@
 #pragma once
 
 #include <JuceHeader.h>
-#include "ScaleStructure.h"
+#include "../ScaleStructure.h"
+#include "../NoteNames.h"
 #include "GroupHandle.h"
-#include "NoteNames.h"
 
 //==============================================================================
 /*
@@ -60,7 +60,7 @@ class GroupingCircle    : public Component
 		virtual ~Listener() {}
 
 		virtual void offsetChanged(int newOffset) = 0;
-		
+
 		virtual void degreeIndexAltered(int degreeIndex, Point<int> alteration) = 0;
 		virtual void allModificationsReset() = 0;
 
@@ -103,7 +103,7 @@ class GroupingCircle    : public Component
 
 	NoteNames* noteNames = nullptr;
 	bool showNoteNameLabels = false;
-	
+
 	// MODMOS functionality
 	int degreeIndexToMod = -1;
 	Array<Point<int>> degreeModCandidates;
@@ -122,12 +122,12 @@ class GroupingCircle    : public Component
 	// Refers to the most counter-clockwise edge of a degree
 	Array<int> highlightedDegreeEdges; // TODO: turn this into Array<Point<int>> to differentiate symmetric edges
 	Array<Line<float>> highlightedEdgeLines;
-		
+
 	const float handleDotAngRatio = MathConstants<float>::pi / 100.0f;
 	float handleDotRadius;
 	float handleHighlightMult = 1.5f;
 	float handlePlacementRadius;
-	
+
 	// Mouse functionality
 	int mouseRadius, mouseDownRadius;
 	int degreeSectorMouseOver = -1;
@@ -181,7 +181,7 @@ class GroupingCircle    : public Component
 private:
 
 	/*
-		Returns the angle of the mouse based on the circle's center, with 0 starting at the counter-clockwise edge 
+		Returns the angle of the mouse based on the circle's center, with 0 starting at the counter-clockwise edge
 		of the first degree group's degree, and moving clockwise.
 	*/
 	float getNormalizedMouseAngle(const MouseEvent& event) const;
diff --git a/Source/ScaleStructureController/NumberSelector.cpp b/Source/components/scale/circle/NumberSelector.cpp
similarity index 100%
rename from Source/ScaleStructureController/NumberSelector.cpp
rename to Source/components/scale/circle/NumberSelector.cpp
diff --git a/Source/ScaleStructureController/NumberSelector.h b/Source/components/scale/circle/NumberSelector.h
similarity index 100%
rename from Source/ScaleStructureController/NumberSelector.h
rename to Source/components/scale/circle/NumberSelector.h
diff --git a/Source/ScaleStructureController/ScaleDesignWindow.cpp b/Source/components/scale/circle/ScaleDesignWindow.cpp
similarity index 100%
rename from Source/ScaleStructureController/ScaleDesignWindow.cpp
rename to Source/components/scale/circle/ScaleDesignWindow.cpp
diff --git a/Source/ScaleStructureController/ScaleDesignWindow.h b/Source/components/scale/circle/ScaleDesignWindow.h
similarity index 100%
rename from Source/ScaleStructureController/ScaleDesignWindow.h
rename to Source/components/scale/circle/ScaleDesignWindow.h
diff --git a/Source/ScaleStructureController/ScaleStructureComponent.cpp b/Source/components/scale/circle/ScaleStructureComponent.cpp
similarity index 99%
rename from Source/ScaleStructureController/ScaleStructureComponent.cpp
rename to Source/components/scale/circle/ScaleStructureComponent.cpp
index 3414ae11..8f5ae179 100644
--- a/Source/ScaleStructureController/ScaleStructureComponent.cpp
+++ b/Source/components/scale/circle/ScaleStructureComponent.cpp
@@ -22,7 +22,7 @@
 
 #include "ScaleStructureComponent.h"
 
-#include "../lumatone_editor_library/common/math.h"
+#include "../../../lumatone_editor_library/common/math.h"
 
 //[MiscUserDefs] You can add your own user definitions and misc code here...
 //[/MiscUserDefs]
diff --git a/Source/ScaleStructureController/ScaleStructureComponent.h b/Source/components/scale/circle/ScaleStructureComponent.h
similarity index 98%
rename from Source/ScaleStructureController/ScaleStructureComponent.h
rename to Source/components/scale/circle/ScaleStructureComponent.h
index 160ac381..2098ba67 100644
--- a/Source/ScaleStructureController/ScaleStructureComponent.h
+++ b/Source/components/scale/circle/ScaleStructureComponent.h
@@ -24,10 +24,10 @@
 
 #include "NumberSelector.h"
 #include "GroupingCircle.h"
-#include "ScaleStructure.h"
+#include "../ScaleStructure.h"
 #include "TransparentDropDown.h"
-#include "NoteNames.h"
-#include "../LumatoneEditorStyleCommon.h"
+#include "../NoteNames.h"
+#include "../../../style/LumatoneEditorStyleCommon.h"
 //[/Headers]
 
 
@@ -181,4 +181,3 @@ class ScaleStructureComponent  : public Component,
 
 //[EndFile] You can add extra defines here...
 //[/EndFile]
-
diff --git a/Source/ScaleStructureController/TransparentDropDown.h b/Source/components/scale/circle/TransparentDropDown.h
similarity index 100%
rename from Source/ScaleStructureController/TransparentDropDown.h
rename to Source/components/scale/circle/TransparentDropDown.h
diff --git a/Source/mapping_editors/CurvesArea.cpp b/Source/components/tables/CurvesArea.cpp
similarity index 98%
rename from Source/mapping_editors/CurvesArea.cpp
rename to Source/components/tables/CurvesArea.cpp
index 6a926bdc..8f0b9f67 100644
--- a/Source/mapping_editors/CurvesArea.cpp
+++ b/Source/components/tables/CurvesArea.cpp
@@ -18,10 +18,10 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "../LumatoneEditorLookAndFeel.h"
+#include "../../style/LumatoneEditorLookAndFeel.h"
 
-#include "../VelocityCurveDlgBase.h"
-#include "../NoteOnOffVelocityCurveDialog.h"
+#include "./VelocityCurveDlgBase.h"
+#include "./NoteOnOffVelocityCurveDialog.h"
 //[/Headers]
 
 #include "CurvesArea.h"
diff --git a/Source/mapping_editors/CurvesArea.h b/Source/components/tables/CurvesArea.h
similarity index 98%
rename from Source/mapping_editors/CurvesArea.h
rename to Source/components/tables/CurvesArea.h
index 535286ee..b179b2d1 100644
--- a/Source/mapping_editors/CurvesArea.h
+++ b/Source/components/tables/CurvesArea.h
@@ -22,7 +22,7 @@
 //[Headers]     -- You can add your own extra header files here --
 #include <JuceHeader.h>
 
-#include "../LumatoneEditorState.h"
+#include "../../data/LumatoneEditorState.h"
 //[/Headers]
 
 
diff --git a/Source/NoteOnOffVelocityCurveDialog.cpp b/Source/components/tables/NoteOnOffVelocityCurveDialog.cpp
similarity index 97%
rename from Source/NoteOnOffVelocityCurveDialog.cpp
rename to Source/components/tables/NoteOnOffVelocityCurveDialog.cpp
index 61d5ecc3..7b56e337 100644
--- a/Source/NoteOnOffVelocityCurveDialog.cpp
+++ b/Source/components/tables/NoteOnOffVelocityCurveDialog.cpp
@@ -1,17 +1,17 @@
-/*
-  ==============================================================================
-
-    NoteOnOffVelocityCurveDialog.cpp
-    Created: 13 Nov 2020 10:20:07pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "NoteOnOffVelocityCurveDialog.h"
-
-//==============================================================================
-NoteOnOffVelocityCurveDialog::NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn)
-    : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::velocityInterval)
-{
-}
+/*
+  ==============================================================================
+
+    NoteOnOffVelocityCurveDialog.cpp
+    Created: 13 Nov 2020 10:20:07pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "NoteOnOffVelocityCurveDialog.h"
+
+//==============================================================================
+NoteOnOffVelocityCurveDialog::NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn)
+    : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::velocityInterval)
+{
+}
diff --git a/Source/NoteOnOffVelocityCurveDialog.h b/Source/components/tables/NoteOnOffVelocityCurveDialog.h
similarity index 96%
rename from Source/NoteOnOffVelocityCurveDialog.h
rename to Source/components/tables/NoteOnOffVelocityCurveDialog.h
index 9dc3a2f2..1ee1ceed 100644
--- a/Source/NoteOnOffVelocityCurveDialog.h
+++ b/Source/components/tables/NoteOnOffVelocityCurveDialog.h
@@ -1,42 +1,42 @@
-/*
-  ==============================================================================
-
-    NoteOnOffVelocityCurveDialog.h
-    Created: 13 Nov 2020 10:20:07pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include "VelocityCurveDlgBase.h"
-
-class LumatoneEditorState;
-
-// Note on/on velocity curve dialog. Horizontal axis stands for ticks
-class NoteOnOffVelocityCurveDialog : public VelocityCurveDlgBase {
-public:
-    NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn);
-};
-
-class FaderVelocityCurveDialog : public VelocityCurveDlgBase {
-public:
-    FaderVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::fader)
-    {
-    }
-};
-
-class AftertouchVelocityCurveDialog : public VelocityCurveDlgBase {
-public:
-    AftertouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::afterTouch)
-    {
-    }
-};
-
-class LumatouchVelocityCurveDialog : public VelocityCurveDlgBase {
-public:
-    LumatouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::lumaTouch)
-    {
-    }
-};
+/*
+  ==============================================================================
+
+    NoteOnOffVelocityCurveDialog.h
+    Created: 13 Nov 2020 10:20:07pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include "VelocityCurveDlgBase.h"
+
+class LumatoneEditorState;
+
+// Note on/on velocity curve dialog. Horizontal axis stands for ticks
+class NoteOnOffVelocityCurveDialog : public VelocityCurveDlgBase {
+public:
+    NoteOnOffVelocityCurveDialog(const LumatoneEditorState& stateIn);
+};
+
+class FaderVelocityCurveDialog : public VelocityCurveDlgBase {
+public:
+    FaderVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::fader)
+    {
+    }
+};
+
+class AftertouchVelocityCurveDialog : public VelocityCurveDlgBase {
+public:
+    AftertouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::afterTouch)
+    {
+    }
+};
+
+class LumatouchVelocityCurveDialog : public VelocityCurveDlgBase {
+public:
+    LumatouchVelocityCurveDialog(const LumatoneEditorState& stateIn) : VelocityCurveDlgBase(stateIn, LumatoneConfigTable::TableType::lumaTouch)
+    {
+    }
+};
diff --git a/Source/VelocityCurveComponents.cpp b/Source/components/tables/VelocityCurveComponents.cpp
similarity index 92%
rename from Source/VelocityCurveComponents.cpp
rename to Source/components/tables/VelocityCurveComponents.cpp
index 534282b2..3200bc38 100644
--- a/Source/VelocityCurveComponents.cpp
+++ b/Source/components/tables/VelocityCurveComponents.cpp
@@ -1,107 +1,107 @@
-/*
-  ==============================================================================
-
-    VelocityCurveComponents.cpp
-    Created: 14 Apr 2019 8:07:49pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "VelocityCurveComponents.h"
-#include "./lumatone_editor_library/graphics/view_constants.h"
-
-/*
-==============================================================================
-VelocityCurveBeam class
-==============================================================================
-*/
-
-VelocityCurveBeam::VelocityCurveBeam()
-{
-	beamValue = 0;
-}
-
-VelocityCurveBeam::~VelocityCurveBeam()
-{
-
-}
-
-void VelocityCurveBeam::setValue(int newValue)
-{
-	if (newValue < 0)
-	{
-		jassertfalse;
-		newValue = 0;
-	}
-
-	if (newValue > 127)
-	{
-		jassertfalse;
-		newValue = 127;
-	}
-
-	if (newValue != beamValue)
-	{
-		beamValue = newValue;
-		repaint();
-	}
-}
-
-void VelocityCurveBeam::setValueAtLeast(int newValue)
-{
-	if (getValue() < newValue)
-		setValue(newValue);
-}
-
-void VelocityCurveBeam::setValueAtMost(int newValue)
-{
-	if (getValue() > newValue)
-		setValue(newValue);
-}
-
-void VelocityCurveBeam::paint(Graphics& g)
-{
-	float w = this->getWidth();
-	float h = this->getHeight();
-	float beamHeight = getBeamHeightFromValue();
-
-	Path rectPath;
-	rectPath.startNewSubPath(0, h);
-	rectPath.lineTo(w, h);
-	rectPath.lineTo(w, h - beamHeight);
-	rectPath.lineTo(0, h - beamHeight);
-	rectPath.closeSubPath();
-
-	g.setColour(findColour(beamColourId));
-	g.fillPath(rectPath);
-}
-
-void VelocityCurveBeam::resized()
-{
-
-}
-
-juce::Point<float> VelocityCurveBeam::getBottomMid()
-{
-	juce::Point<float> pt = this->getBoundsInParent().getBottomLeft().toFloat();
-	pt.addXY(this->getWidth() / 2.0, 0);
-
-	return pt;
-}
-
-float VelocityCurveBeam::getBeamHeightFromValue(int value)
-{
-	return value * this->getHeight() / 128.0f;
-}
-
-int VelocityCurveBeam::getBeamValueFromLocalPoint(juce::Point<float> localPoint)
-{
-    auto val = (getBottom() - localPoint.y) * 128 / getHeight();
-    if (val < 0)
-        return 0;
-    else if (val >= 128)
-        return 127;
-    else
-        return val;
-}
+/*
+  ==============================================================================
+
+    VelocityCurveComponents.cpp
+    Created: 14 Apr 2019 8:07:49pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "VelocityCurveComponents.h"
+#include "../../lumatone_editor_library/graphics/view_constants.h"
+
+/*
+==============================================================================
+VelocityCurveBeam class
+==============================================================================
+*/
+
+VelocityCurveBeam::VelocityCurveBeam()
+{
+	beamValue = 0;
+}
+
+VelocityCurveBeam::~VelocityCurveBeam()
+{
+
+}
+
+void VelocityCurveBeam::setValue(int newValue)
+{
+	if (newValue < 0)
+	{
+		jassertfalse;
+		newValue = 0;
+	}
+
+	if (newValue > 127)
+	{
+		jassertfalse;
+		newValue = 127;
+	}
+
+	if (newValue != beamValue)
+	{
+		beamValue = newValue;
+		repaint();
+	}
+}
+
+void VelocityCurveBeam::setValueAtLeast(int newValue)
+{
+	if (getValue() < newValue)
+		setValue(newValue);
+}
+
+void VelocityCurveBeam::setValueAtMost(int newValue)
+{
+	if (getValue() > newValue)
+		setValue(newValue);
+}
+
+void VelocityCurveBeam::paint(Graphics& g)
+{
+	float w = this->getWidth();
+	float h = this->getHeight();
+	float beamHeight = getBeamHeightFromValue();
+
+	Path rectPath;
+	rectPath.startNewSubPath(0, h);
+	rectPath.lineTo(w, h);
+	rectPath.lineTo(w, h - beamHeight);
+	rectPath.lineTo(0, h - beamHeight);
+	rectPath.closeSubPath();
+
+	g.setColour(findColour(beamColourId));
+	g.fillPath(rectPath);
+}
+
+void VelocityCurveBeam::resized()
+{
+
+}
+
+juce::Point<float> VelocityCurveBeam::getBottomMid()
+{
+	juce::Point<float> pt = this->getBoundsInParent().getBottomLeft().toFloat();
+	pt.addXY(this->getWidth() / 2.0, 0);
+
+	return pt;
+}
+
+float VelocityCurveBeam::getBeamHeightFromValue(int value)
+{
+	return value * this->getHeight() / 128.0f;
+}
+
+int VelocityCurveBeam::getBeamValueFromLocalPoint(juce::Point<float> localPoint)
+{
+    auto val = (getBottom() - localPoint.y) * 128 / getHeight();
+    if (val < 0)
+        return 0;
+    else if (val >= 128)
+        return 127;
+    else
+        return val;
+}
diff --git a/Source/VelocityCurveComponents.h b/Source/components/tables/VelocityCurveComponents.h
similarity index 100%
rename from Source/VelocityCurveComponents.h
rename to Source/components/tables/VelocityCurveComponents.h
diff --git a/Source/VelocityCurveDlgBase.cpp b/Source/components/tables/VelocityCurveDlgBase.cpp
similarity index 95%
rename from Source/VelocityCurveDlgBase.cpp
rename to Source/components/tables/VelocityCurveDlgBase.cpp
index 114d42e1..b6852111 100644
--- a/Source/VelocityCurveDlgBase.cpp
+++ b/Source/components/tables/VelocityCurveDlgBase.cpp
@@ -1,427 +1,427 @@
-/*
-  ==============================================================================
-
-  This is an automatically generated GUI class created by the Projucer!
-
-  Be careful when adding custom code to these files, as only the code within
-  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
-  and re-saved.
-
-  Created with Projucer version: 6.0.7
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-//[Headers] You can add your own extra header files here...
-#include "./lumatone_editor_library/data/lumatone_layout.h"
-#include "./lumatone_editor_library/device/lumatone_controller.h"
-#include "./lumatone_editor_library/graphics/view_constants.h"
-
-#include "LumatoneEditorLookAndFeel.h"
-
-#include "MainComponent.h"
-//[/Headers]
-
-#include "VelocityCurveDlgBase.h"
-
-
-//[MiscUserDefs] You can add your own user definitions and misc code here...
-//[/MiscUserDefs]
-
-//==============================================================================
-VelocityCurveDlgBase::VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue)
-    : LumatoneEditorState("LumatoneConfigTableBase", stateIn)
-	, freeDrawingStrategy(velocityBeamTable)
-    , linearDrawingStrategy(velocityBeamTable)
-    , quadraticDrawingStrategy(velocityBeamTable)
-{
-    //[Constructor_pre] You can add your own custom stuff here..
-	velocityCurveType = typeValue;
-    //[/Constructor_pre]
-
-    cbEditMode.reset (new juce::ComboBox ("cbEditMode"));
-    addAndMakeVisible (cbEditMode.get());
-    cbEditMode->setEditableText (false);
-    cbEditMode->setJustificationType (juce::Justification::centredLeft);
-    cbEditMode->setTextWhenNothingSelected (translate("Draw Mode"));
-    cbEditMode->setTextWhenNoChoicesAvailable (translate("(no choices)"));
-    cbEditMode->addItem (translate("Free"), 1);
-    cbEditMode->addItem (translate("Linear"), 2);
-    cbEditMode->addItem (translate("Quadratic"), 3);
-    cbEditMode->addListener (this);
-
-    cbEditMode->setBounds (8, 8, 296, 24);
-
-
-    //[UserPreSize]
-	cbEditMode->getProperties().set(LumatoneEditorStyleIDs::roundedDiagonalCorners, 0);
-
-    drawingStrategies[LumatoneConfigTable::freeDrawing] = &freeDrawingStrategy;
-	drawingStrategies[LumatoneConfigTable::linearSegments] = &linearDrawingStrategy;
-	drawingStrategies[LumatoneConfigTable::quadraticCurves] = &quadraticDrawingStrategy;
-
-	for (int x = 0; x < 128; x++)
-	{
-		velocityBeamTable[x].reset(new  VelocityCurveBeam());
-		addChildComponent(velocityBeamTable[x].get());
-		velocityBeamTable[x]->addMouseListener(this, true);
-	}
-
-    //[/UserPreSize]
-
-    setSize (320, 160);
-
-
-    //[Constructor] You can add your own custom stuff here..
-
-	// Initialize velocity lookup table
-	for (int x = 0; x < 128; x++)
-		velocityBeamTable[x]->setValue(x);
-
-    //[/Constructor]
-}
-
-VelocityCurveDlgBase::~VelocityCurveDlgBase()
-{
-    //[Destructor_pre]. You can add your own custom destruction code here..
-    for (int x = 0; x < 128; x++) {
-		velocityBeamTable[x] = nullptr;
-	}
-    //[/Destructor_pre]
-
-    cbEditMode = nullptr;
-
-
-    //[Destructor]. You can add your own custom destruction code here..
-	deleteAllChildren();
-    //[/Destructor]
-}
-
-//==============================================================================
-void VelocityCurveDlgBase::paint (juce::Graphics& g)
-{
-    //[UserPrePaint] Add your own custom painting code here..
-    //[/UserPrePaint]
-
-    g.fillAll (juce::Colour (0xffbad0de));
-
-    //[UserPaint] Add your own custom painting code here..
-	g.fillAll(backgroundColour);
-
-	int h = getHeight();
-
-	// Build contour path
-	beamTableContour.clear();
-	beamTableContour.startNewSubPath(0, h);
-
-	for (int x = 0; x < 128; x++)
-		beamTableContour.lineTo(velocityBeamTable[x]->getX(), h - velocityBeamTable[x]->getBeamHeightFromValue());
-
-	beamTableContour.lineTo(getWidth(), h);
-	beamTableContour.closeSubPath();
-
-	// Fill velocity contour
-	g.setGradientFill(beamColourGradient);
-	g.fillPath(beamTableContour);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-	{
-		for (int x = 0; x < 128; x++)
-		{
-			auto beam = velocityBeamTable[x].get();
-			beam->setTooltip(currentDrawingStrategy->getDescriptionText());
-		}
-		currentDrawingStrategy->paint(g, getLookAndFeel());
-	}
-
-	// Draw grid overlay
-	g.setColour(gridColour);
-	g.strokePath(beamTableGrid, PathStrokeType(1.0f));
-    //[/UserPaint]
-}
-
-void VelocityCurveDlgBase::resized()
-{
-    //[UserPreResize] Add your own custom resize code here..
-	int w = this->getWidth();
-	int h = this->getHeight();
-
-	// Grid units
-	float xUnit = w * CURVEGRIDXRESOLUTION;
-	float x = xUnit;
-    //[/UserPreResize]
-
-    //[UserResized] Add your own custom resize handling here..
-
-	cbEditMode->setBounds(0, 0, xUnit * 11, xUnit * 3);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-		currentDrawingStrategy->resized();
-
-	float velocityBeamXPos = 0;
-	for (int x = 0; x < 128; x++)
-	{
-		auto velocityBeamWidth = beamWidth(x);
-		velocityBeamTable[x]->setBounds(velocityBeamXPos, 0, velocityBeamWidth, h);
-		velocityBeamXPos += velocityBeamWidth;
-	}
-
-	// Build grid
-	beamTableGrid.clear();
-	while (x < w)
-	{
-		beamTableGrid.addLineSegment(Line<float>(x, 0, x, (float)h), 0.1f);
-		x += xUnit;
-	}
-
-	float y = h;
-	while (xUnit > 0 && y > 0)
-	{
-		beamTableGrid.addLineSegment(Line<float>(0, y, (float)w, y), 0.1f);
-		y -= xUnit;
-	}
-
-	beamColourGradient.point1 = { 0.0f, (float)h };
-	beamColourGradient.point2 = { velocityBeamXPos, (float)h };
-
-    //[/UserResized]
-}
-
-void VelocityCurveDlgBase::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
-{
-    //[UsercomboBoxChanged_Pre]
-    //[/UsercomboBoxChanged_Pre]
-
-    if (comboBoxThatHasChanged == cbEditMode.get())
-    {
-        //[UserComboBoxCode_cbEditMode] -- add your combo box handling code here..
-		int editModeIndex = cbEditMode->getSelectedItemIndex();
-
-		auto configInEdit = getConfigInEdit();
-		if (configInEdit != nullptr)
-		{
-			// configInEdit->editStrategy = static_cast<LumatoneConfigTable::DrawMode>(editModeIndex); // TODO FIX
-		}
-
-		// Set edit config according to current values of velocity table, of possible
-		auto currentDrawingStrategy = getCurrentDrawingStrategy();
-		if (currentDrawingStrategy != nullptr)
-			currentDrawingStrategy->setEditConfigFromVelocityTable();
-
-		// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-
-		repaint();
-        //[/UserComboBoxCode_cbEditMode]
-    }
-
-    //[UsercomboBoxChanged_Post]
-    //[/UsercomboBoxChanged_Post]
-}
-
-void VelocityCurveDlgBase::lookAndFeelChanged()
-{
-    //[UserCode_lookAndFeelChanged] -- Add your code here...
-	beamColourGradient.clearColours();
-	beamColourGradient.addColour(0.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMin));
-	beamColourGradient.addColour(1.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMax));
-
-	backgroundColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground);
-	gridColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGridColour);
-
-	cbEditMode->setColour(ComboBox::ColourIds::backgroundColourId, Colours::black);
-	cbEditMode->setColour(ComboBox::ColourIds::textColourId, Colours::white);
-}
-
-void VelocityCurveDlgBase::loadFromMapping()
-{
-	auto defaultConfig = LumatoneConfigTable(velocityCurveType);
-	auto configInEdit = getConfigInEdit();
-	if (configInEdit == nullptr)
-		configInEdit = &defaultConfig;
-
-	if (configInEdit != nullptr)
-	{
-		cbEditMode->setSelectedItemIndex(configInEdit->editStrategy, juce::NotificationType::dontSendNotification);
-	}
-	else
-	{
-		cbEditMode->setSelectedItemIndex(LumatoneConfigTable::DrawMode::none, juce::NotificationType::dontSendNotification);
-	}
-
-	// Set edit config according to current values of velocity table, if possible
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-	{
-		currentDrawingStrategy->setEditConfig(configInEdit->velocityValues);
-	}
-	else
-	{
-		// Initialize velocity lookup table
-		for (int x = 0; x < 128; x++)
-			velocityBeamTable[x]->setValue(x);
-	}
-
-	repaint();
-	//[/UserCode_lookAndFeelChanged]
-}
-
-
-
-//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
-
-void VelocityCurveDlgBase::paintOverChildren(juce::Graphics& g)
-{
-	//int roundedCornerSize = getParentHeight() * ROUNDEDCORNERTOAPPHEIGHT;
-	//Rectangle<float> controlsBounds = getLocalBounds().toFloat().reduced(roundedCornerSize);
-	//g.setColour(Colour(0xff272b2f));
-	//g.drawRoundedRectangle(controlsBounds, roundedCornerSize, 4.0f);
-}
-
-void VelocityCurveDlgBase::sendVelocityTableToController()
-{
-	int velocityValues[128];
-	LumatoneConfigTable table(LumatoneConfigTable::TableType::velocityInterval);
-
-	for (int x = 0; x < 128; x++)
-	{
-		//velocityValues[x] = velocityBeamTable[x]->getValue();
-		table.velocityValues[x] = velocityBeamTable[x]->getValue();
-	}
-
-	setConfigTable(velocityCurveType, table);
-}
-
-void VelocityCurveDlgBase::mouseMove(const MouseEvent &event)
-{
-	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr && currentDrawingStrategy->mouseMove(event, localPoint))
-		repaint();
-}
-
-void VelocityCurveDlgBase::mouseDown(const MouseEvent &event)
-{
-	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-	{
-		if (currentDrawingStrategy->mouseDown(event, localPoint))
-		{
-			repaint();
-		}
-	}
-}
-
-void VelocityCurveDlgBase::mouseDrag(const MouseEvent &event)
-{
-	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-	{
-		if (currentDrawingStrategy->mouseDrag(event, localPoint))
-		{
-			repaint();
-		}
-	}
-}
-
-void VelocityCurveDlgBase::mouseUp(const MouseEvent &event)
-{
-	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
-
-	auto currentDrawingStrategy = getCurrentDrawingStrategy();
-	if (currentDrawingStrategy != nullptr)
-	{
-		currentDrawingStrategy->mouseUp(event, localPoint);
-
-		auto configInEdit = getConfigInEdit();
-		if (configInEdit != nullptr)
-		{
-			// currentDrawingStrategy->exportEditConfig(configInEdit->velocityValues);
-			// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
-			sendVelocityTableToController();
-		}
-	}
-
-	repaint();
-}
-
-// LumatoneLayout*	VelocityCurveDlgBase::getMappingInEdit()
-// {
-// 	// Security at start of program
-// 	if (getParentComponent() == nullptr)
-// 		return nullptr;
-// 	if (getParentComponent()->getParentComponent() == nullptr)
-// 		return nullptr;
-// 	if (getParentComponent()->getParentComponent()->getParentComponent() == nullptr)
-// 		return nullptr;
-
-// 	return &(dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent()))->getMappingInEdit();
-// }
-
-const LumatoneConfigTable* VelocityCurveDlgBase::getConfigInEdit() const
-{
-	// auto mappingInEdit = getMappingInEdit();
-	// if(mappingInEdit == nullptr)
-		// return nullptr;
-
-	return getMappingData()->getConfigTable(velocityCurveType);
-}
-
-VelocityCurveEditStrategyBase* VelocityCurveDlgBase::getCurrentDrawingStrategy()
-{
-	auto configInEdit = getConfigInEdit();
-	if (configInEdit == nullptr)
-		return nullptr;
-
-	auto strategyItr = drawingStrategies.find(configInEdit->editStrategy);
-	if (strategyItr == drawingStrategies.end())
-		return nullptr;
-
-	return strategyItr->second;
-}
-
-//[/MiscUserCode]
-
-
-//==============================================================================
-#if 0
-/*  -- Projucer information section --
-
-    This is where the Projucer stores the metadata that describe this GUI layout, so
-    make changes in here at your peril!
-
-BEGIN_JUCER_METADATA
-
-<JUCER_COMPONENT documentType="Component" className="VelocityCurveDlgBase" componentName=""
-                 parentClasses="public Component" constructorParams="LumatoneConfigTable::TableType typeValue"
-                 variableInitialisers="freeDrawingStrategy(velocityBeamTable)&#10;linearDrawingStrategy(velocityBeamTable)&#10;quadraticDrawingStrategy(velocityBeamTable)"
-                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
-                 fixedSize="1" initialWidth="320" initialHeight="160">
-  <METHODS>
-    <METHOD name="lookAndFeelChanged()"/>
-  </METHODS>
-  <BACKGROUND backgroundColour="ffbad0de"/>
-  <COMBOBOX name="cbEditMode" id="1f22301dd42b968e" memberName="cbEditMode"
-            virtualName="" explicitFocusOrder="0" pos="8 8 296 24" editable="0"
-            layout="33" items="Free drawing&#10;Linear&#10;Quadratic" textWhenNonSelected="Select drawing mode"
-            textWhenNoItems="(no choices)"/>
-</JUCER_COMPONENT>
-
-END_JUCER_METADATA
-*/
-#endif
-
-
-//[EndFile] You can add extra defines here...
-//[/EndFile]
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 6.0.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+//[Headers] You can add your own extra header files here...
+#include "../../lumatone_editor_library/data/lumatone_layout.h"
+#include "../../lumatone_editor_library/device/lumatone_controller.h"
+#include "../../lumatone_editor_library/graphics/view_constants.h"
+
+#include "../../style/LumatoneEditorLookAndFeel.h"
+
+// #include "../../MainComponent.h"
+//[/Headers]
+
+#include "VelocityCurveDlgBase.h"
+
+
+//[MiscUserDefs] You can add your own user definitions and misc code here...
+//[/MiscUserDefs]
+
+//==============================================================================
+VelocityCurveDlgBase::VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue)
+    : LumatoneEditorState("LumatoneConfigTableBase", stateIn)
+	, freeDrawingStrategy(velocityBeamTable)
+    , linearDrawingStrategy(velocityBeamTable)
+    , quadraticDrawingStrategy(velocityBeamTable)
+{
+    //[Constructor_pre] You can add your own custom stuff here..
+	velocityCurveType = typeValue;
+    //[/Constructor_pre]
+
+    cbEditMode.reset (new juce::ComboBox ("cbEditMode"));
+    addAndMakeVisible (cbEditMode.get());
+    cbEditMode->setEditableText (false);
+    cbEditMode->setJustificationType (juce::Justification::centredLeft);
+    cbEditMode->setTextWhenNothingSelected (translate("Draw Mode"));
+    cbEditMode->setTextWhenNoChoicesAvailable (translate("(no choices)"));
+    cbEditMode->addItem (translate("Free"), 1);
+    cbEditMode->addItem (translate("Linear"), 2);
+    cbEditMode->addItem (translate("Quadratic"), 3);
+    cbEditMode->addListener (this);
+
+    cbEditMode->setBounds (8, 8, 296, 24);
+
+
+    //[UserPreSize]
+	cbEditMode->getProperties().set(LumatoneEditorStyleIDs::roundedDiagonalCorners, 0);
+
+    drawingStrategies[LumatoneConfigTable::freeDrawing] = &freeDrawingStrategy;
+	drawingStrategies[LumatoneConfigTable::linearSegments] = &linearDrawingStrategy;
+	drawingStrategies[LumatoneConfigTable::quadraticCurves] = &quadraticDrawingStrategy;
+
+	for (int x = 0; x < 128; x++)
+	{
+		velocityBeamTable[x].reset(new  VelocityCurveBeam());
+		addChildComponent(velocityBeamTable[x].get());
+		velocityBeamTable[x]->addMouseListener(this, true);
+	}
+
+    //[/UserPreSize]
+
+    setSize (320, 160);
+
+
+    //[Constructor] You can add your own custom stuff here..
+
+	// Initialize velocity lookup table
+	for (int x = 0; x < 128; x++)
+		velocityBeamTable[x]->setValue(x);
+
+    //[/Constructor]
+}
+
+VelocityCurveDlgBase::~VelocityCurveDlgBase()
+{
+    //[Destructor_pre]. You can add your own custom destruction code here..
+    for (int x = 0; x < 128; x++) {
+		velocityBeamTable[x] = nullptr;
+	}
+    //[/Destructor_pre]
+
+    cbEditMode = nullptr;
+
+
+    //[Destructor]. You can add your own custom destruction code here..
+	deleteAllChildren();
+    //[/Destructor]
+}
+
+//==============================================================================
+void VelocityCurveDlgBase::paint (juce::Graphics& g)
+{
+    //[UserPrePaint] Add your own custom painting code here..
+    //[/UserPrePaint]
+
+    g.fillAll (juce::Colour (0xffbad0de));
+
+    //[UserPaint] Add your own custom painting code here..
+	g.fillAll(backgroundColour);
+
+	int h = getHeight();
+
+	// Build contour path
+	beamTableContour.clear();
+	beamTableContour.startNewSubPath(0, h);
+
+	for (int x = 0; x < 128; x++)
+		beamTableContour.lineTo(velocityBeamTable[x]->getX(), h - velocityBeamTable[x]->getBeamHeightFromValue());
+
+	beamTableContour.lineTo(getWidth(), h);
+	beamTableContour.closeSubPath();
+
+	// Fill velocity contour
+	g.setGradientFill(beamColourGradient);
+	g.fillPath(beamTableContour);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+	{
+		for (int x = 0; x < 128; x++)
+		{
+			auto beam = velocityBeamTable[x].get();
+			beam->setTooltip(currentDrawingStrategy->getDescriptionText());
+		}
+		currentDrawingStrategy->paint(g, getLookAndFeel());
+	}
+
+	// Draw grid overlay
+	g.setColour(gridColour);
+	g.strokePath(beamTableGrid, PathStrokeType(1.0f));
+    //[/UserPaint]
+}
+
+void VelocityCurveDlgBase::resized()
+{
+    //[UserPreResize] Add your own custom resize code here..
+	int w = this->getWidth();
+	int h = this->getHeight();
+
+	// Grid units
+	float xUnit = w * CURVEGRIDXRESOLUTION;
+	float x = xUnit;
+    //[/UserPreResize]
+
+    //[UserResized] Add your own custom resize handling here..
+
+	cbEditMode->setBounds(0, 0, xUnit * 11, xUnit * 3);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+		currentDrawingStrategy->resized();
+
+	float velocityBeamXPos = 0;
+	for (int x = 0; x < 128; x++)
+	{
+		auto velocityBeamWidth = beamWidth(x);
+		velocityBeamTable[x]->setBounds(velocityBeamXPos, 0, velocityBeamWidth, h);
+		velocityBeamXPos += velocityBeamWidth;
+	}
+
+	// Build grid
+	beamTableGrid.clear();
+	while (x < w)
+	{
+		beamTableGrid.addLineSegment(Line<float>(x, 0, x, (float)h), 0.1f);
+		x += xUnit;
+	}
+
+	float y = h;
+	while (xUnit > 0 && y > 0)
+	{
+		beamTableGrid.addLineSegment(Line<float>(0, y, (float)w, y), 0.1f);
+		y -= xUnit;
+	}
+
+	beamColourGradient.point1 = { 0.0f, (float)h };
+	beamColourGradient.point2 = { velocityBeamXPos, (float)h };
+
+    //[/UserResized]
+}
+
+void VelocityCurveDlgBase::comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged)
+{
+    //[UsercomboBoxChanged_Pre]
+    //[/UsercomboBoxChanged_Pre]
+
+    if (comboBoxThatHasChanged == cbEditMode.get())
+    {
+        //[UserComboBoxCode_cbEditMode] -- add your combo box handling code here..
+		int editModeIndex = cbEditMode->getSelectedItemIndex();
+
+		auto configInEdit = getConfigInEdit();
+		if (configInEdit != nullptr)
+		{
+			// configInEdit->editStrategy = static_cast<LumatoneConfigTable::DrawMode>(editModeIndex); // TODO FIX
+		}
+
+		// Set edit config according to current values of velocity table, of possible
+		auto currentDrawingStrategy = getCurrentDrawingStrategy();
+		if (currentDrawingStrategy != nullptr)
+			currentDrawingStrategy->setEditConfigFromVelocityTable();
+
+		// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+
+		repaint();
+        //[/UserComboBoxCode_cbEditMode]
+    }
+
+    //[UsercomboBoxChanged_Post]
+    //[/UsercomboBoxChanged_Post]
+}
+
+void VelocityCurveDlgBase::lookAndFeelChanged()
+{
+    //[UserCode_lookAndFeelChanged] -- Add your code here...
+	beamColourGradient.clearColours();
+	beamColourGradient.addColour(0.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMin));
+	beamColourGradient.addColour(1.0, getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGradientMax));
+
+	backgroundColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::ControlBoxBackground);
+	gridColour = getEditorLookAndFeel().findColour(LumatoneEditorColourIDs::CurveGridColour);
+
+	cbEditMode->setColour(ComboBox::ColourIds::backgroundColourId, Colours::black);
+	cbEditMode->setColour(ComboBox::ColourIds::textColourId, Colours::white);
+}
+
+void VelocityCurveDlgBase::loadFromMapping()
+{
+	auto defaultConfig = LumatoneConfigTable(velocityCurveType);
+	auto configInEdit = getConfigInEdit();
+	if (configInEdit == nullptr)
+		configInEdit = &defaultConfig;
+
+	if (configInEdit != nullptr)
+	{
+		cbEditMode->setSelectedItemIndex(configInEdit->editStrategy, juce::NotificationType::dontSendNotification);
+	}
+	else
+	{
+		cbEditMode->setSelectedItemIndex(LumatoneConfigTable::DrawMode::none, juce::NotificationType::dontSendNotification);
+	}
+
+	// Set edit config according to current values of velocity table, if possible
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+	{
+		currentDrawingStrategy->setEditConfig(configInEdit->velocityValues);
+	}
+	else
+	{
+		// Initialize velocity lookup table
+		for (int x = 0; x < 128; x++)
+			velocityBeamTable[x]->setValue(x);
+	}
+
+	repaint();
+	//[/UserCode_lookAndFeelChanged]
+}
+
+
+
+//[MiscUserCode] You can add your own definitions of your custom methods or any other code here...
+
+void VelocityCurveDlgBase::paintOverChildren(juce::Graphics& g)
+{
+	//int roundedCornerSize = getParentHeight() * ROUNDEDCORNERTOAPPHEIGHT;
+	//Rectangle<float> controlsBounds = getLocalBounds().toFloat().reduced(roundedCornerSize);
+	//g.setColour(Colour(0xff272b2f));
+	//g.drawRoundedRectangle(controlsBounds, roundedCornerSize, 4.0f);
+}
+
+void VelocityCurveDlgBase::sendVelocityTableToController()
+{
+	int velocityValues[128];
+	LumatoneConfigTable table(LumatoneConfigTable::TableType::velocityInterval);
+
+	for (int x = 0; x < 128; x++)
+	{
+		//velocityValues[x] = velocityBeamTable[x]->getValue();
+		table.velocityValues[x] = velocityBeamTable[x]->getValue();
+	}
+
+	setConfigTable(velocityCurveType, table);
+}
+
+void VelocityCurveDlgBase::mouseMove(const MouseEvent &event)
+{
+	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr && currentDrawingStrategy->mouseMove(event, localPoint))
+		repaint();
+}
+
+void VelocityCurveDlgBase::mouseDown(const MouseEvent &event)
+{
+	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+	{
+		if (currentDrawingStrategy->mouseDown(event, localPoint))
+		{
+			repaint();
+		}
+	}
+}
+
+void VelocityCurveDlgBase::mouseDrag(const MouseEvent &event)
+{
+	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+	{
+		if (currentDrawingStrategy->mouseDrag(event, localPoint))
+		{
+			repaint();
+		}
+	}
+}
+
+void VelocityCurveDlgBase::mouseUp(const MouseEvent &event)
+{
+	juce::Point<float> localPoint = getLocalPoint(event.eventComponent, event.position);
+
+	auto currentDrawingStrategy = getCurrentDrawingStrategy();
+	if (currentDrawingStrategy != nullptr)
+	{
+		currentDrawingStrategy->mouseUp(event, localPoint);
+
+		auto configInEdit = getConfigInEdit();
+		if (configInEdit != nullptr)
+		{
+			// currentDrawingStrategy->exportEditConfig(configInEdit->velocityValues);
+			// TerpstraSysExApplication::getApp().setHasChangesToSave(true);
+			sendVelocityTableToController();
+		}
+	}
+
+	repaint();
+}
+
+// LumatoneLayout*	VelocityCurveDlgBase::getMappingInEdit()
+// {
+// 	// Security at start of program
+// 	if (getParentComponent() == nullptr)
+// 		return nullptr;
+// 	if (getParentComponent()->getParentComponent() == nullptr)
+// 		return nullptr;
+// 	if (getParentComponent()->getParentComponent()->getParentComponent() == nullptr)
+// 		return nullptr;
+
+// 	return &(dynamic_cast<MainContentComponent*>(getParentComponent()->getParentComponent()->getParentComponent()))->getMappingInEdit();
+// }
+
+const LumatoneConfigTable* VelocityCurveDlgBase::getConfigInEdit() const
+{
+	// auto mappingInEdit = getMappingInEdit();
+	// if(mappingInEdit == nullptr)
+		// return nullptr;
+
+	return getMappingData()->getConfigTable(velocityCurveType);
+}
+
+VelocityCurveEditStrategyBase* VelocityCurveDlgBase::getCurrentDrawingStrategy()
+{
+	auto configInEdit = getConfigInEdit();
+	if (configInEdit == nullptr)
+		return nullptr;
+
+	auto strategyItr = drawingStrategies.find(configInEdit->editStrategy);
+	if (strategyItr == drawingStrategies.end())
+		return nullptr;
+
+	return strategyItr->second;
+}
+
+//[/MiscUserCode]
+
+
+//==============================================================================
+#if 0
+/*  -- Projucer information section --
+
+    This is where the Projucer stores the metadata that describe this GUI layout, so
+    make changes in here at your peril!
+
+BEGIN_JUCER_METADATA
+
+<JUCER_COMPONENT documentType="Component" className="VelocityCurveDlgBase" componentName=""
+                 parentClasses="public Component" constructorParams="LumatoneConfigTable::TableType typeValue"
+                 variableInitialisers="freeDrawingStrategy(velocityBeamTable)&#10;linearDrawingStrategy(velocityBeamTable)&#10;quadraticDrawingStrategy(velocityBeamTable)"
+                 snapPixels="8" snapActive="1" snapShown="1" overlayOpacity="0.330"
+                 fixedSize="1" initialWidth="320" initialHeight="160">
+  <METHODS>
+    <METHOD name="lookAndFeelChanged()"/>
+  </METHODS>
+  <BACKGROUND backgroundColour="ffbad0de"/>
+  <COMBOBOX name="cbEditMode" id="1f22301dd42b968e" memberName="cbEditMode"
+            virtualName="" explicitFocusOrder="0" pos="8 8 296 24" editable="0"
+            layout="33" items="Free drawing&#10;Linear&#10;Quadratic" textWhenNonSelected="Select drawing mode"
+            textWhenNoItems="(no choices)"/>
+</JUCER_COMPONENT>
+
+END_JUCER_METADATA
+*/
+#endif
+
+
+//[EndFile] You can add extra defines here...
+//[/EndFile]
diff --git a/Source/VelocityCurveDlgBase.h b/Source/components/tables/VelocityCurveDlgBase.h
similarity index 96%
rename from Source/VelocityCurveDlgBase.h
rename to Source/components/tables/VelocityCurveDlgBase.h
index 218dec9a..f695547f 100644
--- a/Source/VelocityCurveDlgBase.h
+++ b/Source/components/tables/VelocityCurveDlgBase.h
@@ -1,116 +1,116 @@
-/*
-  ==============================================================================
-
-  This is an automatically generated GUI class created by the Projucer!
-
-  Be careful when adding custom code to these files, as only the code within
-  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
-  and re-saved.
-
-  Created with Projucer version: 6.0.7
-
-  ------------------------------------------------------------------------------
-
-  The Projucer is part of the JUCE library.
-  Copyright (c) 2020 - Raw Material Software Limited.
-
-  ==============================================================================
-*/
-
-#pragma once
-
-//[Headers]     -- You can add your own extra header files here --
-#include <JuceHeader.h>
-
-#include "VelocityCurveComponents.h"
-#include "VelocityCurveEditStrategy.h"
-
-#include "LumatoneEditorState.h"
-
-class LumatoneLayout;
-class LumatoneConfigTable;
-
-//[/Headers]
-
-
-
-//==============================================================================
-/**
-                                                                    //[Comments]
-An auto-generated component, created by the Projucer.
-
-Describe your class and how it works here!
-                                                                    //[/Comments]
-*/
-class VelocityCurveDlgBase  : public Component,
-                              public LumatoneEditorState,
-                              public juce::ComboBox::Listener
-{
-public:
-    //==============================================================================
-    VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue);
-    ~VelocityCurveDlgBase() override;
-
-    //==============================================================================
-    //[UserMethods]     -- You can add your own custom methods in this section.
-
-	// New mapping is loaded. Display data.
-	void loadFromMapping();
-
-	virtual void sendVelocityTableToController();
-
-	void mouseMove(const juce::MouseEvent &event);
-	void mouseDown(const juce::MouseEvent &event);
-	void mouseDrag(const juce::MouseEvent &event);
-	void mouseUp(const juce::MouseEvent &event);
-
-protected:
-	virtual float beamWidth(int xPos) { return getWidth() / 128.0f; }
-
-	// LumatoneLayout*	getMappingInEdit();
-	const LumatoneConfigTable* getConfigInEdit() const;
-	VelocityCurveEditStrategyBase* getCurrentDrawingStrategy();
-
-public:
-    void paintOverChildren(juce::Graphics& g) override;
-    //[/UserMethods]
-
-    void paint (juce::Graphics& g) override;
-    void resized() override;
-    void comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged) override;
-    void lookAndFeelChanged() override;
-
-
-
-private:
-    //[UserVariables]   -- You can add your own custom variables in this section.
-	LumatoneConfigTable::TableType velocityCurveType;
-	//Path beamTableFrame;
-    juce::Path beamTableContour;
-    juce::Path beamTableGrid;
-	std::unique_ptr<VelocityCurveBeam> velocityBeamTable[128];
-
-	VelocityCurveFreeDrawingStrategy freeDrawingStrategy;
-	VelocityCurveLinearDrawingStrategy linearDrawingStrategy;
-	VelocityCurveQuadraticDrawingStrategy quadraticDrawingStrategy;
-
-	std::map<LumatoneConfigTable::DrawMode, VelocityCurveEditStrategyBase*> drawingStrategies;
-
-    juce::ColourGradient beamColourGradient;
-    juce::Colour backgroundColour;
-    juce::Colour gridColour;
-
-protected:
-    //[/UserVariables]
-
-    //==============================================================================
-    std::unique_ptr<juce::ComboBox> cbEditMode;
-
-
-    //==============================================================================
-    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (VelocityCurveDlgBase)
-};
-
-//[EndFile] You can add extra defines here...
-
-//[/EndFile]
+/*
+  ==============================================================================
+
+  This is an automatically generated GUI class created by the Projucer!
+
+  Be careful when adding custom code to these files, as only the code within
+  the "//[xyz]" and "//[/xyz]" sections will be retained when the file is loaded
+  and re-saved.
+
+  Created with Projucer version: 6.0.7
+
+  ------------------------------------------------------------------------------
+
+  The Projucer is part of the JUCE library.
+  Copyright (c) 2020 - Raw Material Software Limited.
+
+  ==============================================================================
+*/
+
+#pragma once
+
+//[Headers]     -- You can add your own extra header files here --
+#include <JuceHeader.h>
+
+#include "VelocityCurveComponents.h"
+#include "VelocityCurveEditStrategy.h"
+
+#include "../../data/LumatoneEditorState.h"
+
+class LumatoneLayout;
+class LumatoneConfigTable;
+
+//[/Headers]
+
+
+
+//==============================================================================
+/**
+                                                                    //[Comments]
+An auto-generated component, created by the Projucer.
+
+Describe your class and how it works here!
+                                                                    //[/Comments]
+*/
+class VelocityCurveDlgBase  : public Component,
+                              public LumatoneEditorState,
+                              public juce::ComboBox::Listener
+{
+public:
+    //==============================================================================
+    VelocityCurveDlgBase (const LumatoneEditorState& stateIn, LumatoneConfigTable::TableType typeValue);
+    ~VelocityCurveDlgBase() override;
+
+    //==============================================================================
+    //[UserMethods]     -- You can add your own custom methods in this section.
+
+	// New mapping is loaded. Display data.
+	void loadFromMapping();
+
+	virtual void sendVelocityTableToController();
+
+	void mouseMove(const juce::MouseEvent &event);
+	void mouseDown(const juce::MouseEvent &event);
+	void mouseDrag(const juce::MouseEvent &event);
+	void mouseUp(const juce::MouseEvent &event);
+
+protected:
+	virtual float beamWidth(int xPos) { return getWidth() / 128.0f; }
+
+	// LumatoneLayout*	getMappingInEdit();
+	const LumatoneConfigTable* getConfigInEdit() const;
+	VelocityCurveEditStrategyBase* getCurrentDrawingStrategy();
+
+public:
+    void paintOverChildren(juce::Graphics& g) override;
+    //[/UserMethods]
+
+    void paint (juce::Graphics& g) override;
+    void resized() override;
+    void comboBoxChanged (juce::ComboBox* comboBoxThatHasChanged) override;
+    void lookAndFeelChanged() override;
+
+
+
+private:
+    //[UserVariables]   -- You can add your own custom variables in this section.
+	LumatoneConfigTable::TableType velocityCurveType;
+	//Path beamTableFrame;
+    juce::Path beamTableContour;
+    juce::Path beamTableGrid;
+	std::unique_ptr<VelocityCurveBeam> velocityBeamTable[128];
+
+	VelocityCurveFreeDrawingStrategy freeDrawingStrategy;
+	VelocityCurveLinearDrawingStrategy linearDrawingStrategy;
+	VelocityCurveQuadraticDrawingStrategy quadraticDrawingStrategy;
+
+	std::map<LumatoneConfigTable::DrawMode, VelocityCurveEditStrategyBase*> drawingStrategies;
+
+    juce::ColourGradient beamColourGradient;
+    juce::Colour backgroundColour;
+    juce::Colour gridColour;
+
+protected:
+    //[/UserVariables]
+
+    //==============================================================================
+    std::unique_ptr<juce::ComboBox> cbEditMode;
+
+
+    //==============================================================================
+    JUCE_DECLARE_NON_COPYABLE_WITH_LEAK_DETECTOR (VelocityCurveDlgBase)
+};
+
+//[EndFile] You can add extra defines here...
+
+//[/EndFile]
diff --git a/Source/VelocityCurveEditStrategy.cpp b/Source/components/tables/VelocityCurveEditStrategy.cpp
similarity index 96%
rename from Source/VelocityCurveEditStrategy.cpp
rename to Source/components/tables/VelocityCurveEditStrategy.cpp
index 59b50d95..847d20d5 100644
--- a/Source/VelocityCurveEditStrategy.cpp
+++ b/Source/components/tables/VelocityCurveEditStrategy.cpp
@@ -1,537 +1,537 @@
-/*
-  ==============================================================================
-
-    VelocityCurveEditStrategy.cpp
-    Created: 10 Apr 2019 9:54:14pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#include "VelocityCurveEditStrategy.h"
-
-/*
-==============================================================================
-VelocityCurveEditStrategyBase class
-==============================================================================
-*/
-
-VelocityCurveEditStrategyBase::VelocityCurveEditStrategyBase(
-    //Path& beamTableFrameRef,
-    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
-	: /*beamTableFrame(beamTableFrameRef), */velocityBeamTable(velocityBeamTablePtr)
-{
-}
-
-/*
-==============================================================================
-VelocityCurveFreeDrawingStrategy class
-==============================================================================
-*/
-
-VelocityCurveFreeDrawingStrategy::VelocityCurveFreeDrawingStrategy(
-    //Path& beamTableFrameRef,
-    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
-	: VelocityCurveEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
-{
-}
-
-bool VelocityCurveFreeDrawingStrategy::setEditConfig(const int velocityTableValues[])
-{
-	for (int x = 0; x < 128; x++)
-		velocityBeamTable[x]->setValue(velocityTableValues[x]);
-
-	return true;
-}
-
-bool VelocityCurveFreeDrawingStrategy::exportEditConfig(int velocityTableValues[])
-{
-	for (int x = 0; x < 128; x++)
-		velocityTableValues[x] = velocityBeamTable[x]->getValue();
-
-	return true;
-}
-
-void VelocityCurveFreeDrawingStrategy::paint(Graphics& g, LookAndFeel& lookAndFeel)
-{
-	if (!drawedLine.isEmpty())
-		g.strokePath(drawedLine, PathStrokeType(1.000f));
-}
-
-void VelocityCurveFreeDrawingStrategy::resized()
-{
-	drawedLine.clear();
-}
-
-bool VelocityCurveFreeDrawingStrategy::mouseDown(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	drawedLine.clear();
-	//if (beamTableFrame.contains(localPoint))
-	//{
-		drawedLine.startNewSubPath(localPoint.x, localPoint.y);
-
-		for (int x = 0; x < 128; x++)
-		{
-			Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
-			if (beamRect.contains((int)localPoint.x, (int)localPoint.y))
-			{
-				int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(localPoint);
-				velocityBeamTable[x]->setValue(newBeamValue);
-
-				// Change other beams' values so curve stays monotonous
-				for (int x2 = 0; x2 < x; x2++)
-					velocityBeamTable[x2]->setValueAtMost(newBeamValue);
-
-				for (int x2 = x + 1; x2 < 128; x2++)
-					velocityBeamTable[x2]->setValueAtLeast(newBeamValue);
-
-				return true;
-			}
-		}
-	//}
-
-	return false;
-
-}
-
-bool VelocityCurveFreeDrawingStrategy::mouseDrag(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	for (int x = 0; x < 128; x++)
-	{
-		Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
-		if (beamRect.contains((int)localPoint.x, (int)localPoint.y))
-		{
-			drawedLine.lineTo(localPoint);
-
-			int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(localPoint);
-			velocityBeamTable[x]->setValue(newBeamValue);
-
-			// Change other beams' values so curve stays monotonous
-			for (int x2 = 0; x2 < x; x2++)
-				velocityBeamTable[x2]->setValueAtMost(newBeamValue);
-
-			for (int x2 = x + 1; x2 < 128; x2++)
-				velocityBeamTable[x2]->setValueAtLeast(newBeamValue);
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void VelocityCurveFreeDrawingStrategy::mouseUp(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	drawedLine.clear();
-}
-
-/*
-==============================================================================
-VelocityCurveSegmentEditStrategyBase class
-==============================================================================
-*/
-
-VelocityCurveSegmentEditStrategyBase::VelocityCurveSegmentEditStrategyBase(
-    //Path& beamTableFrameRef,
-    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
-	: VelocityCurveEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
-	, mouseXPosition(-1), draggedOriginalXPosition(-1)
-{
-	fixPointBeamHeights[0] = 0;
-
-	for (int x = 1; x < 127; x++)
-		fixPointBeamHeights[x] = -1;
-
-	fixPointBeamHeights[127] = 127;
-}
-
-bool VelocityCurveSegmentEditStrategyBase::setEditConfig(const int velocityTableValues[])
-{
-	for (int x = 0; x < 128; x++)
-		fixPointBeamHeights[x] = velocityTableValues[x];
-
-	setVelocityTableValuesFromEditConfig();
-	return true;
-}
-
-bool VelocityCurveSegmentEditStrategyBase::exportEditConfig(int velocityTableValues[])
-{
-	for (int x = 0; x < 128; x++)
-		velocityTableValues[x] = fixPointBeamHeights[x];
-
-	return true;
-}
-
-void VelocityCurveSegmentEditStrategyBase::paint(Graphics& g, LookAndFeel& lookAndFeel)
-{
-	drawCurve(g, lookAndFeel);
-
-	// Segment points
-	drawSegmentPoints(g, lookAndFeel);
-}
-
-bool VelocityCurveSegmentEditStrategyBase::mouseMove(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	int newMouseXPosition = -1;
-	for (int x = 0; x < 128; x++)
-	{
-		Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
-		if (beamRect.contains(localPoint.toInt()))
-		{
-			newMouseXPosition = x;
-			break;
-		}
-	}
-
-	if (newMouseXPosition != mouseXPosition)
-	{
-		mouseXPosition = newMouseXPosition;
-		return true;
-	}
-	else
-		return false;
-}
-
-bool VelocityCurveSegmentEditStrategyBase::mouseDown(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	if (event.mods.isLeftButtonDown())
-	{
-		// Start position to drag
-		draggedOriginalXPosition = mouseXPosition;
-
-		if (draggedOriginalXPosition >= 0)
-		{
-		    minDragXPosition = draggedOriginalXPosition;
-            maxDragXPosition = draggedOriginalXPosition;
-
-			// First and last position cannot be dragged horizontally
-			if (draggedOriginalXPosition > 0 && draggedOriginalXPosition < 127)
-			{
-				// Dragging possible until next line point
-				for (int x = draggedOriginalXPosition - 1; x > 0 && fixPointBeamHeights[x] == -1; x--)
-					minDragXPosition = x;
-
-				for (int x2 = draggedOriginalXPosition + 1; x2 < 127 && fixPointBeamHeights[x2] == -1; x2++)
-					maxDragXPosition = x2;
-			}
-
-			fixPointBeamHeights[draggedOriginalXPosition] = velocityBeamTable[draggedOriginalXPosition]->getBeamValueFromLocalPoint(localPoint);
-			return true;
-		}
-	}
-	else if (event.mods.isRightButtonDown())
-	{
-		// If mouse is on an interior segment point, remove it
-		if (mouseXPosition > 0 && mouseXPosition < 127 && fixPointBeamHeights[mouseXPosition] != -1)
-		{
-			fixPointBeamHeights[mouseXPosition] = -1;
-			return true;
-		}
-	}
-
-	return false;
-}
-
-bool VelocityCurveSegmentEditStrategyBase::mouseDrag(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	if (isDragging())
-	{
-		int currentDraggedXPosition = -1;
-		for (int x = 0; x < 128; x++)
-		{
-			Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
-			if (beamRect.contains(localPoint.toInt()))
-			{
-				currentDraggedXPosition = x;
-				break;
-			}
-		}
-
-		if (currentDraggedXPosition >= 0)
-		{
-			if (currentDraggedXPosition < minDragXPosition)
-				currentDraggedXPosition = minDragXPosition;
-			else if (currentDraggedXPosition > maxDragXPosition)
-				currentDraggedXPosition = maxDragXPosition;
-
-			// If x-position changed: remove point of original position
-			if (currentDraggedXPosition != draggedOriginalXPosition)
-			{
-				fixPointBeamHeights[draggedOriginalXPosition] = -1;
-				draggedOriginalXPosition = currentDraggedXPosition;
-			}
-
-			fixPointBeamHeights[currentDraggedXPosition] = velocityBeamTable[currentDraggedXPosition]->getBeamValueFromLocalPoint(localPoint);
-
-			return true;
-		}
-	}
-
-	return false;
-}
-
-void VelocityCurveSegmentEditStrategyBase::mouseUp(const MouseEvent &event, juce::Point<float> localPoint)
-{
-	draggedOriginalXPosition = -1;
-
-	// Change values of velocityBeamTable
-	setVelocityTableValuesFromEditConfig();
-}
-
-Array<juce::Point<float>> VelocityCurveSegmentEditStrategyBase::getSegmentPoints()
-{
-	Array<juce::Point<float>> result;
-
-	// First point
-	juce::Point<float> pt = velocityBeamTable[0]->getBottomMid();
-	pt.setY(pt.y - velocityBeamTable[0]->getBeamHeightFromValue(fixPointBeamHeights[0]));
-
-	result.add(pt);
-
-	// points in-between
-	for (int x = 1; x < 128; x++)
-	{
-		if (fixPointBeamHeights[x] != -1)
-		{
-			pt = velocityBeamTable[x]->getBottomMid();
-			pt.setY(pt.y - velocityBeamTable[x]->getBeamHeightFromValue(fixPointBeamHeights[x]));
-			result.add(pt);
-		}
-	}
-
-	return result;
-}
-
-void VelocityCurveSegmentEditStrategyBase::drawSegmentPoints(Graphics& g, LookAndFeel& lookAndFeel)
-{
-	g.setColour(lookAndFeel.findColour(VelocityCurveBeam::outlineColourId));
-
-	// Circles around the point
-	for (int x = 0; x < 128; x++)
-	{
-		if (fixPointBeamHeights[x] != -1)
-		{
-			juce::Point<float> pt = velocityBeamTable[x]->getBottomMid();
-			pt.setY(pt.y - velocityBeamTable[x]->getBeamHeightFromValue(fixPointBeamHeights[x]));
-
-			Path currentNodePath;
-			currentNodePath.startNewSubPath(pt);
-
-			if (x == mouseXPosition)
-			{
-				// Emphasize current point
-				currentNodePath.addEllipse(pt.x - 5.5, pt.y - 5.5, 11, 11);
-				g.strokePath(currentNodePath, PathStrokeType(2.000f));
-			}
-			else
-			{
-				currentNodePath.addEllipse(pt.x - 4, pt.y - 4, 8, 8);
-				g.strokePath(currentNodePath, PathStrokeType(1.000f));
-			}
-		}
-	}
-}
-
-void VelocityCurveSegmentEditStrategyBase::drawCurve(Graphics& g, LookAndFeel& lookAndFeel)
-{
-	g.setColour(lookAndFeel.findColour(VelocityCurveBeam::outlineColourId));
-	Path drawedLine = createCurveToDraw();
-	g.strokePath(drawedLine, PathStrokeType(1.000f));
-}
-
-/*
-==============================================================================
-VelocityCurveLinearDrawingStrategy class
-==============================================================================
-*/
-
-VelocityCurveLinearDrawingStrategy::VelocityCurveLinearDrawingStrategy(
-    //Path& beamTableFrameRef,
-    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
-	: VelocityCurveSegmentEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
-{
-}
-
-bool VelocityCurveLinearDrawingStrategy::setEditConfigFromVelocityTable()
-{
-	// Take segments from current beam values, with superfluous points removed
-	for (int x = 0; x < 128; x++)
-	{
-		fixPointBeamHeights[x] = velocityBeamTable[x]->getValue();
-	}
-
-	clearSuperfluousPoints();
-
-	return true;	// This works always
-}
-
-void VelocityCurveLinearDrawingStrategy::setVelocityTableValuesFromEditConfig()
-{
-	// First position
-	int lineStartXPosition = 0;
-	velocityBeamTable[0]->setValue(fixPointBeamHeights[0]);	// Must have a valid value
-
-	int lineStopXPosition = -1;
-	for (int x = 1; x < 128; x++)
-	{
-		if (fixPointBeamHeights[x] != -1)
-		{
-			// New fixed point found
-			lineStopXPosition = x;
-
-			// Calculate positions in-between and end
-			for (int x2 = lineStartXPosition + 1; x2 <= lineStopXPosition; x2++)
-			{
-				velocityBeamTable[x2]->setValue(
-					fixPointBeamHeights[lineStartXPosition] +
-					(fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])
-					* ((x2 - lineStartXPosition)) / (lineStopXPosition - lineStartXPosition));
-			}
-
-			// Current end position becomes new start position
-			lineStartXPosition = lineStopXPosition;
-		}
-	}
-
-	clearSuperfluousPoints();
-}
-
-Path VelocityCurveLinearDrawingStrategy::createCurveToDraw()
-{
-	Array<juce::Point<float>> segmentPoints = getSegmentPoints();
-
-	Path drawedCurve;
-	drawedCurve.startNewSubPath(segmentPoints[0]);
-
-	// points in-between
-	for (int x = 1; x < segmentPoints.size(); x++)
-		drawedCurve.lineTo(segmentPoints[x]);
-
-	return drawedCurve;
-}
-
-void VelocityCurveLinearDrawingStrategy::clearSuperfluousPoints()
-{
-	int lineStartXPosition = 0;
-	int lineStopXPosition = -1;
-	int previousLineSegmentRiseRatio = 0;
-
-	// Identify first segment
-	for (int x = 1; x < 128; x++)
-	{
-		if (fixPointBeamHeights[x] != -1)
-		{
-			// New fixed point found
-			lineStopXPosition = x;
-
-			previousLineSegmentRiseRatio = (fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])*128
-				/ (lineStopXPosition - lineStartXPosition);
-
-			break;
-		}
-	}
-
-	jassert(lineStopXPosition != -1);
-
-	// Current end position becomes new start position
-	lineStartXPosition = lineStopXPosition;
-
-	// Following segments
-	for (int x = lineStartXPosition + 1; x < 128; x++)
-	{
-		if (fixPointBeamHeights[x] != -1)
-		{
-			// New fixed point found
-			lineStopXPosition = x;
-
-			int newLineSegmentRiseRatio = (fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])*128
-				/ (lineStopXPosition - lineStartXPosition);
-
-			if (newLineSegmentRiseRatio == previousLineSegmentRiseRatio)
-			{
-				// New segment is direct continuation of previous segment. Remove segment start point.
-				fixPointBeamHeights[lineStartXPosition] = -1;
-			}
-			else
-			{
-				// New segment has a different rise ratio than the preiouvs, must stay
-				previousLineSegmentRiseRatio = newLineSegmentRiseRatio;
-			}
-
-			lineStartXPosition = lineStopXPosition;		// Current position becomes new start position
-		}
-	}
-}
-
-/*
-==============================================================================
-VelocityCurveQuadraticDrawingStrategy class
-==============================================================================
-*/
-
-VelocityCurveQuadraticDrawingStrategy::VelocityCurveQuadraticDrawingStrategy(
-    //Path& beamTableFrameRef,
-    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
-	: VelocityCurveSegmentEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
-{
-}
-
-bool VelocityCurveQuadraticDrawingStrategy::setEditConfigFromVelocityTable()
-{
-	// ToDo
-
-	return true;	// This works always
-}
-
-void VelocityCurveQuadraticDrawingStrategy::setVelocityTableValuesFromEditConfig()
-{
-	Path drawedclosedLine = createCurveToDraw();
-
-	juce::Point<float> ptLeftBottom = velocityBeamTable[0]->getBottomMid();
-	ptLeftBottom.addXY(-1, 1);	// To make sure the testLines start inside the drawedClosedLine
-	juce::Point<float> ptRightBottom = velocityBeamTable[127]->getBottomMid();
-	ptRightBottom.addXY(1, 1);
-
-	drawedclosedLine.lineTo(ptRightBottom);
-	drawedclosedLine.lineTo(ptLeftBottom);
-	drawedclosedLine.closeSubPath();
-
-	int velTableHeight = velocityBeamTable[0]->getHeight()+1;	// +1 to make sure testLines end outside the drawedClosedLine
-
-	for (int x = 0; x < 128; x++)
-	{
-		juce::Point<float> ptBot = velocityBeamTable[x]->getBottomMid();
-		juce::Point<float> ptTop = ptBot;
-		ptTop.addXY(0, -velTableHeight);
-
-		juce::Line<float> testLine(ptBot, ptTop);
-
-		juce::Line<float> clippedLine = drawedclosedLine.getClippedLine(testLine, false);
-
-		int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(clippedLine.getEnd());
-		velocityBeamTable[x]->setValue(newBeamValue);
-	}
-}
-
-Path VelocityCurveQuadraticDrawingStrategy::createCurveToDraw()
-{
-	Array<juce::Point<float>> segmentPoints = getSegmentPoints();
-
-	Path drawedCurve;
-	drawedCurve.startNewSubPath(segmentPoints[0]);
-
-	// points in-between
-	int x;
-	for (x = 1; x < segmentPoints.size()-1; x += 2)
-	{
-		drawedCurve.quadraticTo(segmentPoints[x], segmentPoints[x + 1]);
-	}
-
-	// If last segment is not complete, draw it as line
-	if (segmentPoints.size() % 2 == 0)
-	{
-		drawedCurve.lineTo(segmentPoints.getLast());
-	}
-
-	return drawedCurve;
-}
+/*
+  ==============================================================================
+
+    VelocityCurveEditStrategy.cpp
+    Created: 10 Apr 2019 9:54:14pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#include "VelocityCurveEditStrategy.h"
+
+/*
+==============================================================================
+VelocityCurveEditStrategyBase class
+==============================================================================
+*/
+
+VelocityCurveEditStrategyBase::VelocityCurveEditStrategyBase(
+    //Path& beamTableFrameRef,
+    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
+	: /*beamTableFrame(beamTableFrameRef), */velocityBeamTable(velocityBeamTablePtr)
+{
+}
+
+/*
+==============================================================================
+VelocityCurveFreeDrawingStrategy class
+==============================================================================
+*/
+
+VelocityCurveFreeDrawingStrategy::VelocityCurveFreeDrawingStrategy(
+    //Path& beamTableFrameRef,
+    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
+	: VelocityCurveEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
+{
+}
+
+bool VelocityCurveFreeDrawingStrategy::setEditConfig(const int velocityTableValues[])
+{
+	for (int x = 0; x < 128; x++)
+		velocityBeamTable[x]->setValue(velocityTableValues[x]);
+
+	return true;
+}
+
+bool VelocityCurveFreeDrawingStrategy::exportEditConfig(int velocityTableValues[])
+{
+	for (int x = 0; x < 128; x++)
+		velocityTableValues[x] = velocityBeamTable[x]->getValue();
+
+	return true;
+}
+
+void VelocityCurveFreeDrawingStrategy::paint(Graphics& g, LookAndFeel& lookAndFeel)
+{
+	if (!drawedLine.isEmpty())
+		g.strokePath(drawedLine, PathStrokeType(1.000f));
+}
+
+void VelocityCurveFreeDrawingStrategy::resized()
+{
+	drawedLine.clear();
+}
+
+bool VelocityCurveFreeDrawingStrategy::mouseDown(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	drawedLine.clear();
+	//if (beamTableFrame.contains(localPoint))
+	//{
+		drawedLine.startNewSubPath(localPoint.x, localPoint.y);
+
+		for (int x = 0; x < 128; x++)
+		{
+			Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
+			if (beamRect.contains((int)localPoint.x, (int)localPoint.y))
+			{
+				int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(localPoint);
+				velocityBeamTable[x]->setValue(newBeamValue);
+
+				// Change other beams' values so curve stays monotonous
+				for (int x2 = 0; x2 < x; x2++)
+					velocityBeamTable[x2]->setValueAtMost(newBeamValue);
+
+				for (int x2 = x + 1; x2 < 128; x2++)
+					velocityBeamTable[x2]->setValueAtLeast(newBeamValue);
+
+				return true;
+			}
+		}
+	//}
+
+	return false;
+
+}
+
+bool VelocityCurveFreeDrawingStrategy::mouseDrag(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	for (int x = 0; x < 128; x++)
+	{
+		Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
+		if (beamRect.contains((int)localPoint.x, (int)localPoint.y))
+		{
+			drawedLine.lineTo(localPoint);
+
+			int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(localPoint);
+			velocityBeamTable[x]->setValue(newBeamValue);
+
+			// Change other beams' values so curve stays monotonous
+			for (int x2 = 0; x2 < x; x2++)
+				velocityBeamTable[x2]->setValueAtMost(newBeamValue);
+
+			for (int x2 = x + 1; x2 < 128; x2++)
+				velocityBeamTable[x2]->setValueAtLeast(newBeamValue);
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void VelocityCurveFreeDrawingStrategy::mouseUp(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	drawedLine.clear();
+}
+
+/*
+==============================================================================
+VelocityCurveSegmentEditStrategyBase class
+==============================================================================
+*/
+
+VelocityCurveSegmentEditStrategyBase::VelocityCurveSegmentEditStrategyBase(
+    //Path& beamTableFrameRef,
+    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
+	: VelocityCurveEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
+	, mouseXPosition(-1), draggedOriginalXPosition(-1)
+{
+	fixPointBeamHeights[0] = 0;
+
+	for (int x = 1; x < 127; x++)
+		fixPointBeamHeights[x] = -1;
+
+	fixPointBeamHeights[127] = 127;
+}
+
+bool VelocityCurveSegmentEditStrategyBase::setEditConfig(const int velocityTableValues[])
+{
+	for (int x = 0; x < 128; x++)
+		fixPointBeamHeights[x] = velocityTableValues[x];
+
+	setVelocityTableValuesFromEditConfig();
+	return true;
+}
+
+bool VelocityCurveSegmentEditStrategyBase::exportEditConfig(int velocityTableValues[])
+{
+	for (int x = 0; x < 128; x++)
+		velocityTableValues[x] = fixPointBeamHeights[x];
+
+	return true;
+}
+
+void VelocityCurveSegmentEditStrategyBase::paint(Graphics& g, LookAndFeel& lookAndFeel)
+{
+	drawCurve(g, lookAndFeel);
+
+	// Segment points
+	drawSegmentPoints(g, lookAndFeel);
+}
+
+bool VelocityCurveSegmentEditStrategyBase::mouseMove(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	int newMouseXPosition = -1;
+	for (int x = 0; x < 128; x++)
+	{
+		Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
+		if (beamRect.contains(localPoint.toInt()))
+		{
+			newMouseXPosition = x;
+			break;
+		}
+	}
+
+	if (newMouseXPosition != mouseXPosition)
+	{
+		mouseXPosition = newMouseXPosition;
+		return true;
+	}
+	else
+		return false;
+}
+
+bool VelocityCurveSegmentEditStrategyBase::mouseDown(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	if (event.mods.isLeftButtonDown())
+	{
+		// Start position to drag
+		draggedOriginalXPosition = mouseXPosition;
+
+		if (draggedOriginalXPosition >= 0)
+		{
+		    minDragXPosition = draggedOriginalXPosition;
+            maxDragXPosition = draggedOriginalXPosition;
+
+			// First and last position cannot be dragged horizontally
+			if (draggedOriginalXPosition > 0 && draggedOriginalXPosition < 127)
+			{
+				// Dragging possible until next line point
+				for (int x = draggedOriginalXPosition - 1; x > 0 && fixPointBeamHeights[x] == -1; x--)
+					minDragXPosition = x;
+
+				for (int x2 = draggedOriginalXPosition + 1; x2 < 127 && fixPointBeamHeights[x2] == -1; x2++)
+					maxDragXPosition = x2;
+			}
+
+			fixPointBeamHeights[draggedOriginalXPosition] = velocityBeamTable[draggedOriginalXPosition]->getBeamValueFromLocalPoint(localPoint);
+			return true;
+		}
+	}
+	else if (event.mods.isRightButtonDown())
+	{
+		// If mouse is on an interior segment point, remove it
+		if (mouseXPosition > 0 && mouseXPosition < 127 && fixPointBeamHeights[mouseXPosition] != -1)
+		{
+			fixPointBeamHeights[mouseXPosition] = -1;
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool VelocityCurveSegmentEditStrategyBase::mouseDrag(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	if (isDragging())
+	{
+		int currentDraggedXPosition = -1;
+		for (int x = 0; x < 128; x++)
+		{
+			Rectangle<int> beamRect = velocityBeamTable[x]->getBounds();
+			if (beamRect.contains(localPoint.toInt()))
+			{
+				currentDraggedXPosition = x;
+				break;
+			}
+		}
+
+		if (currentDraggedXPosition >= 0)
+		{
+			if (currentDraggedXPosition < minDragXPosition)
+				currentDraggedXPosition = minDragXPosition;
+			else if (currentDraggedXPosition > maxDragXPosition)
+				currentDraggedXPosition = maxDragXPosition;
+
+			// If x-position changed: remove point of original position
+			if (currentDraggedXPosition != draggedOriginalXPosition)
+			{
+				fixPointBeamHeights[draggedOriginalXPosition] = -1;
+				draggedOriginalXPosition = currentDraggedXPosition;
+			}
+
+			fixPointBeamHeights[currentDraggedXPosition] = velocityBeamTable[currentDraggedXPosition]->getBeamValueFromLocalPoint(localPoint);
+
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void VelocityCurveSegmentEditStrategyBase::mouseUp(const MouseEvent &event, juce::Point<float> localPoint)
+{
+	draggedOriginalXPosition = -1;
+
+	// Change values of velocityBeamTable
+	setVelocityTableValuesFromEditConfig();
+}
+
+Array<juce::Point<float>> VelocityCurveSegmentEditStrategyBase::getSegmentPoints()
+{
+	Array<juce::Point<float>> result;
+
+	// First point
+	juce::Point<float> pt = velocityBeamTable[0]->getBottomMid();
+	pt.setY(pt.y - velocityBeamTable[0]->getBeamHeightFromValue(fixPointBeamHeights[0]));
+
+	result.add(pt);
+
+	// points in-between
+	for (int x = 1; x < 128; x++)
+	{
+		if (fixPointBeamHeights[x] != -1)
+		{
+			pt = velocityBeamTable[x]->getBottomMid();
+			pt.setY(pt.y - velocityBeamTable[x]->getBeamHeightFromValue(fixPointBeamHeights[x]));
+			result.add(pt);
+		}
+	}
+
+	return result;
+}
+
+void VelocityCurveSegmentEditStrategyBase::drawSegmentPoints(Graphics& g, LookAndFeel& lookAndFeel)
+{
+	g.setColour(lookAndFeel.findColour(VelocityCurveBeam::outlineColourId));
+
+	// Circles around the point
+	for (int x = 0; x < 128; x++)
+	{
+		if (fixPointBeamHeights[x] != -1)
+		{
+			juce::Point<float> pt = velocityBeamTable[x]->getBottomMid();
+			pt.setY(pt.y - velocityBeamTable[x]->getBeamHeightFromValue(fixPointBeamHeights[x]));
+
+			Path currentNodePath;
+			currentNodePath.startNewSubPath(pt);
+
+			if (x == mouseXPosition)
+			{
+				// Emphasize current point
+				currentNodePath.addEllipse(pt.x - 5.5, pt.y - 5.5, 11, 11);
+				g.strokePath(currentNodePath, PathStrokeType(2.000f));
+			}
+			else
+			{
+				currentNodePath.addEllipse(pt.x - 4, pt.y - 4, 8, 8);
+				g.strokePath(currentNodePath, PathStrokeType(1.000f));
+			}
+		}
+	}
+}
+
+void VelocityCurveSegmentEditStrategyBase::drawCurve(Graphics& g, LookAndFeel& lookAndFeel)
+{
+	g.setColour(lookAndFeel.findColour(VelocityCurveBeam::outlineColourId));
+	Path drawedLine = createCurveToDraw();
+	g.strokePath(drawedLine, PathStrokeType(1.000f));
+}
+
+/*
+==============================================================================
+VelocityCurveLinearDrawingStrategy class
+==============================================================================
+*/
+
+VelocityCurveLinearDrawingStrategy::VelocityCurveLinearDrawingStrategy(
+    //Path& beamTableFrameRef,
+    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
+	: VelocityCurveSegmentEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
+{
+}
+
+bool VelocityCurveLinearDrawingStrategy::setEditConfigFromVelocityTable()
+{
+	// Take segments from current beam values, with superfluous points removed
+	for (int x = 0; x < 128; x++)
+	{
+		fixPointBeamHeights[x] = velocityBeamTable[x]->getValue();
+	}
+
+	clearSuperfluousPoints();
+
+	return true;	// This works always
+}
+
+void VelocityCurveLinearDrawingStrategy::setVelocityTableValuesFromEditConfig()
+{
+	// First position
+	int lineStartXPosition = 0;
+	velocityBeamTable[0]->setValue(fixPointBeamHeights[0]);	// Must have a valid value
+
+	int lineStopXPosition = -1;
+	for (int x = 1; x < 128; x++)
+	{
+		if (fixPointBeamHeights[x] != -1)
+		{
+			// New fixed point found
+			lineStopXPosition = x;
+
+			// Calculate positions in-between and end
+			for (int x2 = lineStartXPosition + 1; x2 <= lineStopXPosition; x2++)
+			{
+				velocityBeamTable[x2]->setValue(
+					fixPointBeamHeights[lineStartXPosition] +
+					(fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])
+					* ((x2 - lineStartXPosition)) / (lineStopXPosition - lineStartXPosition));
+			}
+
+			// Current end position becomes new start position
+			lineStartXPosition = lineStopXPosition;
+		}
+	}
+
+	clearSuperfluousPoints();
+}
+
+Path VelocityCurveLinearDrawingStrategy::createCurveToDraw()
+{
+	Array<juce::Point<float>> segmentPoints = getSegmentPoints();
+
+	Path drawedCurve;
+	drawedCurve.startNewSubPath(segmentPoints[0]);
+
+	// points in-between
+	for (int x = 1; x < segmentPoints.size(); x++)
+		drawedCurve.lineTo(segmentPoints[x]);
+
+	return drawedCurve;
+}
+
+void VelocityCurveLinearDrawingStrategy::clearSuperfluousPoints()
+{
+	int lineStartXPosition = 0;
+	int lineStopXPosition = -1;
+	int previousLineSegmentRiseRatio = 0;
+
+	// Identify first segment
+	for (int x = 1; x < 128; x++)
+	{
+		if (fixPointBeamHeights[x] != -1)
+		{
+			// New fixed point found
+			lineStopXPosition = x;
+
+			previousLineSegmentRiseRatio = (fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])*128
+				/ (lineStopXPosition - lineStartXPosition);
+
+			break;
+		}
+	}
+
+	jassert(lineStopXPosition != -1);
+
+	// Current end position becomes new start position
+	lineStartXPosition = lineStopXPosition;
+
+	// Following segments
+	for (int x = lineStartXPosition + 1; x < 128; x++)
+	{
+		if (fixPointBeamHeights[x] != -1)
+		{
+			// New fixed point found
+			lineStopXPosition = x;
+
+			int newLineSegmentRiseRatio = (fixPointBeamHeights[lineStopXPosition] - fixPointBeamHeights[lineStartXPosition])*128
+				/ (lineStopXPosition - lineStartXPosition);
+
+			if (newLineSegmentRiseRatio == previousLineSegmentRiseRatio)
+			{
+				// New segment is direct continuation of previous segment. Remove segment start point.
+				fixPointBeamHeights[lineStartXPosition] = -1;
+			}
+			else
+			{
+				// New segment has a different rise ratio than the preiouvs, must stay
+				previousLineSegmentRiseRatio = newLineSegmentRiseRatio;
+			}
+
+			lineStartXPosition = lineStopXPosition;		// Current position becomes new start position
+		}
+	}
+}
+
+/*
+==============================================================================
+VelocityCurveQuadraticDrawingStrategy class
+==============================================================================
+*/
+
+VelocityCurveQuadraticDrawingStrategy::VelocityCurveQuadraticDrawingStrategy(
+    //Path& beamTableFrameRef,
+    std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr)
+	: VelocityCurveSegmentEditStrategyBase(/*beamTableFrameRef, */velocityBeamTablePtr)
+{
+}
+
+bool VelocityCurveQuadraticDrawingStrategy::setEditConfigFromVelocityTable()
+{
+	// ToDo
+
+	return true;	// This works always
+}
+
+void VelocityCurveQuadraticDrawingStrategy::setVelocityTableValuesFromEditConfig()
+{
+	Path drawedclosedLine = createCurveToDraw();
+
+	juce::Point<float> ptLeftBottom = velocityBeamTable[0]->getBottomMid();
+	ptLeftBottom.addXY(-1, 1);	// To make sure the testLines start inside the drawedClosedLine
+	juce::Point<float> ptRightBottom = velocityBeamTable[127]->getBottomMid();
+	ptRightBottom.addXY(1, 1);
+
+	drawedclosedLine.lineTo(ptRightBottom);
+	drawedclosedLine.lineTo(ptLeftBottom);
+	drawedclosedLine.closeSubPath();
+
+	int velTableHeight = velocityBeamTable[0]->getHeight()+1;	// +1 to make sure testLines end outside the drawedClosedLine
+
+	for (int x = 0; x < 128; x++)
+	{
+		juce::Point<float> ptBot = velocityBeamTable[x]->getBottomMid();
+		juce::Point<float> ptTop = ptBot;
+		ptTop.addXY(0, -velTableHeight);
+
+		juce::Line<float> testLine(ptBot, ptTop);
+
+		juce::Line<float> clippedLine = drawedclosedLine.getClippedLine(testLine, false);
+
+		int newBeamValue = velocityBeamTable[x]->getBeamValueFromLocalPoint(clippedLine.getEnd());
+		velocityBeamTable[x]->setValue(newBeamValue);
+	}
+}
+
+Path VelocityCurveQuadraticDrawingStrategy::createCurveToDraw()
+{
+	Array<juce::Point<float>> segmentPoints = getSegmentPoints();
+
+	Path drawedCurve;
+	drawedCurve.startNewSubPath(segmentPoints[0]);
+
+	// points in-between
+	int x;
+	for (x = 1; x < segmentPoints.size()-1; x += 2)
+	{
+		drawedCurve.quadraticTo(segmentPoints[x], segmentPoints[x + 1]);
+	}
+
+	// If last segment is not complete, draw it as line
+	if (segmentPoints.size() % 2 == 0)
+	{
+		drawedCurve.lineTo(segmentPoints.getLast());
+	}
+
+	return drawedCurve;
+}
diff --git a/Source/VelocityCurveEditStrategy.h b/Source/components/tables/VelocityCurveEditStrategy.h
similarity index 97%
rename from Source/VelocityCurveEditStrategy.h
rename to Source/components/tables/VelocityCurveEditStrategy.h
index c5cda008..8a2e7327 100644
--- a/Source/VelocityCurveEditStrategy.h
+++ b/Source/components/tables/VelocityCurveEditStrategy.h
@@ -1,157 +1,157 @@
-/*
-  ==============================================================================
-
-    VelocityCurveEditStrategy.h
-    Created: 10 Apr 2019 9:54:14pm
-    Author:  hsstraub
-
-  ==============================================================================
-*/
-
-#pragma once
-
-#include <JuceHeader.h>
-
-#include "VelocityCurveComponents.h"
-
-
-/*
-==============================================================================
-Base class for velocity curve editing
-==============================================================================
-*/
-class VelocityCurveEditStrategyBase
-{
-public:
-	VelocityCurveEditStrategyBase(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
-	virtual ~VelocityCurveEditStrategyBase() {}
-
-	// Set value table (e. g. from LMT file)
-	virtual bool setEditConfig(const int velocityTableValues[]) = 0;
-	// Export value table (for saving in LMT file)
-	virtual bool exportEditConfig(int velocityTableValues[]) = 0;
-	// Takes a given velocity table and tries to extract edit parameters. Returns whether it was successful.
-	virtual bool setEditConfigFromVelocityTable() { return true; }
-	// Sets velocity table values from edit parameters
-	virtual void setVelocityTableValuesFromEditConfig() {}
-
-	virtual String getDescriptionText() { return "Click with the mouse in the graphics to draw the velocity curve."; }
-
-	virtual void paint(Graphics& g, LookAndFeel& lookAndFeel) { };
-	// Resize functionality. Assumes that beamTableFrame has already been resized.
-	virtual void resized() { }
-	// return: true if a repainting is to be done
-	virtual bool mouseMove(const MouseEvent &event, juce::Point<float> localPoint) { return false; };
-	// return: true if some editing was done
-	virtual bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) { return false; }
-	virtual bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) { return false; };
-	virtual void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) { };
-
-protected:
-	//Path& beamTableFrame;
-	std::unique_ptr<VelocityCurveBeam>* velocityBeamTable;
-};
-
-/*
-==============================================================================
-Velocity curve editing via free drawing
-==============================================================================
-*/
-class VelocityCurveFreeDrawingStrategy : public VelocityCurveEditStrategyBase
-{
-public:
-	VelocityCurveFreeDrawingStrategy(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
-
-	bool setEditConfig(const int velocityTableValues[]) override;
-	bool exportEditConfig(int velocityTableValues[]) override;
-
-	void paint(Graphics& g, LookAndFeel& lookAndFeel) override;
-	void resized() override;
-	bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) override;
-	bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) override;
-	void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) override;
-
-protected:
-	Path drawedLine;
-};
-
-/*
-==============================================================================
-Base class for velocity curve editing with segments
-==============================================================================
-*/
-
-class VelocityCurveSegmentEditStrategyBase : public VelocityCurveEditStrategyBase
-{
-public:
-	VelocityCurveSegmentEditStrategyBase(/*Path& beamTableFrameRef, */std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
-	virtual ~VelocityCurveSegmentEditStrategyBase() {}
-
-	bool setEditConfig(const int velocityTableValues[]) override;
-	bool exportEditConfig(int velocityTableValues[]) override;
-
-	String getDescriptionText() override { return "Click with the mouse in the graphics to draw the velocity curve. Right-click to delete a segment point."; }
-
-	void paint(Graphics& g, LookAndFeel& lookAndFeel) override;
-	bool mouseMove(const MouseEvent &event, juce::Point<float> localPoint) override;
-	bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) override;
-	bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) override;
-	void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) override;
-
-protected:
-	bool isDragging() { return draggedOriginalXPosition >= 0; }
-
-	Array<juce::Point<float>> getSegmentPoints();
-	virtual Path createCurveToDraw() = 0;
-
-	void drawSegmentPoints(Graphics& g, LookAndFeel& lookAndFeel);
-	void drawCurve(Graphics& g, LookAndFeel& lookAndFeel);
-
-	// y-components of vector line point, -1 if no line points
-	int fixPointBeamHeights[128];
-
-	int mouseXPosition;
-	int draggedOriginalXPosition;
-	int minDragXPosition;
-	int maxDragXPosition;
-};
-
-/*
-==============================================================================
-Velocity curve editing via line segments
-==============================================================================
-*/
-
-class VelocityCurveLinearDrawingStrategy : public VelocityCurveSegmentEditStrategyBase
-{
-public:
-	VelocityCurveLinearDrawingStrategy(/*Path& beamTableFrameRef, */std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
-
-	bool setEditConfigFromVelocityTable() override;
-	void setVelocityTableValuesFromEditConfig() override;
-
-protected:
-	Path createCurveToDraw() override;
-
-	// Points that are part of a straight line can be removed
-	void clearSuperfluousPoints();
-};
-
-
-/*
-==============================================================================
-Velocity curve editing via quadratic curves
-==============================================================================
-*/
-
-class VelocityCurveQuadraticDrawingStrategy : public VelocityCurveSegmentEditStrategyBase
-{
-public:
-	VelocityCurveQuadraticDrawingStrategy(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
-
-	bool setEditConfigFromVelocityTable() override;
-	void setVelocityTableValuesFromEditConfig() override;
-
-protected:
-	Path createCurveToDraw() override;
-};
+/*
+  ==============================================================================
+
+    VelocityCurveEditStrategy.h
+    Created: 10 Apr 2019 9:54:14pm
+    Author:  hsstraub
+
+  ==============================================================================
+*/
+
+#pragma once
+
+#include <JuceHeader.h>
+
+#include "VelocityCurveComponents.h"
+
+
+/*
+==============================================================================
+Base class for velocity curve editing
+==============================================================================
+*/
+class VelocityCurveEditStrategyBase
+{
+public:
+	VelocityCurveEditStrategyBase(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
+	virtual ~VelocityCurveEditStrategyBase() {}
+
+	// Set value table (e. g. from LMT file)
+	virtual bool setEditConfig(const int velocityTableValues[]) = 0;
+	// Export value table (for saving in LMT file)
+	virtual bool exportEditConfig(int velocityTableValues[]) = 0;
+	// Takes a given velocity table and tries to extract edit parameters. Returns whether it was successful.
+	virtual bool setEditConfigFromVelocityTable() { return true; }
+	// Sets velocity table values from edit parameters
+	virtual void setVelocityTableValuesFromEditConfig() {}
+
+	virtual String getDescriptionText() { return "Click with the mouse in the graphics to draw the velocity curve."; }
+
+	virtual void paint(Graphics& g, LookAndFeel& lookAndFeel) { };
+	// Resize functionality. Assumes that beamTableFrame has already been resized.
+	virtual void resized() { }
+	// return: true if a repainting is to be done
+	virtual bool mouseMove(const MouseEvent &event, juce::Point<float> localPoint) { return false; };
+	// return: true if some editing was done
+	virtual bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) { return false; }
+	virtual bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) { return false; };
+	virtual void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) { };
+
+protected:
+	//Path& beamTableFrame;
+	std::unique_ptr<VelocityCurveBeam>* velocityBeamTable;
+};
+
+/*
+==============================================================================
+Velocity curve editing via free drawing
+==============================================================================
+*/
+class VelocityCurveFreeDrawingStrategy : public VelocityCurveEditStrategyBase
+{
+public:
+	VelocityCurveFreeDrawingStrategy(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
+
+	bool setEditConfig(const int velocityTableValues[]) override;
+	bool exportEditConfig(int velocityTableValues[]) override;
+
+	void paint(Graphics& g, LookAndFeel& lookAndFeel) override;
+	void resized() override;
+	bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) override;
+	bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) override;
+	void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) override;
+
+protected:
+	Path drawedLine;
+};
+
+/*
+==============================================================================
+Base class for velocity curve editing with segments
+==============================================================================
+*/
+
+class VelocityCurveSegmentEditStrategyBase : public VelocityCurveEditStrategyBase
+{
+public:
+	VelocityCurveSegmentEditStrategyBase(/*Path& beamTableFrameRef, */std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
+	virtual ~VelocityCurveSegmentEditStrategyBase() {}
+
+	bool setEditConfig(const int velocityTableValues[]) override;
+	bool exportEditConfig(int velocityTableValues[]) override;
+
+	String getDescriptionText() override { return "Click with the mouse in the graphics to draw the velocity curve. Right-click to delete a segment point."; }
+
+	void paint(Graphics& g, LookAndFeel& lookAndFeel) override;
+	bool mouseMove(const MouseEvent &event, juce::Point<float> localPoint) override;
+	bool mouseDown(const MouseEvent &event, juce::Point<float> localPoint) override;
+	bool mouseDrag(const MouseEvent &event, juce::Point<float> localPoint) override;
+	void mouseUp(const MouseEvent &event, juce::Point<float> localPoint) override;
+
+protected:
+	bool isDragging() { return draggedOriginalXPosition >= 0; }
+
+	Array<juce::Point<float>> getSegmentPoints();
+	virtual Path createCurveToDraw() = 0;
+
+	void drawSegmentPoints(Graphics& g, LookAndFeel& lookAndFeel);
+	void drawCurve(Graphics& g, LookAndFeel& lookAndFeel);
+
+	// y-components of vector line point, -1 if no line points
+	int fixPointBeamHeights[128];
+
+	int mouseXPosition;
+	int draggedOriginalXPosition;
+	int minDragXPosition;
+	int maxDragXPosition;
+};
+
+/*
+==============================================================================
+Velocity curve editing via line segments
+==============================================================================
+*/
+
+class VelocityCurveLinearDrawingStrategy : public VelocityCurveSegmentEditStrategyBase
+{
+public:
+	VelocityCurveLinearDrawingStrategy(/*Path& beamTableFrameRef, */std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
+
+	bool setEditConfigFromVelocityTable() override;
+	void setVelocityTableValuesFromEditConfig() override;
+
+protected:
+	Path createCurveToDraw() override;
+
+	// Points that are part of a straight line can be removed
+	void clearSuperfluousPoints();
+};
+
+
+/*
+==============================================================================
+Velocity curve editing via quadratic curves
+==============================================================================
+*/
+
+class VelocityCurveQuadraticDrawingStrategy : public VelocityCurveSegmentEditStrategyBase
+{
+public:
+	VelocityCurveQuadraticDrawingStrategy(/*Path& beamTableFrameRef,*/ std::unique_ptr<VelocityCurveBeam>* velocityBeamTablePtr);
+
+	bool setEditConfigFromVelocityTable() override;
+	void setVelocityTableValuesFromEditConfig() override;
+
+protected:
+	Path createCurveToDraw() override;
+};
diff --git a/Source/components/ColourDropdownSelector.cpp b/Source/controls/ColourDropdownSelector.cpp
similarity index 99%
rename from Source/components/ColourDropdownSelector.cpp
rename to Source/controls/ColourDropdownSelector.cpp
index 28b697e8..9ab94935 100644
--- a/Source/components/ColourDropdownSelector.cpp
+++ b/Source/controls/ColourDropdownSelector.cpp
@@ -1,6 +1,6 @@
 #include "ColourDropdownSelector.h"
 
-#include "../LumatoneEditorStyleCommon.h"
+#include "../style/LumatoneEditorStyleCommon.h"
 
 ColourDropdownSelector::ColourDropdownSelector(juce::String name, bool editable)
     : juce::Component(name)
@@ -77,6 +77,10 @@ void ColourDropdownSelector::setSelectedColour(juce::Colour newColour, bool setT
     if (newColour != lastSetColour)
     {
         lastSetColour = newColour;
+
+        colourPickerButton->setColour(juce::TextButton::ColourIds::buttonColourId, newColour);
+        colourPickerButton->setColour(juce::TextButton::ColourIds::buttonOnColourId, newColour);
+
         selectorListeners.call(&ColourSelectionListener::colourChangedCallback, this, lastSetColour);
     }
 
@@ -119,9 +123,6 @@ void ColourDropdownSelector::colourChangedCallback(ColourSelectionBroadcaster* s
         colourPickerButton->setToggleState(false, juce::NotificationType::sendNotification);
         pickerIsListening = false;
 
-        colourPickerButton->setColour(juce::TextButton::ColourIds::buttonColourId, newColour);
-        colourPickerButton->setColour(juce::TextButton::ColourIds::buttonOnColourId, newColour);
-
         // callbackPickerChanged();
     }
 }
diff --git a/Source/components/ColourDropdownSelector.h b/Source/controls/ColourDropdownSelector.h
similarity index 100%
rename from Source/components/ColourDropdownSelector.h
rename to Source/controls/ColourDropdownSelector.h
diff --git a/Source/FileBrowserComponent.h b/Source/controls/FileBrowserComponent.h
similarity index 100%
rename from Source/FileBrowserComponent.h
rename to Source/controls/FileBrowserComponent.h
diff --git a/Source/components/RangedControl.cpp b/Source/controls/RangedControl.cpp
similarity index 98%
rename from Source/components/RangedControl.cpp
rename to Source/controls/RangedControl.cpp
index 4557778e..78ef5638 100644
--- a/Source/components/RangedControl.cpp
+++ b/Source/controls/RangedControl.cpp
@@ -1,6 +1,6 @@
 #include "RangedControl.h"
 
-#include "../LumatoneEditorStyleCommon.h"
+#include "../style/LumatoneEditorStyleCommon.h"
 #include "../lumatone_editor_library/common/math.h"
 
 RangedControl::RangedControl(juce::String name, int minValueIn, int maxValueIn, Style style)
diff --git a/Source/components/RangedControl.h b/Source/controls/RangedControl.h
similarity index 100%
rename from Source/components/RangedControl.h
rename to Source/controls/RangedControl.h
diff --git a/Source/colour_palette_component.cpp b/Source/controls/colour_palette_component.cpp
similarity index 98%
rename from Source/colour_palette_component.cpp
rename to Source/controls/colour_palette_component.cpp
index 59b80298..08020e02 100644
--- a/Source/colour_palette_component.cpp
+++ b/Source/controls/colour_palette_component.cpp
@@ -8,9 +8,8 @@
   ==============================================================================
 */
 
-#include <JuceHeader.h>
 #include "colour_palette_component.h"
-#include "lumatone_editor_library/graphics/lumatone_assets.h"
+#include "../lumatone_editor_library/graphics/lumatone_assets.h"
 
 //==============================================================================
 // ColourPaletteComponent Definitions
@@ -158,4 +157,4 @@ juce::Image PaletteControlGroup::getCloneImage() const
     cloneG.strokePath(cloneIcon, stroke);
     juce::ImageCache::addImageToCache(cloneImg, (juce::int64)LumatoneAssets::ID::CloneIcon);
     return cloneImg;
-}
\ No newline at end of file
+}
diff --git a/Source/colour_palette_component.h b/Source/controls/colour_palette_component.h
similarity index 91%
rename from Source/colour_palette_component.h
rename to Source/controls/colour_palette_component.h
index 22815545..7ecf3e07 100644
--- a/Source/colour_palette_component.h
+++ b/Source/controls/colour_palette_component.h
@@ -12,10 +12,9 @@
 
 #include <JuceHeader.h>
 
-#include "./lumatone_editor_library/palettes/hex_group_palette.h"
-#include "./lumatone_editor_library/palettes/colour_selection_broadcaster.h"
-
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "../lumatone_editor_library/palettes/hex_group_palette.h"
+#include "../lumatone_editor_library/palettes/colour_selection_broadcaster.h"
+#include "../lumatone_editor_library/palettes/colour_palette_file.h"
 
 // #include "LumatoneEditorStyleCommon.h"
 
diff --git a/Source/colour_view_component.cpp b/Source/controls/colour_view_component.cpp
similarity index 99%
rename from Source/colour_view_component.cpp
rename to Source/controls/colour_view_component.cpp
index 7072dd85..4be98735 100644
--- a/Source/colour_view_component.cpp
+++ b/Source/controls/colour_view_component.cpp
@@ -18,7 +18,7 @@
 */
 
 //[Headers] You can add your own extra header files here...
-#include "./lumatone_editor_library/graphics/view_constants.h"
+#include "../lumatone_editor_library/graphics/view_constants.h"
 //[/Headers]
 
 #include "colour_view_component.h"
diff --git a/Source/colour_view_component.h b/Source/controls/colour_view_component.h
similarity index 98%
rename from Source/colour_view_component.h
rename to Source/controls/colour_view_component.h
index ec86e42d..b9e8f58f 100644
--- a/Source/colour_view_component.h
+++ b/Source/controls/colour_view_component.h
@@ -20,7 +20,7 @@
 #pragma once
 
 //[Headers]     -- You can add your own extra header files here --
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
+#include "../lumatone_editor_library/palettes/colour_selection_group.h"
 
 /*
 ==============================================================================
diff --git a/Source/data/LumatoneEditSelectionState.cpp b/Source/data/LumatoneEditSelectionState.cpp
index 0a036e36..cf650946 100644
--- a/Source/data/LumatoneEditSelectionState.cpp
+++ b/Source/data/LumatoneEditSelectionState.cpp
@@ -1,6 +1,6 @@
                                                                                                                                                                                                                                                                                                                                                                                                                    #include "LumatoneEditSelectionState.h"
 #include "../lumatone_editor_library/data/lumatone_layout.h"
-#include "../LumatoneEditorState.h"
+#include "../data/LumatoneEditorState.h"
 
 static juce::Array<juce::Identifier> getEditSelectionProperties()
 {
diff --git a/Source/LumatoneEditorState.cpp b/Source/data/LumatoneEditorState.cpp
similarity index 98%
rename from Source/LumatoneEditorState.cpp
rename to Source/data/LumatoneEditorState.cpp
index d8e46e41..c9e5d80f 100644
--- a/Source/LumatoneEditorState.cpp
+++ b/Source/data/LumatoneEditorState.cpp
@@ -10,12 +10,11 @@
 
 #include "LumatoneEditorState.h"
 
-#include "./LumatoneEditorLookAndFeel.h"
+#include "../style/LumatoneEditorLookAndFeel.h"
 
-#include "./lumatone_editor_library/device/lumatone_controller.h"
-#include "./lumatone_editor_library/listeners/editor_listener.h"
-
-#include "./lumatone_editor_library/palettes/colour_selection_group.h"
+#include "../lumatone_editor_library/device/lumatone_controller.h"
+#include "../lumatone_editor_library/listeners/editor_listener.h"
+#include "../lumatone_editor_library/palettes/colour_selection_group.h"
 
 static juce::File getDefaultUserDocumentsDirectory()
 {
diff --git a/Source/LumatoneEditorState.h b/Source/data/LumatoneEditorState.h
similarity index 97%
rename from Source/LumatoneEditorState.h
rename to Source/data/LumatoneEditorState.h
index 2f517663..58cbe891 100644
--- a/Source/LumatoneEditorState.h
+++ b/Source/data/LumatoneEditorState.h
@@ -11,11 +11,11 @@
 #ifndef LUMATONE_EDITOR_STATE_H
 #define LUMATONE_EDITOR_STATE_H
 
-#include "./lumatone_editor_library/data/application_state.h"
-#include "./lumatone_editor_library/palettes/colour_palette_file.h"
+#include "../lumatone_editor_library/data/application_state.h"
+#include "../lumatone_editor_library/palettes/colour_palette_file.h"
 
-#include "./data/LumatoneEditSelectionState.h"
-#include "./data/LumatoneEditorBatchColourState.h"
+#include "./LumatoneEditSelectionState.h"
+#include "./LumatoneEditorBatchColourState.h"
 
 #define CHOOSE_FILE_NOOP [](bool) -> void {}
 
diff --git a/Source/FirmwareTransfer.cpp b/Source/firmware/FirmwareTransfer.cpp
similarity index 99%
rename from Source/FirmwareTransfer.cpp
rename to Source/firmware/FirmwareTransfer.cpp
index f290b307..b4b74a4f 100644
--- a/Source/FirmwareTransfer.cpp
+++ b/Source/firmware/FirmwareTransfer.cpp
@@ -9,7 +9,7 @@
 */
 
 #include "FirmwareTransfer.h"
-#include "./lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
+#include "../lumatone_editor_library/lumatone_midi_driver/firmware_types.h"
 
 #ifdef HAVE_WINSOCK2_H
 #include <winsock2.h>
diff --git a/Source/FirmwareTransfer.h b/Source/firmware/FirmwareTransfer.h
similarity index 100%
rename from Source/FirmwareTransfer.h
rename to Source/firmware/FirmwareTransfer.h
diff --git a/Source/LocalisationMap.h b/Source/style/LocalisationMap.h
similarity index 100%
rename from Source/LocalisationMap.h
rename to Source/style/LocalisationMap.h
diff --git a/Source/LumatoneEditorFontLibrary.h b/Source/style/LumatoneEditorFontLibrary.h
similarity index 100%
rename from Source/LumatoneEditorFontLibrary.h
rename to Source/style/LumatoneEditorFontLibrary.h
diff --git a/Source/LumatoneEditorLookAndFeel.h b/Source/style/LumatoneEditorLookAndFeel.h
similarity index 100%
rename from Source/LumatoneEditorLookAndFeel.h
rename to Source/style/LumatoneEditorLookAndFeel.h
diff --git a/Source/LumatoneEditorStyleCommon.h b/Source/style/LumatoneEditorStyleCommon.h
similarity index 99%
rename from Source/LumatoneEditorStyleCommon.h
rename to Source/style/LumatoneEditorStyleCommon.h
index ab6d242c..c28f9286 100644
--- a/Source/LumatoneEditorStyleCommon.h
+++ b/Source/style/LumatoneEditorStyleCommon.h
@@ -11,10 +11,8 @@
 */
 
 #pragma once
-#include <JuceHeader.h>
-#include "./lumatone_editor_library/graphics/lumatone_assets.h"
-
-#include "./lumatone_editor_library/common/math.h"
+#include "../lumatone_editor_library/graphics/lumatone_assets.h"
+#include "../lumatone_editor_library/common/math.h"
 
 //==================================================================
 //