diff --git a/common/core/web/tests/resources/fixtures/eventTestConfig.html b/common/test/resources/fixtures/eventTestConfig.html
similarity index 100%
rename from common/core/web/tests/resources/fixtures/eventTestConfig.html
rename to common/test/resources/fixtures/eventTestConfig.html
diff --git a/common/core/web/tests/resources/fixtures/robustAttachment.html b/common/test/resources/fixtures/robustAttachment.html
similarity index 100%
rename from common/core/web/tests/resources/fixtures/robustAttachment.html
rename to common/test/resources/fixtures/robustAttachment.html
diff --git a/common/core/web/tests/resources/fixtures/singleInput.html b/common/test/resources/fixtures/singleInput.html
similarity index 100%
rename from common/core/web/tests/resources/fixtures/singleInput.html
rename to common/test/resources/fixtures/singleInput.html
diff --git a/common/core/web/tests/resources/fixtures/singleTextArea.html b/common/test/resources/fixtures/singleTextArea.html
similarity index 100%
rename from common/core/web/tests/resources/fixtures/singleTextArea.html
rename to common/test/resources/fixtures/singleTextArea.html
diff --git a/common/core/web/tests/resources/html/editableFrame.html b/common/test/resources/html/editableFrame.html
similarity index 100%
rename from common/core/web/tests/resources/html/editableFrame.html
rename to common/test/resources/html/editableFrame.html
diff --git a/common/core/web/tests/resources/html/iframe.html b/common/test/resources/html/iframe.html
similarity index 100%
rename from common/core/web/tests/resources/html/iframe.html
rename to common/test/resources/html/iframe.html
diff --git a/common/core/web/tests/resources/json/engine_tests/basic_lao_simulation.json b/common/test/resources/json/engine_tests/basic_lao_simulation.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/basic_lao_simulation.json
rename to common/test/resources/json/engine_tests/basic_lao_simulation.json
diff --git a/common/core/web/tests/resources/json/engine_tests/chirality.json b/common/test/resources/json/engine_tests/chirality.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/chirality.json
rename to common/test/resources/json/engine_tests/chirality.json
diff --git a/common/core/web/tests/resources/json/engine_tests/deadkeys.json b/common/test/resources/json/engine_tests/deadkeys.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/deadkeys.json
rename to common/test/resources/json/engine_tests/deadkeys.json
diff --git a/common/core/web/tests/resources/json/engine_tests/ghp_enter.json b/common/test/resources/json/engine_tests/ghp_enter.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/ghp_enter.json
rename to common/test/resources/json/engine_tests/ghp_enter.json
diff --git a/common/core/web/tests/resources/json/engine_tests/options_with_save_1.json b/common/test/resources/json/engine_tests/options_with_save_1.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/options_with_save_1.json
rename to common/test/resources/json/engine_tests/options_with_save_1.json
diff --git a/common/core/web/tests/resources/json/engine_tests/options_with_save_2.json b/common/test/resources/json/engine_tests/options_with_save_2.json
similarity index 100%
rename from common/core/web/tests/resources/json/engine_tests/options_with_save_2.json
rename to common/test/resources/json/engine_tests/options_with_save_2.json
diff --git a/common/core/web/tests/resources/json/keyboards/galaxie_hebrew_positional.json b/common/test/resources/json/keyboards/galaxie_hebrew_positional.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/galaxie_hebrew_positional.json
rename to common/test/resources/json/keyboards/galaxie_hebrew_positional.json
diff --git a/common/core/web/tests/resources/json/keyboards/khmer_angkor.json b/common/test/resources/json/keyboards/khmer_angkor.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/khmer_angkor.json
rename to common/test/resources/json/keyboards/khmer_angkor.json
diff --git a/common/core/web/tests/resources/json/keyboards/lao_2008_basic.json b/common/test/resources/json/keyboards/lao_2008_basic.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/lao_2008_basic.json
rename to common/test/resources/json/keyboards/lao_2008_basic.json
diff --git a/common/core/web/tests/resources/json/keyboards/options_with_save.json b/common/test/resources/json/keyboards/options_with_save.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/options_with_save.json
rename to common/test/resources/json/keyboards/options_with_save.json
diff --git a/common/core/web/tests/resources/json/keyboards/test_chirality.json b/common/test/resources/json/keyboards/test_chirality.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/test_chirality.json
rename to common/test/resources/json/keyboards/test_chirality.json
diff --git a/common/core/web/tests/resources/json/keyboards/test_deadkeys.json b/common/test/resources/json/keyboards/test_deadkeys.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/test_deadkeys.json
rename to common/test/resources/json/keyboards/test_deadkeys.json
diff --git a/common/core/web/tests/resources/json/keyboards/test_simple_deadkeys.json b/common/test/resources/json/keyboards/test_simple_deadkeys.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/test_simple_deadkeys.json
rename to common/test/resources/json/keyboards/test_simple_deadkeys.json
diff --git a/common/core/web/tests/resources/json/keyboards/web_context_tests.json b/common/test/resources/json/keyboards/web_context_tests.json
similarity index 100%
rename from common/core/web/tests/resources/json/keyboards/web_context_tests.json
rename to common/test/resources/json/keyboards/web_context_tests.json
diff --git a/common/core/web/tests/resources/json/models/angle-punct-dummy.json b/common/test/resources/json/models/angle-punct-dummy.json
similarity index 100%
rename from common/core/web/tests/resources/json/models/angle-punct-dummy.json
rename to common/test/resources/json/models/angle-punct-dummy.json
diff --git a/common/core/web/tests/resources/json/models/quote-punct-dummy.json b/common/test/resources/json/models/quote-punct-dummy.json
similarity index 100%
rename from common/core/web/tests/resources/json/models/quote-punct-dummy.json
rename to common/test/resources/json/models/quote-punct-dummy.json
diff --git a/common/core/web/tests/resources/keyboards/.gitignore b/common/test/resources/keyboards/.gitignore
similarity index 100%
rename from common/core/web/tests/resources/keyboards/.gitignore
rename to common/test/resources/keyboards/.gitignore
diff --git a/common/core/web/tests/resources/keyboards/galaxie_hebrew_positional-2.2.js b/common/test/resources/keyboards/galaxie_hebrew_positional-2.2.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/galaxie_hebrew_positional-2.2.js
rename to common/test/resources/keyboards/galaxie_hebrew_positional-2.2.js
diff --git a/common/core/web/tests/resources/keyboards/khmer_angkor.js b/common/test/resources/keyboards/khmer_angkor.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/khmer_angkor.js
rename to common/test/resources/keyboards/khmer_angkor.js
diff --git a/common/core/web/tests/resources/keyboards/lao_2008_basic.js b/common/test/resources/keyboards/lao_2008_basic.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/lao_2008_basic.js
rename to common/test/resources/keyboards/lao_2008_basic.js
diff --git a/common/core/web/tests/resources/keyboards/options_with_save.js b/common/test/resources/keyboards/options_with_save.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/options_with_save.js
rename to common/test/resources/keyboards/options_with_save.js
diff --git a/common/core/web/tests/resources/keyboards/test_917.js b/common/test/resources/keyboards/test_917.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_917.js
rename to common/test/resources/keyboards/test_917.js
diff --git a/common/core/web/tests/resources/keyboards/test_917.kmn b/common/test/resources/keyboards/test_917.kmn
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_917.kmn
rename to common/test/resources/keyboards/test_917.kmn
diff --git a/common/core/web/tests/resources/keyboards/test_chirality.js b/common/test/resources/keyboards/test_chirality.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_chirality.js
rename to common/test/resources/keyboards/test_chirality.js
diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kmn b/common/test/resources/keyboards/test_chirality.kmn
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_chirality.kmn
rename to common/test/resources/keyboards/test_chirality.kmn
diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kmx b/common/test/resources/keyboards/test_chirality.kmx
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_chirality.kmx
rename to common/test/resources/keyboards/test_chirality.kmx
diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kvk b/common/test/resources/keyboards/test_chirality.kvk
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_chirality.kvk
rename to common/test/resources/keyboards/test_chirality.kvk
diff --git a/common/core/web/tests/resources/keyboards/test_chirality.kvks b/common/test/resources/keyboards/test_chirality.kvks
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_chirality.kvks
rename to common/test/resources/keyboards/test_chirality.kvks
diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.js b/common/test/resources/keyboards/test_deadkeys.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_deadkeys.js
rename to common/test/resources/keyboards/test_deadkeys.js
diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kmn b/common/test/resources/keyboards/test_deadkeys.kmn
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_deadkeys.kmn
rename to common/test/resources/keyboards/test_deadkeys.kmn
diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kmx b/common/test/resources/keyboards/test_deadkeys.kmx
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_deadkeys.kmx
rename to common/test/resources/keyboards/test_deadkeys.kmx
diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kvk b/common/test/resources/keyboards/test_deadkeys.kvk
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_deadkeys.kvk
rename to common/test/resources/keyboards/test_deadkeys.kvk
diff --git a/common/core/web/tests/resources/keyboards/test_deadkeys.kvks b/common/test/resources/keyboards/test_deadkeys.kvks
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_deadkeys.kvks
rename to common/test/resources/keyboards/test_deadkeys.kvks
diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.js b/common/test/resources/keyboards/test_simple_deadkeys.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.js
rename to common/test/resources/keyboards/test_simple_deadkeys.js
diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmn b/common/test/resources/keyboards/test_simple_deadkeys.kmn
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmn
rename to common/test/resources/keyboards/test_simple_deadkeys.kmn
diff --git a/common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmx b/common/test/resources/keyboards/test_simple_deadkeys.kmx
similarity index 100%
rename from common/core/web/tests/resources/keyboards/test_simple_deadkeys.kmx
rename to common/test/resources/keyboards/test_simple_deadkeys.kmx
diff --git a/common/core/web/tests/resources/keyboards/unit_test_keyboards.kpj b/common/test/resources/keyboards/unit_test_keyboards.kpj
similarity index 100%
rename from common/core/web/tests/resources/keyboards/unit_test_keyboards.kpj
rename to common/test/resources/keyboards/unit_test_keyboards.kpj
diff --git a/common/core/web/tests/resources/keyboards/web_context_tests.js b/common/test/resources/keyboards/web_context_tests.js
similarity index 100%
rename from common/core/web/tests/resources/keyboards/web_context_tests.js
rename to common/test/resources/keyboards/web_context_tests.js
diff --git a/common/core/web/input-processor/.gitignore b/common/web/input-processor/.gitignore
similarity index 100%
rename from common/core/web/input-processor/.gitignore
rename to common/web/input-processor/.gitignore
diff --git a/common/core/web/input-processor/README.md b/common/web/input-processor/README.md
similarity index 100%
rename from common/core/web/input-processor/README.md
rename to common/web/input-processor/README.md
diff --git a/common/core/web/input-processor/package.json b/common/web/input-processor/package.json
similarity index 100%
rename from common/core/web/input-processor/package.json
rename to common/web/input-processor/package.json
diff --git a/common/core/web/input-processor/src/build.sh b/common/web/input-processor/src/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/input-processor/src/build.sh
rename to common/web/input-processor/src/build.sh
diff --git a/common/core/web/input-processor/src/includes/events.ts b/common/web/input-processor/src/includes/events.ts
similarity index 100%
rename from common/core/web/input-processor/src/includes/events.ts
rename to common/web/input-processor/src/includes/events.ts
diff --git a/common/core/web/input-processor/src/text/contextWindow.ts b/common/web/input-processor/src/text/contextWindow.ts
similarity index 100%
rename from common/core/web/input-processor/src/text/contextWindow.ts
rename to common/web/input-processor/src/text/contextWindow.ts
diff --git a/common/core/web/input-processor/src/text/inputProcessor.ts b/common/web/input-processor/src/text/inputProcessor.ts
similarity index 100%
rename from common/core/web/input-processor/src/text/inputProcessor.ts
rename to common/web/input-processor/src/text/inputProcessor.ts
diff --git a/common/core/web/input-processor/src/text/prediction/languageProcessor.ts b/common/web/input-processor/src/text/prediction/languageProcessor.ts
similarity index 100%
rename from common/core/web/input-processor/src/text/prediction/languageProcessor.ts
rename to common/web/input-processor/src/text/prediction/languageProcessor.ts
diff --git a/common/core/web/input-processor/src/tsconfig.json b/common/web/input-processor/src/tsconfig.json
similarity index 100%
rename from common/core/web/input-processor/src/tsconfig.json
rename to common/web/input-processor/src/tsconfig.json
diff --git a/common/core/web/input-processor/test.sh b/common/web/input-processor/test.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/input-processor/test.sh
rename to common/web/input-processor/test.sh
diff --git a/common/core/web/input-processor/tests/cases/inputProcessor.js b/common/web/input-processor/tests/cases/inputProcessor.js
similarity index 100%
rename from common/core/web/input-processor/tests/cases/inputProcessor.js
rename to common/web/input-processor/tests/cases/inputProcessor.js
diff --git a/common/core/web/input-processor/tests/cases/languageProcessor.js b/common/web/input-processor/tests/cases/languageProcessor.js
similarity index 100%
rename from common/core/web/input-processor/tests/cases/languageProcessor.js
rename to common/web/input-processor/tests/cases/languageProcessor.js
diff --git a/common/core/web/keyboard-processor/.gitignore b/common/web/keyboard-processor/.gitignore
similarity index 100%
rename from common/core/web/keyboard-processor/.gitignore
rename to common/web/keyboard-processor/.gitignore
diff --git a/common/core/web/keyboard-processor/README.md b/common/web/keyboard-processor/README.md
similarity index 100%
rename from common/core/web/keyboard-processor/README.md
rename to common/web/keyboard-processor/README.md
diff --git a/common/core/web/keyboard-processor/package.json b/common/web/keyboard-processor/package.json
similarity index 100%
rename from common/core/web/keyboard-processor/package.json
rename to common/web/keyboard-processor/package.json
diff --git a/common/core/web/keyboard-processor/src/build.sh b/common/web/keyboard-processor/src/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/keyboard-processor/src/build.sh
rename to common/web/keyboard-processor/src/build.sh
diff --git a/common/core/web/keyboard-processor/src/keyboards/activeLayout.ts b/common/web/keyboard-processor/src/keyboards/activeLayout.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/keyboards/activeLayout.ts
rename to common/web/keyboard-processor/src/keyboards/activeLayout.ts
diff --git a/common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts b/common/web/keyboard-processor/src/keyboards/defaultLayouts.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/keyboards/defaultLayouts.ts
rename to common/web/keyboard-processor/src/keyboards/defaultLayouts.ts
diff --git a/common/core/web/keyboard-processor/src/keyboards/keyboard.ts b/common/web/keyboard-processor/src/keyboards/keyboard.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/keyboards/keyboard.ts
rename to common/web/keyboard-processor/src/keyboards/keyboard.ts
diff --git a/common/core/web/keyboard-processor/src/text/codes.ts b/common/web/keyboard-processor/src/text/codes.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/codes.ts
rename to common/web/keyboard-processor/src/text/codes.ts
diff --git a/common/core/web/keyboard-processor/src/text/deadkeys.ts b/common/web/keyboard-processor/src/text/deadkeys.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/deadkeys.ts
rename to common/web/keyboard-processor/src/text/deadkeys.ts
diff --git a/common/core/web/keyboard-processor/src/text/defaultOutput.ts b/common/web/keyboard-processor/src/text/defaultOutput.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/defaultOutput.ts
rename to common/web/keyboard-processor/src/text/defaultOutput.ts
diff --git a/common/core/web/keyboard-processor/src/text/kbdInterface.ts b/common/web/keyboard-processor/src/text/kbdInterface.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/kbdInterface.ts
rename to common/web/keyboard-processor/src/text/kbdInterface.ts
diff --git a/common/core/web/keyboard-processor/src/text/keyEvent.ts b/common/web/keyboard-processor/src/text/keyEvent.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/keyEvent.ts
rename to common/web/keyboard-processor/src/text/keyEvent.ts
diff --git a/common/core/web/keyboard-processor/src/text/keyMapping.ts b/common/web/keyboard-processor/src/text/keyMapping.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/keyMapping.ts
rename to common/web/keyboard-processor/src/text/keyMapping.ts
diff --git a/common/core/web/keyboard-processor/src/text/keyboardProcessor.ts b/common/web/keyboard-processor/src/text/keyboardProcessor.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/keyboardProcessor.ts
rename to common/web/keyboard-processor/src/text/keyboardProcessor.ts
diff --git a/common/core/web/keyboard-processor/src/text/outputTarget.ts b/common/web/keyboard-processor/src/text/outputTarget.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/outputTarget.ts
rename to common/web/keyboard-processor/src/text/outputTarget.ts
diff --git a/common/core/web/keyboard-processor/src/text/ruleBehavior.ts b/common/web/keyboard-processor/src/text/ruleBehavior.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/ruleBehavior.ts
rename to common/web/keyboard-processor/src/text/ruleBehavior.ts
diff --git a/common/core/web/keyboard-processor/src/text/systemStores.ts b/common/web/keyboard-processor/src/text/systemStores.ts
similarity index 100%
rename from common/core/web/keyboard-processor/src/text/systemStores.ts
rename to common/web/keyboard-processor/src/text/systemStores.ts
diff --git a/common/core/web/keyboard-processor/src/tsconfig.json b/common/web/keyboard-processor/src/tsconfig.json
similarity index 100%
rename from common/core/web/keyboard-processor/src/tsconfig.json
rename to common/web/keyboard-processor/src/tsconfig.json
diff --git a/common/core/web/keyboard-processor/test.sh b/common/web/keyboard-processor/test.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/keyboard-processor/test.sh
rename to common/web/keyboard-processor/test.sh
diff --git a/common/core/web/keyboard-processor/tests/cases/basic-engine.js b/common/web/keyboard-processor/tests/cases/basic-engine.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/basic-engine.js
rename to common/web/keyboard-processor/tests/cases/basic-engine.js
diff --git a/common/core/web/keyboard-processor/tests/cases/basic-init.js b/common/web/keyboard-processor/tests/cases/basic-init.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/basic-init.js
rename to common/web/keyboard-processor/tests/cases/basic-init.js
diff --git a/common/core/web/keyboard-processor/tests/cases/chirality.js b/common/web/keyboard-processor/tests/cases/chirality.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/chirality.js
rename to common/web/keyboard-processor/tests/cases/chirality.js
diff --git a/common/core/web/keyboard-processor/tests/cases/deadkeys.js b/common/web/keyboard-processor/tests/cases/deadkeys.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/deadkeys.js
rename to common/web/keyboard-processor/tests/cases/deadkeys.js
diff --git a/common/core/web/keyboard-processor/tests/cases/engine/context.js b/common/web/keyboard-processor/tests/cases/engine/context.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/engine/context.js
rename to common/web/keyboard-processor/tests/cases/engine/context.js
diff --git a/common/core/web/keyboard-processor/tests/cases/engine/notany_context.js b/common/web/keyboard-processor/tests/cases/engine/notany_context.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/engine/notany_context.js
rename to common/web/keyboard-processor/tests/cases/engine/notany_context.js
diff --git a/common/core/web/keyboard-processor/tests/cases/engine/stores.js b/common/web/keyboard-processor/tests/cases/engine/stores.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/engine/stores.js
rename to common/web/keyboard-processor/tests/cases/engine/stores.js
diff --git a/common/core/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js b/common/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js
rename to common/web/keyboard-processor/tests/cases/engine/unmatched_final_group.js
diff --git a/common/core/web/keyboard-processor/tests/cases/transcriptions.js b/common/web/keyboard-processor/tests/cases/transcriptions.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/transcriptions.js
rename to common/web/keyboard-processor/tests/cases/transcriptions.js
diff --git a/common/core/web/keyboard-processor/tests/cases/versions.js b/common/web/keyboard-processor/tests/cases/versions.js
similarity index 100%
rename from common/core/web/keyboard-processor/tests/cases/versions.js
rename to common/web/keyboard-processor/tests/cases/versions.js
diff --git a/common/core/web/tools/recorder/.gitignore b/common/web/recorder/.gitignore
similarity index 100%
rename from common/core/web/tools/recorder/.gitignore
rename to common/web/recorder/.gitignore
diff --git a/common/core/web/tools/recorder/package.json b/common/web/recorder/package.json
similarity index 100%
rename from common/core/web/tools/recorder/package.json
rename to common/web/recorder/package.json
diff --git a/common/core/web/tools/recorder/src/build.sh b/common/web/recorder/src/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/tools/recorder/src/build.sh
rename to common/web/recorder/src/build.sh
diff --git a/common/core/web/tools/recorder/src/index.ts b/common/web/recorder/src/index.ts
similarity index 100%
rename from common/core/web/tools/recorder/src/index.ts
rename to common/web/recorder/src/index.ts
diff --git a/common/core/web/tools/recorder/src/nodeProctor.ts b/common/web/recorder/src/nodeProctor.ts
similarity index 100%
rename from common/core/web/tools/recorder/src/nodeProctor.ts
rename to common/web/recorder/src/nodeProctor.ts
diff --git a/common/core/web/tools/recorder/src/nodeProctor.tsconfig.json b/common/web/recorder/src/nodeProctor.tsconfig.json
similarity index 100%
rename from common/core/web/tools/recorder/src/nodeProctor.tsconfig.json
rename to common/web/recorder/src/nodeProctor.tsconfig.json
diff --git a/common/core/web/tools/recorder/src/proctor.ts b/common/web/recorder/src/proctor.ts
similarity index 100%
rename from common/core/web/tools/recorder/src/proctor.ts
rename to common/web/recorder/src/proctor.ts
diff --git a/common/core/web/tools/recorder/src/tsconfig.json b/common/web/recorder/src/tsconfig.json
similarity index 100%
rename from common/core/web/tools/recorder/src/tsconfig.json
rename to common/web/recorder/src/tsconfig.json
diff --git a/common/core/web/tools/sentry-manager/.gitignore b/common/web/sentry-manager/.gitignore
similarity index 100%
rename from common/core/web/tools/sentry-manager/.gitignore
rename to common/web/sentry-manager/.gitignore
diff --git a/common/core/web/tools/sentry-manager/package.json b/common/web/sentry-manager/package.json
similarity index 100%
rename from common/core/web/tools/sentry-manager/package.json
rename to common/web/sentry-manager/package.json
diff --git a/common/core/web/tools/sentry-manager/src/build.sh b/common/web/sentry-manager/src/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/tools/sentry-manager/src/build.sh
rename to common/web/sentry-manager/src/build.sh
diff --git a/common/core/web/tools/sentry-manager/src/index.ts b/common/web/sentry-manager/src/index.ts
similarity index 100%
rename from common/core/web/tools/sentry-manager/src/index.ts
rename to common/web/sentry-manager/src/index.ts
diff --git a/common/core/web/tools/sentry-manager/src/tsconfig.json b/common/web/sentry-manager/src/tsconfig.json
similarity index 100%
rename from common/core/web/tools/sentry-manager/src/tsconfig.json
rename to common/web/sentry-manager/src/tsconfig.json
diff --git a/common/core/web/utils/.gitignore b/common/web/utils/.gitignore
similarity index 100%
rename from common/core/web/utils/.gitignore
rename to common/web/utils/.gitignore
diff --git a/common/core/web/utils/build.sh b/common/web/utils/build.sh
old mode 100755
new mode 100644
similarity index 100%
rename from common/core/web/utils/build.sh
rename to common/web/utils/build.sh
diff --git a/common/core/web/utils/package.json b/common/web/utils/package.json
similarity index 100%
rename from common/core/web/utils/package.json
rename to common/web/utils/package.json
diff --git a/common/core/web/utils/src/deepCopy.ts b/common/web/utils/src/deepCopy.ts
similarity index 100%
rename from common/core/web/utils/src/deepCopy.ts
rename to common/web/utils/src/deepCopy.ts
diff --git a/common/core/web/utils/src/deviceSpec.ts b/common/web/utils/src/deviceSpec.ts
similarity index 100%
rename from common/core/web/utils/src/deviceSpec.ts
rename to common/web/utils/src/deviceSpec.ts
diff --git a/common/core/web/utils/src/globalObject.ts b/common/web/utils/src/globalObject.ts
similarity index 100%
rename from common/core/web/utils/src/globalObject.ts
rename to common/web/utils/src/globalObject.ts
diff --git a/common/core/web/utils/src/index.ts b/common/web/utils/src/index.ts
similarity index 100%
rename from common/core/web/utils/src/index.ts
rename to common/web/utils/src/index.ts
diff --git a/common/core/web/utils/src/kmwstring.ts b/common/web/utils/src/kmwstring.ts
similarity index 100%
rename from common/core/web/utils/src/kmwstring.ts
rename to common/web/utils/src/kmwstring.ts
diff --git a/common/core/web/utils/src/version.ts b/common/web/utils/src/version.ts
similarity index 100%
rename from common/core/web/utils/src/version.ts
rename to common/web/utils/src/version.ts
diff --git a/common/core/web/utils/tsconfig.json b/common/web/utils/tsconfig.json
similarity index 100%
rename from common/core/web/utils/tsconfig.json
rename to common/web/utils/tsconfig.json