diff --git a/biome.json b/biome.json
index 9d4bf352a..07025a755 100644
--- a/biome.json
+++ b/biome.json
@@ -19,7 +19,7 @@
   },
   "overrides": [
     {
-      "includes": ["static/**"],
+      "includes": ["static/**", "shared/**"],
       "linter": {
         "rules": {
           "suspicious": {
diff --git a/static/assert.ts b/shared/assert.ts
similarity index 100%
rename from static/assert.ts
rename to shared/assert.ts
diff --git a/static/rison.ts b/shared/rison.ts
similarity index 100%
rename from static/rison.ts
rename to shared/rison.ts
diff --git a/static/ansi-to-html.ts b/static/ansi-to-html.ts
index d4f62a663..c53380cac 100644
--- a/static/ansi-to-html.ts
+++ b/static/ansi-to-html.ts
@@ -26,9 +26,9 @@
 // Converted to typescript by MarkusJx
 
 import _ from 'underscore';
+import {assert, unwrap} from '../shared/assert.js';
 import {escapeHTML, isString} from '../shared/common-utils.js';
 import {AnsiToHtmlOptions, ColorCodes} from './ansi-to-html.interfaces.js';
-import {assert, unwrap} from './assert.js';
 
 const defaults: AnsiToHtmlOptions = {
     fg: '#FFF',
diff --git a/static/artifact-handler.ts b/static/artifact-handler.ts
index e9e5c84ab..ffa9723b9 100644
--- a/static/artifact-handler.ts
+++ b/static/artifact-handler.ts
@@ -24,9 +24,9 @@
 
 import {Buffer} from 'buffer';
 import $ from 'jquery';
+import {assert, unwrap} from '../shared/assert.js';
 import {CompilationResult} from '../types/compilation/compilation.interfaces.js';
 import {Artifact, ArtifactType} from '../types/tool.interfaces.js';
-import {assert, unwrap} from './assert.js';
 import * as BootstrapUtils from './bootstrap-utils.js';
 import {Alert} from './widgets/alert.js';
 
diff --git a/static/formatter-registry.ts b/static/formatter-registry.ts
index 970dce7c9..c056eafd0 100644
--- a/static/formatter-registry.ts
+++ b/static/formatter-registry.ts
@@ -23,10 +23,9 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import * as monaco from 'monaco-editor';
-
+import {unwrap} from '../shared/assert.js';
 import {getFormattedCode} from './api/api.js';
 import {FormattingRequest} from './api/formatting.interfaces.js';
-import {unwrap} from './assert.js';
 import {Settings} from './settings.js';
 import {Alert} from './widgets/alert.js';
 
diff --git a/static/main.ts b/static/main.ts
index 7f2686a0c..d3d1992f5 100644
--- a/static/main.ts
+++ b/static/main.ts
@@ -43,10 +43,10 @@ import _ from 'underscore';
 // We re-assign this
 let jsCookie = JsCookie;
 
+import {unwrap} from '../shared/assert.js';
 import * as utils from '../shared/common-utils.js';
 import {ParseFiltersAndOutputOptions} from '../types/features/filters.interfaces.js';
 import {LanguageKey} from '../types/languages.interfaces.js';
-import {unwrap} from './assert.js';
 import * as BootstrapUtils from './bootstrap-utils.js';
 import {ComponentConfig, ComponentStateMap, GoldenLayoutConfig} from './components.interfaces.js';
 import * as Components from './components.js';
diff --git a/static/multifile-service.ts b/static/multifile-service.ts
index c1d732c05..292e1785c 100644
--- a/static/multifile-service.ts
+++ b/static/multifile-service.ts
@@ -25,9 +25,9 @@
 import JSZip from 'jszip';
 import path from 'path-browserify';
 import _ from 'underscore';
+import {unwrap} from '../shared/assert.js';
 import {FiledataPair} from '../types/compilation/compilation.interfaces.js';
 import {LanguageKey} from '../types/languages.interfaces.js';
-import {unwrap} from './assert.js';
 import {Hub} from './hub.js';
 import * as options from './options.js';
 import {Alert} from './widgets/alert.js';
diff --git a/static/options.ts b/static/options.ts
index fdef61883..dbbc1ee36 100644
--- a/static/options.ts
+++ b/static/options.ts
@@ -22,7 +22,7 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import {unwrap} from './assert.js';
+import {unwrap} from '../shared/assert.js';
 
 const configElement = document.getElementById('config');
 if (!configElement) {
diff --git a/static/panes/ast-view.ts b/static/panes/ast-view.ts
index 6bb31c401..dfcd807ce 100644
--- a/static/panes/ast-view.ts
+++ b/static/panes/ast-view.ts
@@ -26,10 +26,10 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {ResultLine} from '../../types/resultline/resultline.interfaces.js';
-import {unwrap} from '../assert.js';
 import * as colour from '../colour.js';
 import {Hub} from '../hub.js';
 import * as monacoConfig from '../monaco-config.js';
diff --git a/static/panes/cfg-view.ts b/static/panes/cfg-view.ts
index f515b6704..eb26aa269 100644
--- a/static/panes/cfg-view.ts
+++ b/static/panes/cfg-view.ts
@@ -28,6 +28,7 @@ import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import TomSelect from 'tom-select';
 import _ from 'underscore';
+import {assert, unwrap} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {
     AnnotatedCfgDescriptor,
@@ -37,7 +38,6 @@ import {
 } from '../../types/compilation/cfg.interfaces.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {assert, unwrap} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {GraphLayoutCore} from '../graph-layout-core.js';
 import {Hub} from '../hub.js';
diff --git a/static/panes/compiler.ts b/static/panes/compiler.ts
index 53d020fdf..ed91376b6 100644
--- a/static/panes/compiler.ts
+++ b/static/panes/compiler.ts
@@ -72,6 +72,7 @@ import {PPOptions} from './pp-view.interfaces.js';
 import IEditorMouseEvent = editor.IEditorMouseEvent;
 
 import fileSaver from 'file-saver';
+import {unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML, splitArguments} from '../../shared/common-utils.js';
 import {ClangirBackendOptions} from '../../types/compilation/clangir.interfaces.js';
 import {LLVMIrBackendOptions} from '../../types/compilation/ir.interfaces.js';
@@ -81,7 +82,6 @@ import {InstructionSet} from '../../types/instructionsets.js';
 import {LanguageKey} from '../../types/languages.interfaces.js';
 import {Tool} from '../../types/tool.interfaces.js';
 import {ArtifactHandler} from '../artifact-handler.js';
-import {unwrap, unwrapString} from '../assert.js';
 import {ICompilerShared} from '../compiler-shared.interfaces.js';
 import {CompilerShared} from '../compiler-shared.js';
 import {SourceAndFiles} from '../download-service.js';
diff --git a/static/panes/conformance-view.ts b/static/panes/conformance-view.ts
index cef20859f..6b1aa3c70 100644
--- a/static/panes/conformance-view.ts
+++ b/static/panes/conformance-view.ts
@@ -25,11 +25,11 @@
 import {Container} from 'golden-layout';
 import $ from 'jquery';
 import _ from 'underscore';
+import {unwrapString} from '../../shared/assert.js';
 import {escapeHTML, unique} from '../../shared/common-utils.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {SelectedLibraryVersion} from '../../types/libraries/libraries.interfaces.js';
-import {unwrapString} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {CompilationStatus} from '../compiler-service.interfaces.js';
 import {CompilerService} from '../compiler-service.js';
diff --git a/static/panes/device-view.ts b/static/panes/device-view.ts
index e32e858a9..9e3ea23fe 100644
--- a/static/panes/device-view.ts
+++ b/static/panes/device-view.ts
@@ -27,11 +27,11 @@ import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import TomSelect from 'tom-select';
 import _ from 'underscore';
+import {assert} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {InstructionSet} from '../../types/instructionsets.js';
 import {ResultLine} from '../../types/resultline/resultline.interfaces.js';
-import {assert} from '../assert.js';
 import * as colour from '../colour.js';
 import {Hub} from '../hub.js';
 import * as monacoConfig from '../monaco-config.js';
diff --git a/static/panes/editor.ts b/static/panes/editor.ts
index 75e224388..bfae2c6d5 100644
--- a/static/panes/editor.ts
+++ b/static/panes/editor.ts
@@ -43,12 +43,12 @@ import '../formatter-registry';
 import '../modes/_all';
 import {Container} from 'golden-layout';
 import type {escape_html} from 'tom-select/dist/types/utils.js';
+import {assert, unwrap} from '../../shared/assert.js';
 import {escapeHTML, isString} from '../../shared/common-utils.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {Language, LanguageKey} from '../../types/languages.interfaces.js';
 import {MessageWithLocation, ResultLine} from '../../types/resultline/resultline.interfaces.js';
-import {assert, unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import {Decoration, Motd} from '../motd.interfaces.js';
 import {Compiler} from './compiler.js';
diff --git a/static/panes/gccdump-view.ts b/static/panes/gccdump-view.ts
index d3392335c..2c2c11148 100644
--- a/static/panes/gccdump-view.ts
+++ b/static/panes/gccdump-view.ts
@@ -28,9 +28,9 @@ import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import TomSelect from 'tom-select';
 import _ from 'underscore';
+import {assert, unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {assert, unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import * as monacoConfig from '../monaco-config.js';
 import {Toggles} from '../widgets/toggles.js';
diff --git a/static/panes/gnatdebug-view.ts b/static/panes/gnatdebug-view.ts
index 526a5d191..82363dbfd 100644
--- a/static/panes/gnatdebug-view.ts
+++ b/static/panes/gnatdebug-view.ts
@@ -26,9 +26,9 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import {extendConfig} from '../monaco-config.js';
 import {GnatDebugState} from './gnatdebug-view.interfaces.js';
diff --git a/static/panes/gnatdebugtree-view.ts b/static/panes/gnatdebugtree-view.ts
index f5366f1a7..cad9fdd51 100644
--- a/static/panes/gnatdebugtree-view.ts
+++ b/static/panes/gnatdebugtree-view.ts
@@ -26,9 +26,9 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import {extendConfig} from '../monaco-config.js';
 import {GnatDebugTreeState} from './gnatdebugtree-view.interfaces.js';
diff --git a/static/panes/ir-view.ts b/static/panes/ir-view.ts
index 077838aae..922e07a2e 100644
--- a/static/panes/ir-view.ts
+++ b/static/panes/ir-view.ts
@@ -30,10 +30,10 @@ import _ from 'underscore';
 
 import IEditorMouseEvent = editor.IEditorMouseEvent;
 
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {LLVMIrBackendOptions} from '../../types/compilation/ir.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {applyColours} from '../colour.js';
 import * as Components from '../components.js';
 import {createDragSource} from '../components.js';
diff --git a/static/panes/opt-pipeline.ts b/static/panes/opt-pipeline.ts
index dcd623444..0d91d7219 100644
--- a/static/panes/opt-pipeline.ts
+++ b/static/panes/opt-pipeline.ts
@@ -29,6 +29,7 @@ import * as monaco from 'monaco-editor';
 import scrollIntoView from 'scroll-into-view-if-needed';
 import TomSelect from 'tom-select';
 import _ from 'underscore';
+import {unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {
@@ -37,7 +38,6 @@ import {
     OptPipelineResults,
 } from '../../types/compilation/opt-pipeline-output.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap, unwrapString} from '../assert.js';
 import {Hub} from '../hub.js';
 import {extendConfig} from '../monaco-config.js';
 import * as utils from '../utils.js';
diff --git a/static/panes/opt-view.ts b/static/panes/opt-view.ts
index 1542d4cbe..bd64c13c3 100644
--- a/static/panes/opt-view.ts
+++ b/static/panes/opt-view.ts
@@ -26,9 +26,9 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import {extendConfig} from '../monaco-config.js';
 import {Toggles} from '../widgets/toggles.js';
diff --git a/static/panes/pane.ts b/static/panes/pane.ts
index f009646cd..e11804e2e 100644
--- a/static/panes/pane.ts
+++ b/static/panes/pane.ts
@@ -25,10 +25,10 @@
 import {Container} from 'golden-layout';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {EventHub} from '../event-hub.js';
 import {Hub} from '../hub.js';
 import {Settings, SiteSettings} from '../settings.js';
diff --git a/static/panes/pp-view.ts b/static/panes/pp-view.ts
index 679b7038a..7ebe756bc 100644
--- a/static/panes/pp-view.ts
+++ b/static/panes/pp-view.ts
@@ -26,9 +26,9 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult, PPOutput} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import * as monacoConfig from '../monaco-config.js';
 import {Toggles} from '../widgets/toggles.js';
diff --git a/static/panes/stack-usage-view.ts b/static/panes/stack-usage-view.ts
index 529a283da..80abe8a7e 100644
--- a/static/panes/stack-usage-view.ts
+++ b/static/panes/stack-usage-view.ts
@@ -26,9 +26,9 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {Hub} from '../hub.js';
 import {extendConfig} from '../monaco-config.js';
 import {SentryCapture} from '../sentry.js';
diff --git a/static/panes/tool.ts b/static/panes/tool.ts
index dcb09f98e..fa3797fb4 100644
--- a/static/panes/tool.ts
+++ b/static/panes/tool.ts
@@ -27,11 +27,11 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
+import {unwrap, unwrapString} from '../../shared/assert.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {LanguageKey} from '../../types/languages.interfaces.js';
 import * as AnsiToHtml from '../ansi-to-html.js';
-import {unwrap, unwrapString} from '../assert.js';
 import {CompilerService} from '../compiler-service.js';
 import {ComponentConfig, NewToolSettings, TOOL_INPUT_VIEW_COMPONENT_NAME, ToolState} from '../components.interfaces.js';
 import * as Components from '../components.js';
diff --git a/static/panes/tree.ts b/static/panes/tree.ts
index 7297761e9..e7ae0b916 100644
--- a/static/panes/tree.ts
+++ b/static/panes/tree.ts
@@ -27,10 +27,10 @@ import {Container} from 'golden-layout';
 import $ from 'jquery';
 import TomSelect from 'tom-select';
 import _ from 'underscore';
+import {assert, unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {LanguageKey} from '../../types/languages.interfaces.js';
 import {ResultLine} from '../../types/resultline/resultline.interfaces.js';
-import {assert, unwrap, unwrapString} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import * as Components from '../components.js';
 import {createDragSource} from '../components.js';
diff --git a/static/print-view.ts b/static/print-view.ts
index 284b79c4c..1d73824e7 100644
--- a/static/print-view.ts
+++ b/static/print-view.ts
@@ -26,7 +26,7 @@ import $ from 'jquery';
 
 import * as monaco from 'monaco-editor';
 
-import {unwrap} from './assert.js';
+import {unwrap} from '../shared/assert.js';
 import {EventHub} from './event-hub.js';
 import {Hub} from './hub.js';
 import {Themer, themes} from './themes.js';
diff --git a/static/settings.ts b/static/settings.ts
index bffbe767c..47a32c6fc 100644
--- a/static/settings.ts
+++ b/static/settings.ts
@@ -23,9 +23,9 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import $ from 'jquery';
+import {assert, unwrapString} from '../shared/assert.js';
 import {isString, keys} from '../shared/common-utils.js';
 import {LanguageKey} from '../types/languages.interfaces.js';
-import {assert, unwrapString} from './assert.js';
 import * as colour from './colour.js';
 import {AppTheme, ColourScheme, ColourSchemeInfo} from './colour.js';
 import {EventHub} from './event-hub.js';
diff --git a/static/sharing.ts b/static/sharing.ts
index 0bd150a95..9eb90aa91 100644
--- a/static/sharing.ts
+++ b/static/sharing.ts
@@ -27,7 +27,7 @@ import ClipboardJS from 'clipboard';
 import GoldenLayout from 'golden-layout';
 import $ from 'jquery';
 import _ from 'underscore';
-import {unwrap} from './assert.js';
+import {unwrap} from '../shared/assert.js';
 import * as BootstrapUtils from './bootstrap-utils.js';
 import {sessionThenLocalStorage} from './local.js';
 import {options} from './options.js';
diff --git a/static/url.ts b/static/url.ts
index 8b8113230..d6a33ec41 100644
--- a/static/url.ts
+++ b/static/url.ts
@@ -25,10 +25,9 @@
 import GoldenLayout from 'golden-layout';
 import lzstring from 'lz-string';
 import _ from 'underscore';
+import * as rison from '../shared/rison.js';
 import * as Components from './components.js';
 
-import * as rison from './rison.js';
-
 export function convertOldState(state: any): any {
     const sc = state.compilers[0];
     if (!sc) throw new Error('Unable to determine compiler from old state');
diff --git a/static/widgets/compiler-overrides.ts b/static/widgets/compiler-overrides.ts
index db752f2da..983f15a1b 100644
--- a/static/widgets/compiler-overrides.ts
+++ b/static/widgets/compiler-overrides.ts
@@ -23,6 +23,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import $ from 'jquery';
+import {assert, unwrap} from '../../shared/assert.js';
 import {
     CompilerOverrideType,
     ConfiguredOverride,
@@ -30,7 +31,6 @@ import {
     EnvVarOverrides,
 } from '../../types/compilation/compiler-overrides.interfaces.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {assert, unwrap} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {localStorage} from '../local.js';
 import {options} from '../options.js';
diff --git a/static/widgets/compiler-picker-popup.ts b/static/widgets/compiler-picker-popup.ts
index 77eed7dd8..41614f4e3 100644
--- a/static/widgets/compiler-picker-popup.ts
+++ b/static/widgets/compiler-picker-popup.ts
@@ -24,10 +24,9 @@
 
 import * as sifter from '@orchidjs/sifter';
 import $ from 'jquery';
-
+import {unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML, intersection, remove, unique} from '../../shared/common-utils.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap, unwrapString} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {CompilerService} from '../compiler-service.js';
 import {highlight} from '../highlight.js';
diff --git a/static/widgets/compiler-picker.ts b/static/widgets/compiler-picker.ts
index c2d590e5c..3c591b671 100644
--- a/static/widgets/compiler-picker.ts
+++ b/static/widgets/compiler-picker.ts
@@ -24,9 +24,8 @@
 
 import $ from 'jquery';
 import TomSelect from 'tom-select';
-
+import {unwrap} from '../../shared/assert.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
-import {unwrap} from '../assert.js';
 import {CompilerService} from '../compiler-service.js';
 import {EventHub} from '../event-hub.js';
 import {Hub} from '../hub.js';
diff --git a/static/widgets/history-widget.ts b/static/widgets/history-widget.ts
index 5cb9da919..f6e1b36bf 100644
--- a/static/widgets/history-widget.ts
+++ b/static/widgets/history-widget.ts
@@ -25,7 +25,7 @@
 import $ from 'jquery';
 import {editor} from 'monaco-editor';
 import {pluck} from 'underscore';
-import {unwrap} from '../assert.js';
+import {unwrap} from '../../shared/assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {EditorSource, HistoryEntry, sortedList} from '../history.js';
 
diff --git a/static/widgets/libs-widget.ts b/static/widgets/libs-widget.ts
index d15ddf4b7..62d7fba30 100644
--- a/static/widgets/libs-widget.ts
+++ b/static/widgets/libs-widget.ts
@@ -23,7 +23,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import $ from 'jquery';
-import {unwrapString} from '../assert.js';
+import {unwrapString} from '../../shared/assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {localStorage} from '../local.js';
 import {Library, LibraryVersion} from '../options.interfaces.js';
diff --git a/static/widgets/load-save.ts b/static/widgets/load-save.ts
index d946177b9..93c82584b 100644
--- a/static/widgets/load-save.ts
+++ b/static/widgets/load-save.ts
@@ -25,10 +25,10 @@
 import {saveAs} from 'file-saver';
 import $ from 'jquery';
 import _ from 'underscore';
+import {unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {Language} from '../../types/languages.interfaces.js';
 import {SourceApiEntry} from '../../types/source.interfaces.js';
-import {unwrap, unwrapString} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import * as history from '../history.js';
 import {HistorySource} from '../history.js';
diff --git a/static/widgets/runtime-tools.ts b/static/widgets/runtime-tools.ts
index c42430ab1..45d664acf 100644
--- a/static/widgets/runtime-tools.ts
+++ b/static/widgets/runtime-tools.ts
@@ -23,6 +23,7 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import $ from 'jquery';
+import {assert} from '../../shared/assert.js';
 import {CompilerInfo} from '../../types/compiler.interfaces.js';
 import {
     ConfiguredRuntimeTool,
@@ -32,7 +33,6 @@ import {
     RuntimeToolOptions,
     RuntimeToolType,
 } from '../../types/execution/execution.interfaces.js';
-import {assert} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {localStorage} from '../local.js';
 import {options} from '../options.js';
diff --git a/static/widgets/site-templates-widget.ts b/static/widgets/site-templates-widget.ts
index 4bea8d291..14c45ff1f 100644
--- a/static/widgets/site-templates-widget.ts
+++ b/static/widgets/site-templates-widget.ts
@@ -24,9 +24,9 @@
 
 import GoldenLayout from 'golden-layout';
 import $ from 'jquery';
+import {assert, unwrap, unwrapString} from '../../shared/assert.js';
 import {escapeHTML} from '../../shared/common-utils.js';
 import {SiteTemplateConfiguration, UserSiteTemplate} from '../../types/features/site-templates.interfaces.js';
-import {assert, unwrap, unwrapString} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {localStorage} from '../local.js';
 import {Settings} from '../settings.js';
diff --git a/static/widgets/timing-info-widget.ts b/static/widgets/timing-info-widget.ts
index 3b787568b..295900d76 100644
--- a/static/widgets/timing-info-widget.ts
+++ b/static/widgets/timing-info-widget.ts
@@ -24,9 +24,9 @@
 
 import {Chart, ChartData, defaults} from 'chart.js';
 import $ from 'jquery';
+import {unwrap} from '../../shared/assert.js';
 import {isString} from '../../shared/common-utils.js';
 import {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
-import {unwrap} from '../assert.js';
 import * as BootstrapUtils from '../bootstrap-utils.js';
 import {Settings} from '../settings.js';
 import 'chart.js/auto';
diff --git a/test/rison.ts b/test/rison.ts
index 1c5f687e5..8bb0856e7 100644
--- a/test/rison.ts
+++ b/test/rison.ts
@@ -1,6 +1,6 @@
 import {describe, expect, it} from 'vitest';
 
-import * as rison from '../static/rison.js';
+import * as rison from '../shared/rison.js';
 
 // Copied from https://github.com/Nanonid/rison/blob/master/python/rison/tests.py
 const py_testcases = {