Group some files to their own folders (#3384)gh-2075

* Group some files to their own folders

In etc/scripts/, added disasms/, docenizers/, and util/ folders
In lib/, added mapfiles/, and parsers/ folders (+moved google.js to
shortener)
In static/, added widgets/ folder

Added cypress folder to .gitignore

* Address Matt's PR reviews

* Move new Pane renaming to folder

89 files changed, 123 insertions, 113 deletions

diff --git a/.github/workflows/test-and-deploy.yml b/.github/workflows/test-and-deploy.yml
index 94821aa08..a39406239 100644
--- a/.github/workflows/test-and-deploy.yml
+++ b/.github/workflows/test-and-deploy.yml
@@ -30,7 +30,7 @@ jobs:
         run: |
           npm run lint
           npm run ci-test
-          python3 ./etc/scripts/orphancompiler.py
+          python3 ./etc/scripts/util/orphancompiler.py
       - name: Code coverage
         run: npm run codecov
 
diff --git a/.husky/pre-commit b/.husky/pre-commit
index 03ab3f6c6..cd2a795f1 100755
--- a/.husky/pre-commit
+++ b/.husky/pre-commit
@@ -4,4 +4,4 @@
 make prereqs
 npx lint-staged
 npm run test
-python3 ./etc/scripts/orphancompiler.py
+python3 ./etc/scripts/util/orphancompiler.py
diff --git a/app.js b/app.js
index 12f8b417d..dd38537fc 100755
--- a/app.js
+++ b/app.js
@@ -50,7 +50,6 @@ import { CompilationQueue } from './lib/compilation-queue';
 import { CompilerFinder } from './lib/compiler-finder';
 // import { policy as csp } from './lib/csp';
 import { initialiseWine } from './lib/exec';
-import { ShortLinkResolver } from './lib/google';
 import { CompileHandler } from './lib/handlers/compile';
 import * as healthCheck from './lib/handlers/health-check';
 import { NoScriptHandler } from './lib/handlers/noscript';
@@ -60,6 +59,7 @@ import { languages as allLanguages } from './lib/languages';
 import { logger, logToLoki, logToPapertrail, suppressConsoleLog } from './lib/logger';
 import { ClientOptionsHandler } from './lib/options-handler';
 import * as props from './lib/properties';
+import { ShortLinkResolver } from './lib/shortener/google';
 import { sources } from './lib/sources';
 import { loadSponsorsFromString } from './lib/sponsors';
 import { getStorageTypeByKey } from './lib/storage';
diff --git a/cypress/.gitignore b/cypress/.gitignore
new file mode 100644
index 000000000..9bd9158e8
--- /dev/null
+++ b/cypress/.gitignore
@@ -0,0 +1,5 @@
+/fixtures
+/plugins
+/screenshots
+/support
+/videos
diff --git a/docs/AddingAssemblyDocumentation.md b/docs/AddingAssemblyDocumentation.md
index 8b63ce6c8..7a35ced59 100644
--- a/docs/AddingAssemblyDocumentation.md
+++ b/docs/AddingAssemblyDocumentation.md
@@ -27,10 +27,10 @@ can be found in `/lib/asm-docs/generated/asm-docs-amd64.js`.
 
 How you generate this file is completely up to you, just make sure it's easy for others to run the script if needed as
 well. If you need inspiration on how to write this tool, you can look at the `docenizer-*` scripts found in
-`/etc/scripts` in the source control tree.
+`/etc/scripts/docenizers` in the source control tree.
 
 CE expects the tool to output the file into the `/lib/asm-docs/generated/` folder with a name following the existing 
-convention.  Each case in the switch should return a piece of formatted HTML to insert into the popup, a tooltip text 
+convention. Each case in the switch should return a piece of formatted HTML to insert into the popup, a tooltip text 
 for the on-hover tooltip and a URL to external documentation.
 
 ```js
diff --git a/docs/internal/UpdatingAsmDocsx86.md b/docs/internal/UpdatingAsmDocsx86.md
index 0874b233d..2745718f1 100644
--- a/docs/internal/UpdatingAsmDocsx86.md
+++ b/docs/internal/UpdatingAsmDocsx86.md
@@ -1,4 +1,4 @@
-If you need to update the x86 asm documentation, just run `etc/scripts/docenizer.py`, which requires:
+If you need to update the x86 asm documentation, just run `etc/scripts/docenizers/docenizer.py`, which requires:
  - Python 3.x with BeautifulSoup
 
 You can use some options in the script:
diff --git a/etc/scripts/build-dist.sh b/etc/scripts/build-dist.sh
index f8f0d07fa..40ef4ac12 100755
--- a/etc/scripts/build-dist.sh
+++ b/etc/scripts/build-dist.sh
@@ -18,8 +18,8 @@ echo "${HASH}" >out/dist/git_hash
 echo "${RELEASE_NAME}" >out/dist/release_build
 
 # Create any autogenerated files.
-python3 ./etc/scripts/changelog.py
-python3 ./etc/scripts/politic.py
+python3 ./etc/scripts/util/changelog.py
+python3 ./etc/scripts/util/politic.py
 
 
 # Set up and build and webpack everything
diff --git a/etc/scripts/dis_all.py b/etc/scripts/disasms/dis_all.py
index 338b774c3..338b774c3 100644
--- a/etc/scripts/dis_all.py
+++ b/etc/scripts/disasms/dis_all.py
diff --git a/etc/scripts/ruby/disasm.rb b/etc/scripts/disasms/disasm.rb
index 77b7f2f71..77b7f2f71 100644
--- a/etc/scripts/ruby/disasm.rb
+++ b/etc/scripts/disasms/disasm.rb
diff --git a/etc/scripts/docenizer-java.js b/etc/scripts/docenizers/docenizer-java.js
index 5afe27efc..5afe27efc 100644
--- a/etc/scripts/docenizer-java.js
+++ b/etc/scripts/docenizers/docenizer-java.js
diff --git a/etc/scripts/docenizer.py b/etc/scripts/docenizers/docenizer.py
index f1b69fd68..f1b69fd68 100755
--- a/etc/scripts/docenizer.py
+++ b/etc/scripts/docenizers/docenizer.py
diff --git a/etc/scripts/docenizer6502.py b/etc/scripts/docenizers/docenizer6502.py
index 47816750e..97e4344cc 100755
--- a/etc/scripts/docenizer6502.py
+++ b/etc/scripts/docenizers/docenizer6502.py
@@ -176,7 +176,7 @@ def escape_quotes(string):
 def get_arguments():
     parser = argparse.ArgumentParser()
     help_text = "the location to which the script will be written"
-    relative_path = "/../../lib/handlers/asm-docs-6502.js"
+    relative_path = "/../../../lib/handlers/asm-docs-6502.js"
     script_path = os.path.realpath(__file__)
     script_dir = os.path.dirname(script_path)
     default_path = os.path.normpath(script_dir + relative_path)
diff --git a/etc/scripts/docenizerAVR.py b/etc/scripts/docenizers/docenizerAVR.py
index fefb9b793..3f0640004 100755
--- a/etc/scripts/docenizerAVR.py
+++ b/etc/scripts/docenizers/docenizerAVR.py
@@ -36,7 +36,7 @@ def main():
 def get_arguments():
     parser = argparse.ArgumentParser()
     help_text = "the location to which the script will be written"
-    relative_path = "/../../lib/handlers/asm-docs-avr.js"
+    relative_path = "/../../../lib/handlers/asm-docs-avr.js"
     script_path = os.path.realpath(__file__)
     script_dir = os.path.dirname(script_path)
     default_path = os.path.normpath(script_dir + relative_path)
diff --git a/etc/scripts/docenizerArm.py b/etc/scripts/docenizers/docenizerArm.py
index 719b8bcab..719b8bcab 100755
--- a/etc/scripts/docenizerArm.py
+++ b/etc/scripts/docenizers/docenizerArm.py
diff --git a/etc/scripts/docenizerJava.sh b/etc/scripts/docenizers/docenizerJava.sh
index 51284d556..4f01593b2 100755
--- a/etc/scripts/docenizerJava.sh
+++ b/etc/scripts/docenizers/docenizerJava.sh
@@ -4,5 +4,5 @@ JVMS_PATH=$(pwd)/vendor/jvms.html
 
 [ -f "$JVMS_PATH" ] || curl https://docs.oracle.com/javase/specs/jvms/se16/html/jvms-6.html -o "$JVMS_PATH"
 
-$(pwd)/find-node ../../.node-bin
-$(cat ../../.node-bin) docenizer-java.js > ../../lib/handlers/asm-docs-java.js
+$(pwd)/find-node ../../../.node-bin
+$(cat ../../../.node-bin) docenizer-java.js > ../../../lib/handlers/asm-docs-java.js
diff --git a/etc/scripts/vendor/.gitkeep b/etc/scripts/docenizers/vendor/.gitkeep
index e69de29bb..e69de29bb 100644
--- a/etc/scripts/vendor/.gitkeep
+++ b/etc/scripts/docenizers/vendor/.gitkeep
diff --git a/etc/scripts/changelog.py b/etc/scripts/util/changelog.py
index 8a820a82f..8a820a82f 100644
--- a/etc/scripts/changelog.py
+++ b/etc/scripts/util/changelog.py
diff --git a/etc/scripts/contributorer.py b/etc/scripts/util/contributorer.py
index 0eb3ee422..0eb3ee422 100644
--- a/etc/scripts/contributorer.py
+++ b/etc/scripts/util/contributorer.py
diff --git a/etc/scripts/formatcheck.py b/etc/scripts/util/formatcheck.py
index d00841e3e..d00841e3e 100644
--- a/etc/scripts/formatcheck.py
+++ b/etc/scripts/util/formatcheck.py
diff --git a/etc/scripts/orphancompiler.py b/etc/scripts/util/orphancompiler.py
index dce4a266f..dce4a266f 100644
--- a/etc/scripts/orphancompiler.py
+++ b/etc/scripts/util/orphancompiler.py
diff --git a/etc/scripts/politic.py b/etc/scripts/util/politic.py
index 16ba11434..16ba11434 100644
--- a/etc/scripts/politic.py
+++ b/etc/scripts/util/politic.py
diff --git a/lib/base-compiler.js b/lib/base-compiler.js
index 5f2802404..698f3f7be 100644
--- a/lib/base-compiler.js
+++ b/lib/base-compiler.js
@@ -29,7 +29,6 @@ import fs from 'fs-extra';
 import temp from 'temp';
 import _ from 'underscore';
 
-import { AsmParser } from './asm-parser';
 import { BuildEnvSetupBase, getBuildEnvTypeByKey } from './buildenvsetup';
 import * as cfg from './cfg';
 import { CompilerArguments } from './compiler-arguments';
@@ -44,6 +43,7 @@ import { LlvmIrParser } from './llvm-ir';
 import { logger } from './logger';
 import { getObjdumperTypeByKey } from './objdumper';
 import { Packager } from './packager';
+import { AsmParser } from './parsers/asm-parser';
 import { getToolchainPath } from './toolchain-utils';
 import * as utils from './utils';
 
diff --git a/lib/compilers/assembly.js b/lib/compilers/assembly.js
index d786ee5c6..5a8bf08e3 100644
--- a/lib/compilers/assembly.js
+++ b/lib/compilers/assembly.js
@@ -25,8 +25,8 @@
 import fs from 'fs';
 import path from 'path';
 
-import { AsmRaw } from '../asm-raw';
 import { BaseCompiler } from '../base-compiler';
+import { AsmRaw } from '../parsers/asm-raw';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';
diff --git a/lib/compilers/clang.js b/lib/compilers/clang.js
index b849ef54f..2e1a6b89b 100644
--- a/lib/compilers/clang.js
+++ b/lib/compilers/clang.js
@@ -24,9 +24,9 @@
 
 import path from 'path';
 
-import { AmdgpuAsmParser } from '../asm-parser-amdgpu';
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { AmdgpuAsmParser } from '../parsers/asm-parser-amdgpu';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 
 const offloadRegexp = /^#\s+__CLANG_OFFLOAD_BUNDLE__(__START__|__END__)\s+(.*)$/gm;
 
diff --git a/lib/compilers/crystal.js b/lib/compilers/crystal.js
index b131c1cdf..058d19d39 100644
--- a/lib/compilers/crystal.js
+++ b/lib/compilers/crystal.js
@@ -26,8 +26,8 @@ import path from 'path';
 
 import _ from 'underscore';
 
-import { CrystalAsmParser } from '../asm-parser-crystal';
 import { BaseCompiler } from '../base-compiler';
+import { CrystalAsmParser } from '../parsers/asm-parser-crystal';
 
 import { CrystalParser } from './argument-parsers';
 
diff --git a/lib/compilers/dart.js b/lib/compilers/dart.js
index a3ac1bb22..527e68fd5 100644
--- a/lib/compilers/dart.js
+++ b/lib/compilers/dart.js
@@ -24,8 +24,8 @@
 
 import Semver from 'semver';
 
-import { DartAsmParser } from '../asm-parser-dart';
 import { BaseCompiler } from '../base-compiler';
+import { DartAsmParser } from '../parsers/asm-parser-dart';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';
diff --git a/lib/compilers/dotnet.ts b/lib/compilers/dotnet.ts
index 40481441f..f93a912da 100644
--- a/lib/compilers/dotnet.ts
+++ b/lib/compilers/dotnet.ts
@@ -27,8 +27,8 @@ import path from 'path';
 import fs from 'fs-extra';
 
 /// <reference types="../base-compiler" />
-import { DotNetAsmParser } from '../asm-parser-dotnet';
 import { BaseCompiler } from '../base-compiler';
+import { DotNetAsmParser } from '../parsers/asm-parser-dotnet';
 
 class DotNetCompiler extends BaseCompiler {
     private rID: string;
diff --git a/lib/compilers/ewarm.js b/lib/compilers/ewarm.js
index fd28cf7eb..4a5695a4c 100644
--- a/lib/compilers/ewarm.js
+++ b/lib/compilers/ewarm.js
@@ -24,8 +24,8 @@
 
 import temp from 'temp';
 
-import { AsmEWAVRParser } from '../asm-parser-ewavr';
 import { BaseCompiler } from '../base-compiler';
+import { AsmEWAVRParser } from '../parsers/asm-parser-ewavr';
 
 export class EWARMCompiler extends BaseCompiler {
     static get key() { return 'ewarm'; }
diff --git a/lib/compilers/ewavr.js b/lib/compilers/ewavr.js
index 9a5672ada..ae3a74c7b 100644
--- a/lib/compilers/ewavr.js
+++ b/lib/compilers/ewavr.js
@@ -24,8 +24,8 @@
 
 import temp from 'temp';
 
-import { AsmEWAVRParser } from '../asm-parser-ewavr';
 import { BaseCompiler } from '../base-compiler';
+import { AsmEWAVRParser } from '../parsers/asm-parser-ewavr';
 
 export class EWAVRCompiler extends BaseCompiler {
     static get key() { return 'ewavr'; }
diff --git a/lib/compilers/nvcc.js b/lib/compilers/nvcc.js
index 29cf50721..f559455bb 100644
--- a/lib/compilers/nvcc.js
+++ b/lib/compilers/nvcc.js
@@ -24,8 +24,8 @@
 
 import path from 'path';
 
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 
 import { ClangParser } from './argument-parsers';
 
diff --git a/lib/compilers/pascal-win.js b/lib/compilers/pascal-win.js
index b8dbfc7b0..5df812edc 100644
--- a/lib/compilers/pascal-win.js
+++ b/lib/compilers/pascal-win.js
@@ -27,7 +27,7 @@ import path from 'path';
 import fs from 'fs-extra';
 
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderDelphi } from '../map-file-delphi';
+import { MapFileReaderDelphi } from '../mapfiles/map-file-delphi';
 import { PELabelReconstructor } from '../pe32-support';
 import * as utils from '../utils';
 
diff --git a/lib/compilers/ptxas.js b/lib/compilers/ptxas.js
index 87cec8df0..18a8d9966 100644
--- a/lib/compilers/ptxas.js
+++ b/lib/compilers/ptxas.js
@@ -24,8 +24,8 @@
 
 import path from 'path';
 
-import { SassAsmParser } from '../asm-parser-sass';
 import { BaseCompiler } from '../base-compiler';
+import { SassAsmParser } from '../parsers/asm-parser-sass';
 import * as utils from '../utils';
 
 import { BaseParser } from './argument-parsers';
diff --git a/lib/compilers/python.js b/lib/compilers/python.js
index c1e9836f9..3ee8ac880 100644
--- a/lib/compilers/python.js
+++ b/lib/compilers/python.js
@@ -35,7 +35,7 @@ export class PythonCompiler extends BaseCompiler {
         this.compiler.demangler = null;
         this.demanglerClass = null;
         this.disasmScriptPath =
-            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'dis_all.py');
+            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'disasms', 'dis_all.py');
     }
 
     // eslint-disable-next-line no-unused-vars
diff --git a/lib/compilers/ruby.js b/lib/compilers/ruby.js
index 4e32e94ab..af31f8d3d 100644
--- a/lib/compilers/ruby.js
+++ b/lib/compilers/ruby.js
@@ -37,7 +37,7 @@ export class RubyCompiler extends BaseCompiler {
         this.compiler.demangler = null;
         this.demanglerClass = null;
         this.disasmScriptPath =
-            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'ruby', 'disasm.rb');
+            this.compilerProps('disasmScript') || resolvePathFromAppRoot('etc', 'scripts', 'disasms', 'disasm.rb');
     }
 
     processAsm(result) {
diff --git a/lib/compilers/win32-vc.js b/lib/compilers/win32-vc.js
index 0fb31deaf..1e346f10f 100644
--- a/lib/compilers/win32-vc.js
+++ b/lib/compilers/win32-vc.js
@@ -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 { VcAsmParser } from '../asm-parser-vc';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 
 import { VCParser } from './argument-parsers';
 import { Win32Compiler } from './win32';
diff --git a/lib/compilers/win32-vc6.js b/lib/compilers/win32-vc6.js
index 437294d1d..5265e5a91 100644
--- a/lib/compilers/win32-vc6.js
+++ b/lib/compilers/win32-vc6.js
@@ -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 { Vc6AsmParser } from '../asm-parser-vc6';
+import { Vc6AsmParser } from '../parsers/asm-parser-vc6';
 
 import { VCParser } from './argument-parsers';
 import { Win32Compiler } from './win32';
diff --git a/lib/compilers/win32.js b/lib/compilers/win32.js
index d1114acbb..3ff0f4eef 100644
--- a/lib/compilers/win32.js
+++ b/lib/compilers/win32.js
@@ -27,9 +27,9 @@ import path from 'path';
 import temp from 'temp';
 import _ from 'underscore';
 
-import { AsmParser } from '../asm-parser';
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderVS } from '../map-file-vs';
+import { MapFileReaderVS } from '../mapfiles/map-file-vs';
+import { AsmParser } from '../parsers/asm-parser';
 import { PELabelReconstructor } from '../pe32-support';
 import * as utils from '../utils';
 
diff --git a/lib/compilers/wine-vc.js b/lib/compilers/wine-vc.js
index c2e03888b..d49c4deb1 100644
--- a/lib/compilers/wine-vc.js
+++ b/lib/compilers/wine-vc.js
@@ -24,9 +24,9 @@
 
 import path from 'path';
 
-import { VcAsmParser } from '../asm-parser-vc';
 import { BaseCompiler } from '../base-compiler';
-import { MapFileReaderVS } from '../map-file-vs';
+import { MapFileReaderVS } from '../mapfiles/map-file-vs';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 import { PELabelReconstructor } from '../pe32-support';
 
 import { VCParser } from './argument-parsers';
diff --git a/lib/compilers/wsl-vc.js b/lib/compilers/wsl-vc.js
index 1576f7653..b7b215be8 100644
--- a/lib/compilers/wsl-vc.js
+++ b/lib/compilers/wsl-vc.js
@@ -29,7 +29,7 @@ import path from 'path';
 
 import temp from 'temp';
 
-import { VcAsmParser } from '../asm-parser-vc';
+import { VcAsmParser } from '../parsers/asm-parser-vc';
 
 import { Win32VcCompiler } from './win32-vc';
 
diff --git a/lib/demangler/base.js b/lib/demangler/base.js
index bd9ce2384..42342b4e2 100644
--- a/lib/demangler/base.js
+++ b/lib/demangler/base.js
@@ -22,8 +22,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { AsmRegex } from '../asmregex';
 import { logger } from '../logger';
+import { AsmRegex } from '../parsers/asmregex';
 import { SymbolStore } from '../symbol-store';
 import * as utils from '../utils';
 
diff --git a/lib/map-file-delphi.js b/lib/mapfiles/map-file-delphi.js
index d065cf301..d065cf301 100644
--- a/lib/map-file-delphi.js
+++ b/lib/mapfiles/map-file-delphi.js
diff --git a/lib/map-file-vs.js b/lib/mapfiles/map-file-vs.js
index 0619bebb7..0619bebb7 100644
--- a/lib/map-file-vs.js
+++ b/lib/mapfiles/map-file-vs.js
diff --git a/lib/map-file.js b/lib/mapfiles/map-file.js
index fbfcd5e2f..e9f660c5c 100644
--- a/lib/map-file.js
+++ b/lib/mapfiles/map-file.js
@@ -24,7 +24,7 @@
 
 import fs from 'fs';
 
-import * as utils from './utils';
+import * as utils from '../utils';
 
 export class MapFileReader {
     /**
diff --git a/lib/asm-parser-amdgpu.js b/lib/parsers/asm-parser-amdgpu.js
index 12c0236f0..12c0236f0 100644
--- a/lib/asm-parser-amdgpu.js
+++ b/lib/parsers/asm-parser-amdgpu.js
diff --git a/lib/asm-parser-crystal.js b/lib/parsers/asm-parser-crystal.js
index 4c4b06eea..4c4b06eea 100644
--- a/lib/asm-parser-crystal.js
+++ b/lib/parsers/asm-parser-crystal.js
diff --git a/lib/asm-parser-dart.js b/lib/parsers/asm-parser-dart.js
index 464ae04dc..eab026700 100644
--- a/lib/asm-parser-dart.js
+++ b/lib/parsers/asm-parser-dart.js
@@ -22,9 +22,10 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import * as utils from './utils';
 
 export class DartAsmParser extends AsmParser {
     constructor() {
diff --git a/lib/asm-parser-dotnet.ts b/lib/parsers/asm-parser-dotnet.ts
index 765287338..9810e3855 100644
--- a/lib/asm-parser-dotnet.ts
+++ b/lib/parsers/asm-parser-dotnet.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 * as utils from './utils';
+import * as utils from '../utils';
 
 type InlineLabel = { name: string, range: { startCol: number, endCol: number } };
 type Source = { file: string, line: number };
diff --git a/lib/asm-parser-ewavr.js b/lib/parsers/asm-parser-ewavr.js
index fa926cb0f..f5d7b38e4 100644
--- a/lib/asm-parser-ewavr.js
+++ b/lib/parsers/asm-parser-ewavr.js
@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class AsmEWAVRParser extends AsmParser {
     constructor(compilerProps) {
diff --git a/lib/asm-parser-sass.js b/lib/parsers/asm-parser-sass.js
index 13f996219..13f996219 100644
--- a/lib/asm-parser-sass.js
+++ b/lib/parsers/asm-parser-sass.js
diff --git a/lib/asm-parser-vc.js b/lib/parsers/asm-parser-vc.js
index 42c1da878..7ba44ee87 100644
--- a/lib/asm-parser-vc.js
+++ b/lib/parsers/asm-parser-vc.js
@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class VcAsmParser extends AsmParser {
     constructor(compilerProps) {
diff --git a/lib/asm-parser-vc6.js b/lib/parsers/asm-parser-vc6.js
index 743980efb..a2cc4cf84 100644
--- a/lib/asm-parser-vc6.js
+++ b/lib/parsers/asm-parser-vc6.js
@@ -22,10 +22,11 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
+import { logger } from '../logger';
+import * as utils from '../utils';
+
 import { AsmParser } from './asm-parser';
 import { AsmRegex } from './asmregex';
-import { logger } from './logger';
-import * as utils from './utils';
 
 export class Vc6AsmParser extends AsmParser {
     constructor(compilerProps) {
diff --git a/lib/asm-parser.js b/lib/parsers/asm-parser.js
index ed385b504..6893993a9 100644
--- a/lib/asm-parser.js
+++ b/lib/parsers/asm-parser.js
@@ -24,8 +24,9 @@
 
 import _ from 'underscore';
 
+import * as utils from '../utils';
+
 import { AsmRegex } from './asmregex';
-import * as utils from './utils';
 
 export class AsmParser extends AsmRegex {
     constructor(compilerProps) {
diff --git a/lib/asm-raw.js b/lib/parsers/asm-raw.js
index b7e3bcb70..b7e3bcb70 100644
--- a/lib/asm-raw.js
+++ b/lib/parsers/asm-raw.js
diff --git a/lib/asmregex.js b/lib/parsers/asmregex.js
index 3f5d94069..a9057195d 100644
--- a/lib/asmregex.js
+++ b/lib/parsers/asmregex.js
@@ -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 * as utils from './utils';
+import * as utils from '../utils';
 
 const findQuotes = /(.*?)("(?:[^"\\]|\\.)*")(.*)/;
 
diff --git a/lib/google.js b/lib/shortener/google.js
index 59f8ee8a0..59f8ee8a0 100644
--- a/lib/google.js
+++ b/lib/shortener/google.js
diff --git a/lib/tooling/x86to6502-tool.js b/lib/tooling/x86to6502-tool.js
index 924264308..6d1f56725 100644
--- a/lib/tooling/x86to6502-tool.js
+++ b/lib/tooling/x86to6502-tool.js
@@ -24,7 +24,7 @@
 
 import _ from 'underscore';
 
-import { AsmParser } from '../asm-parser';
+import { AsmParser } from '../parsers/asm-parser';
 
 import { BaseTool } from './base-tool';
 
diff --git a/static/main.js b/static/main.js
index c99750eab..635f00b89 100644
--- a/static/main.js
+++ b/static/main.js
@@ -47,8 +47,8 @@ var Alert = require('./alert').Alert;
 var themer = require('./themes');
 var motd = require('./motd');
 var jsCookie = require('js-cookie');
-var SimpleCook = require('./simplecook').SimpleCook;
-var HistoryWidget = require('./history-widget').HistoryWidget;
+var SimpleCook = require('./widgets/simplecook').SimpleCook;
+var HistoryWidget = require('./widgets/history-widget').HistoryWidget;
 var History = require('./history');
 var presentation = require('./presentation');
 
diff --git a/static/noscript.js b/static/noscript.js
index 7576e5cbe..839c2ee2f 100644
--- a/static/noscript.js
+++ b/static/noscript.js
@@ -30,7 +30,7 @@ var $ = require('jquery');
 require('popper.js');
 require('bootstrap');
 
-var Toggles = require('./toggles').Toggles;
+var Toggles = require('./widgets/toggles').Toggles;
 
 function initMenus() {
     $('.button-checkbox').each(function () {
diff --git a/static/panes/ast-view.js b/static/panes/ast-view.js
index bc86ed913..978704365 100644
--- a/static/panes/ast-view.js
+++ b/static/panes/ast-view.js
@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function Ast(hub, container, state) {
     this.container = container;
diff --git a/static/panes/cfg-view.ts b/static/panes/cfg-view.ts
index 4d8be0bdf..3b0c14787 100644
--- a/static/panes/cfg-view.ts
+++ b/static/panes/cfg-view.ts
@@ -24,12 +24,12 @@
 
 import * as vis from 'vis-network';
 import _ from 'underscore';
-import { Toggles } from '../toggles';
+import { Toggles } from '../widgets/toggles';
 import { ga } from '../analytics';
 import TomSelect from 'tom-select';
 import { Container } from 'golden-layout';
 import { CfgState } from './cfg-view.interfaces';
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 interface NodeInfo {
     edges: string[],
diff --git a/static/panes/compiler.js b/static/panes/compiler.js
index d0f60cc94..4f90a92e2 100644
--- a/static/panes/compiler.js
+++ b/static/panes/compiler.js
@@ -27,8 +27,8 @@ var $ = require('jquery');
 var _ = require('underscore');
 var ga = require('../analytics').ga;
 var colour = require('../colour');
-var Toggles = require('../toggles').Toggles;
-var FontScale = require('../fontscale').FontScale;
+var Toggles = require('../widgets/toggles').Toggles;
+var FontScale = require('../widgets/fontscale').FontScale;
 var Promise = require('es6-promise').Promise;
 var Components = require('../components');
 var LruCache = require('lru-cache');
@@ -36,16 +36,16 @@ var options = require('../options').options;
 var monaco = require('monaco-editor');
 var Alert = require('../alert').Alert;
 var bigInt = require('big-integer');
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var codeLensHandler = require('../codelens-handler');
 var monacoConfig = require('../monaco-config');
-var TimingWidget = require('../timing-info-widget');
+var TimingWidget = require('../widgets/timing-info-widget');
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var Settings = require('../settings').Settings;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
 var getAssemblyDocumentation = require('../api/api').getAssemblyDocumentation;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 
 require('../modes/asm-mode');
diff --git a/static/panes/conformance-view.js b/static/panes/conformance-view.js
index 7e6e2f016..01564158f 100644
--- a/static/panes/conformance-view.js
+++ b/static/panes/conformance-view.js
@@ -30,11 +30,11 @@ var $ = require('jquery');
 var Promise = require('es6-promise').Promise;
 var ga = require('../analytics').ga;
 var Components = require('../components');
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function Conformance(hub, container, state) {
     this.hub = hub;
diff --git a/static/panes/device-view.js b/static/panes/device-view.js
index 3298f0551..8330d1619 100644
--- a/static/panes/device-view.js
+++ b/static/panes/device-view.js
@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 var TomSelect = require('tom-select');
 
diff --git a/static/panes/diff.js b/static/panes/diff.js
index 8281e6ed1..b9e29bfa9 100644
--- a/static/panes/diff.js
+++ b/static/panes/diff.js
@@ -24,13 +24,13 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var TomSelect = require('tom-select');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 
diff --git a/static/panes/editor.js b/static/panes/editor.js
index 65b7b80f2..befd8333b 100644
--- a/static/panes/editor.js
+++ b/static/panes/editor.js
@@ -26,8 +26,8 @@
 var _ = require('underscore');
 var $ = require('jquery');
 var colour = require('../colour');
-var loadSaveLib = require('../load-save');
-var FontScale = require('../fontscale').FontScale;
+var loadSaveLib = require('../widgets/load-save');
+var FontScale = require('../widgets/fontscale').FontScale;
 var Components = require('../components');
 var monaco = require('monaco-editor');
 var options = require('../options').options;
diff --git a/static/panes/executor.js b/static/panes/executor.js
index a8bab77b8..0a45d871e 100644
--- a/static/panes/executor.js
+++ b/static/panes/executor.js
@@ -26,18 +26,18 @@
 var $ = require('jquery');
 var _ = require('underscore');
 var ga = require('../analytics').ga;
-var Toggles = require('../toggles').Toggles;
-var FontScale = require('../fontscale').FontScale;
+var Toggles = require('../widgets/toggles').Toggles;
+var FontScale = require('../widgets/fontscale').FontScale;
 var options = require('../options').options;
 var Alert = require('../alert').Alert;
-var LibsWidget = require('../libs-widget').LibsWidget;
+var LibsWidget = require('../widgets/libs-widget').LibsWidget;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var TimingWidget = require('../timing-info-widget');
+var TimingWidget = require('../widgets/timing-info-widget');
 var CompilerPicker = require('../compiler-picker').CompilerPicker;
 var Settings = require('../settings').Settings;
 var utils = require('../utils');
 var LibUtils = require('../lib-utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 require('../modes/ptx-mode');
diff --git a/static/panes/flags-view.js b/static/panes/flags-view.js
index 180875304..faf10ca71 100644
--- a/static/panes/flags-view.js
+++ b/static/panes/flags-view.js
@@ -24,14 +24,14 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
 var Settings = require('../settings').Settings;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 
diff --git a/static/panes/gccdump-view.js b/static/panes/gccdump-view.js
index 12a29447c..a19fc4adf 100644
--- a/static/panes/gccdump-view.js
+++ b/static/panes/gccdump-view.js
@@ -25,9 +25,9 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 require('../modes/gccdump-rtl-gimple-mode');
 var _ = require('underscore');
 var $ = require('jquery');
@@ -35,7 +35,7 @@ var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
 var TomSelect = require('tom-select');
 var utils = require('../utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 
 function GccDump(hub, container, state) {
diff --git a/static/panes/ir-view.ts b/static/panes/ir-view.ts
index 96ad7e58a..637564135 100644
--- a/static/panes/ir-view.ts
+++ b/static/panes/ir-view.ts
@@ -34,7 +34,7 @@ import { ga } from '../analytics';
 import { extendConfig } from '../monaco-config';
 import { applyColours } from '../colour';
 
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 export class Ir extends Pane<monaco.editor.IStandaloneCodeEditor, IrState> {
     linkedFadeTimeoutId = -1;
diff --git a/static/panes/opt-view.js b/static/panes/opt-view.js
index 07d53321e..27629051f 100644
--- a/static/panes/opt-view.js
+++ b/static/panes/opt-view.js
@@ -24,13 +24,13 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
 var ga = require('../analytics').ga;
 var monacoConfig = require('../monaco-config');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 require('../modes/asm-mode');
 
diff --git a/static/panes/output.js b/static/panes/output.js
index aaca98859..279689d0a 100644
--- a/static/panes/output.js
+++ b/static/panes/output.js
@@ -26,11 +26,11 @@
 
 var _ = require('underscore');
 var $ = require('jquery');
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 var ga = require('../analytics').ga;
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 
 function makeAnsiToHtml(color) {
     return new AnsiToHtml({
diff --git a/static/panes/pane.ts b/static/panes/pane.ts
index b991af28c..d14cf0e46 100644
--- a/static/panes/pane.ts
+++ b/static/panes/pane.ts
@@ -28,11 +28,11 @@ import * as monaco from 'monaco-editor';
 
 import { BasePaneState, PaneCompilerState } from './pane.interfaces';
 
-import { FontScale } from '../fontscale';
+import { FontScale } from '../widgets/fontscale';
 import { SiteSettings } from '../settings';
 import * as utils from '../utils';
 
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 /**
  * Basic container for a tool pane in Compiler Explorer
diff --git a/static/panes/pp-view.ts b/static/panes/pp-view.ts
index f2f2dff5c..1c16f9a1f 100644
--- a/static/panes/pp-view.ts
+++ b/static/panes/pp-view.ts
@@ -24,7 +24,7 @@
 
 'use strict';
 
-import { Toggles } from '../toggles';
+import { Toggles } from '../widgets/toggles';
 import * as monaco from 'monaco-editor';
 import _ from 'underscore';
 import $ from 'jquery';
diff --git a/static/panes/tool-input-view.js b/static/panes/tool-input-view.js
index c59607136..5a5440aad 100644
--- a/static/panes/tool-input-view.js
+++ b/static/panes/tool-input-view.js
@@ -24,7 +24,7 @@
 
 'use strict';
 
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var monaco = require('monaco-editor');
 var _ = require('underscore');
 var $ = require('jquery');
diff --git a/static/panes/tool.js b/static/panes/tool.js
index e2834c10d..4caa87d3a 100644
--- a/static/panes/tool.js
+++ b/static/panes/tool.js
@@ -26,16 +26,16 @@
 
 var _ = require('underscore');
 var $ = require('jquery');
-var FontScale = require('../fontscale').FontScale;
+var FontScale = require('../widgets/fontscale').FontScale;
 var AnsiToHtml = require('../ansi-to-html').Filter;
-var Toggles = require('../toggles').Toggles;
+var Toggles = require('../widgets/toggles').Toggles;
 var ga = require('../analytics').ga;
 var Components = require('../components');
 var monaco = require('monaco-editor');
 var monacoConfig = require('../monaco-config');
 var ceoptions = require('../options').options;
 var utils = require('../utils');
-var PaneRenaming = require('../pane-renaming').PaneRenaming;
+var PaneRenaming = require('../widgets/pane-renaming').PaneRenaming;
 require('../modes/asm6502-mode');
 
 function makeAnsiToHtml(color) {
diff --git a/static/panes/tree.ts b/static/panes/tree.ts
index d310c5a69..cb141850c 100644
--- a/static/panes/tree.ts
+++ b/static/panes/tree.ts
@@ -26,7 +26,7 @@ import {MultifileFile, MultifileService, MultifileServiceState} from '../multifi
 import {LineColouring} from '../line-colouring';
 import * as utils from '../utils';
 import { Settings } from '../settings';
-import { PaneRenaming } from '../pane-renaming';
+import { PaneRenaming } from '../widgets/pane-renaming';
 
 const _ = require('underscore');
 const $ = require('jquery');
@@ -34,7 +34,7 @@ const Alert = require('../alert').Alert;
 const Components = require('../components');
 const ga = require('../analytics').ga;
 const TomSelect = require('tom-select');
-const Toggles = require('../toggles').Toggles;
+const Toggles = require('../widgets/toggles').Toggles;
 const options = require('../options').options;
 const languages = options.languages;
 const saveAs = require('file-saver').saveAs;
diff --git a/static/fontscale.interfaces.ts b/static/widgets/fontscale.interfaces.ts
index 88ecd3f9b..88ecd3f9b 100644
--- a/static/fontscale.interfaces.ts
+++ b/static/widgets/fontscale.interfaces.ts
diff --git a/static/fontscale.ts b/static/widgets/fontscale.ts
index 51d9a6173..21dbdcf12 100644
--- a/static/fontscale.ts
+++ b/static/widgets/fontscale.ts
@@ -24,7 +24,7 @@
 
 import EventEmitter from 'events';
 import $ from 'jquery';
-import {options} from './options';
+import {options} from '../options';
 import {editor} from 'monaco-editor';
 import IEditor = editor.IEditor;
 
diff --git a/static/history-widget.ts b/static/widgets/history-widget.ts
index 99477cd4e..4b05f6ac3 100644
--- a/static/history-widget.ts
+++ b/static/widgets/history-widget.ts
@@ -23,8 +23,8 @@
 // POSSIBILITY OF SUCH DAMAGE.
 
 import { pluck } from 'underscore';
-import { ga } from './analytics';
-import { sortedList, HistoryEntry, EditorSource } from './history';
+import { ga } from '../analytics';
+import { sortedList, HistoryEntry, EditorSource } from '../history';
 import { editor } from 'monaco-editor';
 
 import IStandaloneDiffEditor = editor.IStandaloneDiffEditor;
diff --git a/static/libs-widget.ts b/static/widgets/libs-widget.ts
index 32fe31b16..df7e734a6 100644
--- a/static/libs-widget.ts
+++ b/static/widgets/libs-widget.ts
@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { options } from './options';
-import * as local from './local';
-import { Library, LibraryVersion } from './options.interfaces';
+import { options } from '../options';
+import * as local from '../local';
+import { Library, LibraryVersion } from '../options.interfaces';
 
 
 const FAV_LIBS_STORE_KEY = 'favlibs';
diff --git a/static/load-save.ts b/static/widgets/load-save.ts
index 12fd0fab4..4422907b7 100644
--- a/static/load-save.ts
+++ b/static/widgets/load-save.ts
@@ -24,12 +24,12 @@
 
 import _ from 'underscore';
 import { saveAs } from 'file-saver';
-import { Alert } from './alert';
-import { ga } from './analytics';
-import * as local from './local';
-import { Language } from '../types/languages.interfaces';
+import { Alert } from '../alert';
+import { ga } from '../analytics';
+import * as local from '../local';
+import { Language } from '../../types/languages.interfaces';
 
-const history = require('./history');
+const history = require('../history');
 
 
 export class LoadSave {
diff --git a/static/pane-renaming.ts b/static/widgets/pane-renaming.ts
index 88e61b528..192f9bf35 100644
--- a/static/pane-renaming.ts
+++ b/static/widgets/pane-renaming.ts
@@ -25,9 +25,9 @@
 import _ from 'underscore';
 import { Tab } from 'golden-layout';
 import { EventEmitter } from 'events';
-import { Alert } from './alert';
+import { Alert } from '../alert';
 
-export class PaneRenaming extends EventEmitter.EventEmitter{
+export class PaneRenaming extends EventEmitter.EventEmitter {
     private pane: any;
     private alertSystem: any;
     private state: any;
diff --git a/static/simplecook.ts b/static/widgets/simplecook.ts
index 1b838bbcf..1b838bbcf 100644
--- a/static/simplecook.ts
+++ b/static/widgets/simplecook.ts
diff --git a/static/timing-info-widget.js b/static/widgets/timing-info-widget.js
index 449c7a620..449c7a620 100644
--- a/static/timing-info-widget.js
+++ b/static/widgets/timing-info-widget.js
diff --git a/static/toggles.ts b/static/widgets/toggles.ts
index 6de6edff3..6de6edff3 100644
--- a/static/toggles.ts
+++ b/static/widgets/toggles.ts
diff --git a/test/asm-tests.js b/test/asm-tests.js
index f1a80a053..c106cfc7b 100644
--- a/test/asm-tests.js
+++ b/test/asm-tests.js
@@ -22,9 +22,9 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { AsmParser } from '../lib/asm-parser';
-import { VcAsmParser } from '../lib/asm-parser-vc';
-import { AsmRegex } from '../lib/asmregex';
+import { AsmParser } from '../lib/parsers/asm-parser';
+import { VcAsmParser } from '../lib/parsers/asm-parser-vc';
+import { AsmRegex } from '../lib/parsers/asmregex';
 
 describe('ASM CL parser', () => {
     it('should work for error documents', () => {
diff --git a/test/filter-tests.js b/test/filter-tests.js
index 14b1cba88..3b39be761 100644
--- a/test/filter-tests.js
+++ b/test/filter-tests.js
@@ -26,9 +26,9 @@ import path from 'path';
 
 import approvals from 'approvals';
 
-import { AsmParser } from '../lib/asm-parser';
-import { SassAsmParser } from '../lib/asm-parser-sass';
-import { VcAsmParser } from '../lib/asm-parser-vc';
+import { AsmParser } from '../lib/parsers/asm-parser';
+import { SassAsmParser } from '../lib/parsers/asm-parser-sass';
+import { VcAsmParser } from '../lib/parsers/asm-parser-vc';
 
 import { fs, resolvePathFromTestRoot } from './utils';
 
diff --git a/test/google-tests.js b/test/google-tests.js
index 168ae5c78..566ae7163 100644
--- a/test/google-tests.js
+++ b/test/google-tests.js
@@ -24,7 +24,7 @@
 
 import nock from 'nock';
 
-import * as google from '../lib/google';
+import * as google from '../lib/shortener/google';
 
 const googlDomain = 'https://goo.gl';
 const shortUrl = '/short';
diff --git a/test/map-file-tests.js b/test/map-file-tests.js
index b49b6497b..45be1bda7 100644
--- a/test/map-file-tests.js
+++ b/test/map-file-tests.js
@@ -22,8 +22,8 @@
 // ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 // POSSIBILITY OF SUCH DAMAGE.
 
-import { MapFileReaderDelphi } from '../lib/map-file-delphi';
-import { MapFileReaderVS } from '../lib/map-file-vs';
+import { MapFileReaderDelphi } from '../lib/mapfiles/map-file-delphi';
+import { MapFileReaderVS } from '../lib/mapfiles/map-file-vs';
 
 describe('Map setup', function () {
     it('VS-map preferred load address', function () {