diff --git a/example/e2e/src/app.e2e-spec.ts b/example/e2e/src/app.e2e-spec.ts
index f6309f9a1efd1a4b6addc5aad7503a72dfa0cdfb..f9d4b19ccac85e07b55de9fb2bbc54ce8f068fd5 100644
--- a/example/e2e/src/app.e2e-spec.ts
+++ b/example/e2e/src/app.e2e-spec.ts
@@ -1,6 +1,7 @@
-import { AppPage } from './app.po';
 import { browser, logging } from 'protractor';
 
+import { AppPage } from './app.po';
+
 describe('workspace-project App', () => {
   let page: AppPage;
 
diff --git a/example/src/app/app.component.spec.ts b/example/src/app/app.component.spec.ts
index 5e1a4b8d8c1bf5ddfefee7e54068fbe42d86e51e..1443a507b8b507550b82b31a0f3e19c2c0e430a3 100644
--- a/example/src/app/app.component.spec.ts
+++ b/example/src/app/app.component.spec.ts
@@ -1,4 +1,5 @@
 import { TestBed, waitForAsync } from '@angular/core/testing';
+
 import { AppComponent } from './app.component';
 
 describe('AppComponent', () => {
@@ -16,7 +17,7 @@ describe('AppComponent', () => {
     expect(app).toBeTruthy();
   });
 
-  it(`should have as title 'example'`, () => {
+  it("should have as title 'example'", () => {
     const fixture = TestBed.createComponent(AppComponent);
     const app = fixture.componentInstance;
     expect(app.title).toEqual('example');
diff --git a/example/src/app/app.component.ts b/example/src/app/app.component.ts
index baf75eb56865ac20f649300c29f4ddd02987ad3b..99bbfd8474da9e89506b8901b699b2898d1c4258 100644
--- a/example/src/app/app.component.ts
+++ b/example/src/app/app.component.ts
@@ -1,7 +1,7 @@
-import { Component, ViewChild, ElementRef, OnInit, AfterViewInit } from '@angular/core';
-import { DisaggResponse, Disaggregation, DisaggGraphView } from '@nshmp/disagg-d3/src/disagg';
+import { AfterViewInit, Component, ElementRef, OnInit, ViewChild } from '@angular/core';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+import { DisaggGraphView, Disaggregation, DisaggResponse } from '@nshmp/disagg-d3/src/disagg';
 import { Collection } from '@nshmp/disagg-d3/src/mvc';
-import { nshmpHaz } from '@ghsc/nshmp-utils';
 
 import deagg from '../assets/deagg.json';
 
diff --git a/example/src/app/app.module.ts b/example/src/app/app.module.ts
index 5ce7811a4c03da167bd77a37c5de07e61a488b71..7bcb9e9a51ee440b22d29c6ddec55c5a8484b532 100644
--- a/example/src/app/app.module.ts
+++ b/example/src/app/app.module.ts
@@ -1,5 +1,5 @@
-import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
+import { BrowserModule } from '@angular/platform-browser';
 
 import { AppComponent } from './app.component';
 
diff --git a/example/src/app/app.service.ts b/example/src/app/app.service.ts
index 39ee8b40a8b57a02652ad7183216929eada09b84..167535a73d2e0905cb8032cf9b132e133ebe8faf 100644
--- a/example/src/app/app.service.ts
+++ b/example/src/app/app.service.ts
@@ -1,8 +1,8 @@
-import { Injectable } from '@angular/core';
 import { HttpClient } from '@angular/common/http';
+import { Injectable } from '@angular/core';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+import { Observable, throwError } from 'rxjs';
 import { map } from 'rxjs/operators';
-import { nshmpHaz } from '@ghsc/nshmp-utils';
-import { throwError, Observable } from 'rxjs';
 
 @Injectable({
   providedIn: 'root',
diff --git a/example/src/test.ts b/example/src/test.ts
index 3d6a9ec21fce4824980f1f5ab458e50166a85854..cbf2f64dc3b38710b8fe719c5f94951f6d6dd890 100644
--- a/example/src/test.ts
+++ b/example/src/test.ts
@@ -1,6 +1,7 @@
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/testing';
+
 import { getTestBed } from '@angular/core/testing';
 import {
   BrowserDynamicTestingModule,
diff --git a/types/d3/index.d.ts b/types/d3/index.d.ts
index 0bb4e56b5b88d87801ef45d5281f4544b6d81cb0..16e34b170711f1b16d003d1f43854deec3139aee 100644
--- a/types/d3/index.d.ts
+++ b/types/d3/index.d.ts
@@ -4,14 +4,12 @@ export * from './3d/D33dGroup';
 export * from './3d/D33dOptions';
 export * from './3d/D33dPath';
 export * from './3d/D33dText';
-
 export * from './util/ClassList';
 export * from './util/D3Util';
-
-export * from './view/D33dSubView';
-export * from './view/D33dView';
 export * from './view/D3BaseView';
 export * from './view/D3Options';
 export * from './view/D3SubView';
 export * from './view/D3View';
+export * from './view/D33dSubView';
+export * from './view/D33dView';
 export * from './view/Info';
diff --git a/types/d3/view/D3Options.d.ts b/types/d3/view/D3Options.d.ts
index 8c40417a4902d49cc72b4f1c62931a951c1a9c4e..7e8f07c62c7c4be0dafbfdebe7ae28aa6d4ce464 100644
--- a/types/d3/view/D3Options.d.ts
+++ b/types/d3/view/D3Options.d.ts
@@ -1,7 +1,8 @@
 import * as d3 from 'd3';
-import { D33dView } from './D33dView';
+
 import { D3BaseView } from './D3BaseView';
 import { D3View } from './D3View';
+import { D33dView } from './D33dView';
 
 export interface D3Options {
   el?: SVGElement | HTMLElement;
diff --git a/types/disagg/DisaggResponse.d.ts b/types/disagg/DisaggResponse.d.ts
index 8c498bcfd3e8f07457ad61a1f2eeca3ac3a313ab..4e5a86875bd5f60cae1915b24c2af8477cb36f81 100644
--- a/types/disagg/DisaggResponse.d.ts
+++ b/types/disagg/DisaggResponse.d.ts
@@ -1,4 +1,5 @@
-import { nshmpHaz } from '@ghsc/nshmp-utils';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+
 import { Model } from '../mvc/Model';
 
 /**
diff --git a/types/disagg/Disaggregation.d.ts b/types/disagg/Disaggregation.d.ts
index 517e4359ec5315c7182df661b6dc3a1ddc9f0aa4..56b617e8974c3f158ef7e9846ebdc5dca95fe228 100644
--- a/types/disagg/Disaggregation.d.ts
+++ b/types/disagg/Disaggregation.d.ts
@@ -1,4 +1,5 @@
-import { nshmpHaz } from '@ghsc/nshmp-utils';
+import { nshmpHaz } from '@ghsc/nshmp-web-utils';
+
 import { Model } from '../mvc/Model';
 import { DisaggParameters } from './DisaggParameters';
 
diff --git a/types/disagg/index.d.ts b/types/disagg/index.d.ts
index babb33dea7366ca99f14e7eaa88f65635463a373..7ae7837a570f936c0388b5819e34ff2451bbd9b6 100644
--- a/types/disagg/index.d.ts
+++ b/types/disagg/index.d.ts
@@ -3,5 +3,5 @@ export * from './DisaggBinOptions';
 export * from './DisaggGraphView';
 export * from './DisaggGraphViewOptions';
 export * from './DisaggParameters';
-export * from './DisaggResponse';
 export * from './Disaggregation';
+export * from './DisaggResponse';
diff --git a/types/mvc/index.d.ts b/types/mvc/index.d.ts
index 2a5ecc6c09c6ddd415da85214fa3aa5f13a22f52..1105ee6b0036e8ee6b9f1f00b4f88dbec5eaf290 100644
--- a/types/mvc/index.d.ts
+++ b/types/mvc/index.d.ts
@@ -1,6 +1,6 @@
 export * from './Collection';
 export * from './Column';
 export * from './Model';
+export * from './MvcOptions';
 export * from './SelectedCollectionView';
 export * from './View';
-export * from './MvcOptions';