diff --git a/common/engine/keyboardprocessor/.gitignore b/common/core/keyboardprocessor/.gitignore
similarity index 100%
rename from common/engine/keyboardprocessor/.gitignore
rename to common/core/keyboardprocessor/.gitignore
diff --git a/common/engine/keyboardprocessor/debian/changelog b/common/core/keyboardprocessor/debian/changelog
similarity index 100%
rename from common/engine/keyboardprocessor/debian/changelog
rename to common/core/keyboardprocessor/debian/changelog
diff --git a/common/engine/keyboardprocessor/debian/compat b/common/core/keyboardprocessor/debian/compat
similarity index 100%
rename from common/engine/keyboardprocessor/debian/compat
rename to common/core/keyboardprocessor/debian/compat
diff --git a/common/engine/keyboardprocessor/debian/control b/common/core/keyboardprocessor/debian/control
similarity index 100%
rename from common/engine/keyboardprocessor/debian/control
rename to common/core/keyboardprocessor/debian/control
diff --git a/common/engine/keyboardprocessor/debian/copyright b/common/core/keyboardprocessor/debian/copyright
similarity index 100%
rename from common/engine/keyboardprocessor/debian/copyright
rename to common/core/keyboardprocessor/debian/copyright
diff --git a/common/engine/keyboardprocessor/debian/libkmnkbp-dev.install b/common/core/keyboardprocessor/debian/libkmnkbp-dev.install
similarity index 100%
rename from common/engine/keyboardprocessor/debian/libkmnkbp-dev.install
rename to common/core/keyboardprocessor/debian/libkmnkbp-dev.install
diff --git a/common/engine/keyboardprocessor/debian/libkmnkbp0-0.install b/common/core/keyboardprocessor/debian/libkmnkbp0-0.install
similarity index 100%
rename from common/engine/keyboardprocessor/debian/libkmnkbp0-0.install
rename to common/core/keyboardprocessor/debian/libkmnkbp0-0.install
diff --git a/common/engine/keyboardprocessor/debian/rules b/common/core/keyboardprocessor/debian/rules
similarity index 100%
rename from common/engine/keyboardprocessor/debian/rules
rename to common/core/keyboardprocessor/debian/rules
diff --git a/common/engine/keyboardprocessor/debian/source/format b/common/core/keyboardprocessor/debian/source/format
similarity index 100%
rename from common/engine/keyboardprocessor/debian/source/format
rename to common/core/keyboardprocessor/debian/source/format
diff --git a/common/engine/keyboardprocessor/debian/watch b/common/core/keyboardprocessor/debian/watch
similarity index 100%
rename from common/engine/keyboardprocessor/debian/watch
rename to common/core/keyboardprocessor/debian/watch
diff --git a/common/engine/keyboardprocessor/doc/BUILDING.md b/common/core/keyboardprocessor/doc/BUILDING.md
similarity index 100%
rename from common/engine/keyboardprocessor/doc/BUILDING.md
rename to common/core/keyboardprocessor/doc/BUILDING.md
diff --git a/common/engine/keyboardprocessor/doc/hotdoc.json b/common/core/keyboardprocessor/doc/hotdoc.json
similarity index 100%
rename from common/engine/keyboardprocessor/doc/hotdoc.json
rename to common/core/keyboardprocessor/doc/hotdoc.json
diff --git a/common/engine/keyboardprocessor/doc/introspection.schema b/common/core/keyboardprocessor/doc/introspection.schema
similarity index 100%
rename from common/engine/keyboardprocessor/doc/introspection.schema
rename to common/core/keyboardprocessor/doc/introspection.schema
diff --git a/common/engine/keyboardprocessor/doc/markdown_files/index.md b/common/core/keyboardprocessor/doc/markdown_files/index.md
similarity index 100%
rename from common/engine/keyboardprocessor/doc/markdown_files/index.md
rename to common/core/keyboardprocessor/doc/markdown_files/index.md
diff --git a/common/engine/keyboardprocessor/doc/meson.build b/common/core/keyboardprocessor/doc/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/doc/meson.build
rename to common/core/keyboardprocessor/doc/meson.build
diff --git a/common/engine/keyboardprocessor/doc/sitemap.txt b/common/core/keyboardprocessor/doc/sitemap.txt
similarity index 100%
rename from common/engine/keyboardprocessor/doc/sitemap.txt
rename to common/core/keyboardprocessor/doc/sitemap.txt
diff --git a/common/engine/keyboardprocessor/include/keyboardprocessor.h.in b/common/core/keyboardprocessor/include/keyboardprocessor.h.in
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyboardprocessor.h.in
rename to common/core/keyboardprocessor/include/keyboardprocessor.h.in
diff --git a/common/engine/keyboardprocessor/include/keyman/keyboardprocessor.h.in b/common/core/keyboardprocessor/include/keyman/keyboardprocessor.h.in
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyman/keyboardprocessor.h.in
rename to common/core/keyboardprocessor/include/keyman/keyboardprocessor.h.in
diff --git a/common/engine/keyboardprocessor/include/keyman/keyboardprocessor_bits.h b/common/core/keyboardprocessor/include/keyman/keyboardprocessor_bits.h
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyman/keyboardprocessor_bits.h
rename to common/core/keyboardprocessor/include/keyman/keyboardprocessor_bits.h
diff --git a/common/engine/keyboardprocessor/include/keyman/keyboardprocessor_consts.h b/common/core/keyboardprocessor/include/keyman/keyboardprocessor_consts.h
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyman/keyboardprocessor_consts.h
rename to common/core/keyboardprocessor/include/keyman/keyboardprocessor_consts.h
diff --git a/common/engine/keyboardprocessor/include/keyman/keyboardprocessor_vkeys.h b/common/core/keyboardprocessor/include/keyman/keyboardprocessor_vkeys.h
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyman/keyboardprocessor_vkeys.h
rename to common/core/keyboardprocessor/include/keyman/keyboardprocessor_vkeys.h
diff --git a/common/engine/keyboardprocessor/include/keyman/meson.build b/common/core/keyboardprocessor/include/keyman/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/include/keyman/meson.build
rename to common/core/keyboardprocessor/include/keyman/meson.build
diff --git a/common/engine/keyboardprocessor/include/meson.build b/common/core/keyboardprocessor/include/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/include/meson.build
rename to common/core/keyboardprocessor/include/meson.build
diff --git a/common/engine/keyboardprocessor/meson.build b/common/core/keyboardprocessor/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/meson.build
rename to common/core/keyboardprocessor/meson.build
diff --git a/common/engine/keyboardprocessor/python/keyman/keyboardprocessor/_api.py b/common/core/keyboardprocessor/python/keyman/keyboardprocessor/_api.py
similarity index 100%
rename from common/engine/keyboardprocessor/python/keyman/keyboardprocessor/_api.py
rename to common/core/keyboardprocessor/python/keyman/keyboardprocessor/_api.py
diff --git a/common/engine/keyboardprocessor/python/keyman/keyboardprocessor/api.py b/common/core/keyboardprocessor/python/keyman/keyboardprocessor/api.py
similarity index 100%
rename from common/engine/keyboardprocessor/python/keyman/keyboardprocessor/api.py
rename to common/core/keyboardprocessor/python/keyman/keyboardprocessor/api.py
diff --git a/common/engine/keyboardprocessor/src/context.hpp b/common/core/keyboardprocessor/src/context.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/context.hpp
rename to common/core/keyboardprocessor/src/context.hpp
diff --git a/common/engine/keyboardprocessor/src/json.cpp b/common/core/keyboardprocessor/src/json.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/json.cpp
rename to common/core/keyboardprocessor/src/json.cpp
diff --git a/common/engine/keyboardprocessor/src/json.hpp b/common/core/keyboardprocessor/src/json.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/json.hpp
rename to common/core/keyboardprocessor/src/json.hpp
diff --git a/common/engine/keyboardprocessor/src/keyboard.cpp b/common/core/keyboardprocessor/src/keyboard.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/keyboard.cpp
rename to common/core/keyboardprocessor/src/keyboard.cpp
diff --git a/common/engine/keyboardprocessor/src/keyboard.hpp b/common/core/keyboardprocessor/src/keyboard.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/keyboard.hpp
rename to common/core/keyboardprocessor/src/keyboard.hpp
diff --git a/common/engine/keyboardprocessor/src/km_kbp_context_api.cpp b/common/core/keyboardprocessor/src/km_kbp_context_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/km_kbp_context_api.cpp
rename to common/core/keyboardprocessor/src/km_kbp_context_api.cpp
diff --git a/common/engine/keyboardprocessor/src/km_kbp_keyboard_api.cpp b/common/core/keyboardprocessor/src/km_kbp_keyboard_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/km_kbp_keyboard_api.cpp
rename to common/core/keyboardprocessor/src/km_kbp_keyboard_api.cpp
diff --git a/common/engine/keyboardprocessor/src/km_kbp_options_api.cpp b/common/core/keyboardprocessor/src/km_kbp_options_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/km_kbp_options_api.cpp
rename to common/core/keyboardprocessor/src/km_kbp_options_api.cpp
diff --git a/common/engine/keyboardprocessor/src/km_kbp_processevent_api.cpp b/common/core/keyboardprocessor/src/km_kbp_processevent_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/km_kbp_processevent_api.cpp
rename to common/core/keyboardprocessor/src/km_kbp_processevent_api.cpp
diff --git a/common/engine/keyboardprocessor/src/km_kbp_state_api.cpp b/common/core/keyboardprocessor/src/km_kbp_state_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/km_kbp_state_api.cpp
rename to common/core/keyboardprocessor/src/km_kbp_state_api.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/.gitignore b/common/core/keyboardprocessor/src/kmx/.gitignore
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/.gitignore
rename to common/core/keyboardprocessor/src/kmx/.gitignore
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_actions.cpp b/common/core/keyboardprocessor/src/kmx/kmx_actions.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_actions.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_actions.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_actions.h b/common/core/keyboardprocessor/src/kmx/kmx_actions.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_actions.h
rename to common/core/keyboardprocessor/src/kmx/kmx_actions.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_base.h b/common/core/keyboardprocessor/src/kmx/kmx_base.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_base.h
rename to common/core/keyboardprocessor/src/kmx/kmx_base.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_capslock.cpp b/common/core/keyboardprocessor/src/kmx/kmx_capslock.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_capslock.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_capslock.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_consts.cpp b/common/core/keyboardprocessor/src/kmx/kmx_consts.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_consts.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_consts.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_context.cpp b/common/core/keyboardprocessor/src/kmx/kmx_context.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_context.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_context.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_context.h b/common/core/keyboardprocessor/src/kmx/kmx_context.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_context.h
rename to common/core/keyboardprocessor/src/kmx/kmx_context.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_debug.cpp b/common/core/keyboardprocessor/src/kmx/kmx_debug.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_debug.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_debug.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_environment.cpp b/common/core/keyboardprocessor/src/kmx/kmx_environment.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_environment.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_environment.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_environment.h b/common/core/keyboardprocessor/src/kmx/kmx_environment.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_environment.h
rename to common/core/keyboardprocessor/src/kmx/kmx_environment.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_file.cpp b/common/core/keyboardprocessor/src/kmx/kmx_file.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_file.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_file.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_file.h b/common/core/keyboardprocessor/src/kmx/kmx_file.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_file.h
rename to common/core/keyboardprocessor/src/kmx/kmx_file.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_modifiers.cpp b/common/core/keyboardprocessor/src/kmx/kmx_modifiers.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_modifiers.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_modifiers.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_options.cpp b/common/core/keyboardprocessor/src/kmx/kmx_options.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_options.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_options.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_options.h b/common/core/keyboardprocessor/src/kmx/kmx_options.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_options.h
rename to common/core/keyboardprocessor/src/kmx/kmx_options.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_processevent.cpp b/common/core/keyboardprocessor/src/kmx/kmx_processevent.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_processevent.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_processevent.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_processevent.hpp b/common/core/keyboardprocessor/src/kmx/kmx_processevent.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_processevent.hpp
rename to common/core/keyboardprocessor/src/kmx/kmx_processevent.hpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_processor.cpp b/common/core/keyboardprocessor/src/kmx/kmx_processor.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_processor.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_processor.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_processor.h b/common/core/keyboardprocessor/src/kmx/kmx_processor.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_processor.h
rename to common/core/keyboardprocessor/src/kmx/kmx_processor.h
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_xstring.cpp b/common/core/keyboardprocessor/src/kmx/kmx_xstring.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_xstring.cpp
rename to common/core/keyboardprocessor/src/kmx/kmx_xstring.cpp
diff --git a/common/engine/keyboardprocessor/src/kmx/kmx_xstring.h b/common/core/keyboardprocessor/src/kmx/kmx_xstring.h
similarity index 100%
rename from common/engine/keyboardprocessor/src/kmx/kmx_xstring.h
rename to common/core/keyboardprocessor/src/kmx/kmx_xstring.h
diff --git a/common/engine/keyboardprocessor/src/meson.build b/common/core/keyboardprocessor/src/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/src/meson.build
rename to common/core/keyboardprocessor/src/meson.build
diff --git a/common/engine/keyboardprocessor/src/mock/mock_processor.cpp b/common/core/keyboardprocessor/src/mock/mock_processor.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/mock/mock_processor.cpp
rename to common/core/keyboardprocessor/src/mock/mock_processor.cpp
diff --git a/common/engine/keyboardprocessor/src/mock/mock_processor.hpp b/common/core/keyboardprocessor/src/mock/mock_processor.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/mock/mock_processor.hpp
rename to common/core/keyboardprocessor/src/mock/mock_processor.hpp
diff --git a/common/engine/keyboardprocessor/src/option.cpp b/common/core/keyboardprocessor/src/option.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/option.cpp
rename to common/core/keyboardprocessor/src/option.cpp
diff --git a/common/engine/keyboardprocessor/src/option.hpp b/common/core/keyboardprocessor/src/option.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/option.hpp
rename to common/core/keyboardprocessor/src/option.hpp
diff --git a/common/engine/keyboardprocessor/src/path.hpp b/common/core/keyboardprocessor/src/path.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/path.hpp
rename to common/core/keyboardprocessor/src/path.hpp
diff --git a/common/engine/keyboardprocessor/src/processor.hpp b/common/core/keyboardprocessor/src/processor.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/processor.hpp
rename to common/core/keyboardprocessor/src/processor.hpp
diff --git a/common/engine/keyboardprocessor/src/state.cpp b/common/core/keyboardprocessor/src/state.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/state.cpp
rename to common/core/keyboardprocessor/src/state.cpp
diff --git a/common/engine/keyboardprocessor/src/state.hpp b/common/core/keyboardprocessor/src/state.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/state.hpp
rename to common/core/keyboardprocessor/src/state.hpp
diff --git a/common/engine/keyboardprocessor/src/utfcodec.cpp b/common/core/keyboardprocessor/src/utfcodec.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/utfcodec.cpp
rename to common/core/keyboardprocessor/src/utfcodec.cpp
diff --git a/common/engine/keyboardprocessor/src/utfcodec.hpp b/common/core/keyboardprocessor/src/utfcodec.hpp
similarity index 100%
rename from common/engine/keyboardprocessor/src/utfcodec.hpp
rename to common/core/keyboardprocessor/src/utfcodec.hpp
diff --git a/common/engine/keyboardprocessor/tests/meson.build b/common/core/keyboardprocessor/tests/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/tests/meson.build
rename to common/core/keyboardprocessor/tests/meson.build
diff --git a/common/engine/keyboardprocessor/tests/standards/jsontest.json b/common/core/keyboardprocessor/tests/standards/jsontest.json
similarity index 100%
rename from common/engine/keyboardprocessor/tests/standards/jsontest.json
rename to common/core/keyboardprocessor/tests/standards/jsontest.json
diff --git a/common/engine/keyboardprocessor/tests/unit/json/jsontest.cpp b/common/core/keyboardprocessor/tests/unit/json/jsontest.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/json/jsontest.cpp
rename to common/core/keyboardprocessor/tests/unit/json/jsontest.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/json/meson.build b/common/core/keyboardprocessor/tests/unit/json/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/json/meson.build
rename to common/core/keyboardprocessor/tests/unit/json/meson.build
diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp b/common/core/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp
rename to common/core/keyboardprocessor/tests/unit/kmnkbd/context_api.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/keyboard_api.cpp b/common/core/keyboardprocessor/tests/unit/kmnkbd/keyboard_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmnkbd/keyboard_api.cpp
rename to common/core/keyboardprocessor/tests/unit/kmnkbd/keyboard_api.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build b/common/core/keyboardprocessor/tests/unit/kmnkbd/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmnkbd/meson.build
rename to common/core/keyboardprocessor/tests/unit/kmnkbd/meson.build
diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/options_api.cpp b/common/core/keyboardprocessor/tests/unit/kmnkbd/options_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmnkbd/options_api.cpp
rename to common/core/keyboardprocessor/tests/unit/kmnkbd/options_api.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/kmnkbd/state_api.cpp b/common/core/keyboardprocessor/tests/unit/kmnkbd/state_api.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmnkbd/state_api.cpp
rename to common/core/keyboardprocessor/tests/unit/kmnkbd/state_api.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmn b/common/core/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmx b/common/core/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/000 - null keyboard.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmn b/common/core/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmx b/common/core/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/001 - basic input UnicodeI.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmn b/common/core/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmx b/common/core/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/002 - basic input Unicode.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/003 - nul.kmn b/common/core/keyboardprocessor/tests/unit/kmx/003 - nul.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/003 - nul.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/003 - nul.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/003 - nul.kmx b/common/core/keyboardprocessor/tests/unit/kmx/003 - nul.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/003 - nul.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/003 - nul.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmn b/common/core/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmx b/common/core/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/004 - basic input (shift 2).kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmn b/common/core/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmx b/common/core/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/005 - nul with initial context.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmn b/common/core/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmx b/common/core/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/006 - vkey input (shift ctrl).kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmn b/common/core/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmx b/common/core/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/007 - vkey input (ctrl alt).kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmn b/common/core/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx b/common/core/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/008 - vkey input (ctrl alt 2).kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/012 - ralt.kmn b/common/core/keyboardprocessor/tests/unit/kmx/012 - ralt.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/012 - ralt.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/012 - ralt.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/012 - ralt.kmx b/common/core/keyboardprocessor/tests/unit/kmx/012 - ralt.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/012 - ralt.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/012 - ralt.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/013 - deadkeys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/014 - groups and virtual keys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmn b/common/core/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmx b/common/core/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/015 - ralt 2.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmn b/common/core/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmx b/common/core/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/017 - space mnemonic kbd.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmn b/common/core/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmx b/common/core/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/018 - nul testing.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/019 - multiple deadkeys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmn b/common/core/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmx b/common/core/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/020 - deadkeys and backspace.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/021 - options.kmn b/common/core/keyboardprocessor/tests/unit/kmx/021 - options.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/021 - options.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/021 - options.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/021 - options.kmx b/common/core/keyboardprocessor/tests/unit/kmx/021 - options.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/021 - options.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/021 - options.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmn b/common/core/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmx b/common/core/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/022 - options with preset.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/023 - options with save.kmn b/common/core/keyboardprocessor/tests/unit/kmx/023 - options with save.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/023 - options with save.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/023 - options with save.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/023 - options with save.kmx b/common/core/keyboardprocessor/tests/unit/kmx/023 - options with save.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/023 - options with save.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/023 - options with save.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmn b/common/core/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmx b/common/core/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/024 - options with save and preset.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmn b/common/core/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmx b/common/core/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/025 - options with reset.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/026 - system stores.kmn b/common/core/keyboardprocessor/tests/unit/kmx/026 - system stores.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/026 - system stores.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/026 - system stores.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/026 - system stores.kmx b/common/core/keyboardprocessor/tests/unit/kmx/026 - system stores.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/026 - system stores.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/026 - system stores.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmn b/common/core/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmx b/common/core/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/027 - system stores 2.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/028 - smp.kmn b/common/core/keyboardprocessor/tests/unit/kmx/028 - smp.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/028 - smp.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/028 - smp.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/028 - smp.kmx b/common/core/keyboardprocessor/tests/unit/kmx/028 - smp.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/028 - smp.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/028 - smp.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/029 - beep.kmn b/common/core/keyboardprocessor/tests/unit/kmx/029 - beep.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/029 - beep.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/029 - beep.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/029 - beep.kmx b/common/core/keyboardprocessor/tests/unit/kmx/029 - beep.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/029 - beep.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/029 - beep.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmn b/common/core/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmx b/common/core/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/030 - multiple groups.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmn b/common/core/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmx b/common/core/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/031 - caps lock.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/032 - caps control.kmn b/common/core/keyboardprocessor/tests/unit/kmx/032 - caps control.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/032 - caps control.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/032 - caps control.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/033 - caps always off.kmn b/common/core/keyboardprocessor/tests/unit/kmx/033 - caps always off.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/033 - caps always off.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/033 - caps always off.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmn b/common/core/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmx b/common/core/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/034 - options double set reset.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmn b/common/core/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmx b/common/core/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/035 - options double set staged.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmn b/common/core/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmx b/common/core/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/036 - options - double reset staged.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmn b/common/core/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmx b/common/core/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/037 - options - double reset.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/038 - punctkeys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmn b/common/core/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmx b/common/core/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/039 - generic ctrlalt.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/040 - long context.kmn b/common/core/keyboardprocessor/tests/unit/kmx/040 - long context.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/040 - long context.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/040 - long context.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/040 - long context.kmx b/common/core/keyboardprocessor/tests/unit/kmx/040 - long context.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/040 - long context.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/040 - long context.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/041 - long context and deadkeys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmn b/common/core/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmn
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmn
rename to common/core/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmn
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmx b/common/core/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmx
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmx
rename to common/core/keyboardprocessor/tests/unit/kmx/042 - long context and split deadkeys.kmx
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/kmp.json b/common/core/keyboardprocessor/tests/unit/kmx/kmp.json
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/kmp.json
rename to common/core/keyboardprocessor/tests/unit/kmx/kmp.json
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/kmx.cpp b/common/core/keyboardprocessor/tests/unit/kmx/kmx.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/kmx.cpp
rename to common/core/keyboardprocessor/tests/unit/kmx/kmx.cpp
diff --git a/common/engine/keyboardprocessor/tests/unit/kmx/meson.build b/common/core/keyboardprocessor/tests/unit/kmx/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/kmx/meson.build
rename to common/core/keyboardprocessor/tests/unit/kmx/meson.build
diff --git a/common/engine/keyboardprocessor/tests/unit/utftest/meson.build b/common/core/keyboardprocessor/tests/unit/utftest/meson.build
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/utftest/meson.build
rename to common/core/keyboardprocessor/tests/unit/utftest/meson.build
diff --git a/common/engine/keyboardprocessor/tests/unit/utftest/utftest.cpp b/common/core/keyboardprocessor/tests/unit/utftest/utftest.cpp
similarity index 100%
rename from common/engine/keyboardprocessor/tests/unit/utftest/utftest.cpp
rename to common/core/keyboardprocessor/tests/unit/utftest/utftest.cpp