diff --git a/src/ts/adapt/adaptviewer.ts b/src/ts/vivliostyle/adaptviewer.ts
similarity index 99%
rename from src/ts/adapt/adaptviewer.ts
rename to src/ts/vivliostyle/adaptviewer.ts
index b78886824..ed049fa3c 100644
--- a/src/ts/adapt/adaptviewer.ts
+++ b/src/ts/vivliostyle/adaptviewer.ts
@@ -18,15 +18,15 @@
  *
  * @fileoverview AdaptViewer - Viewer implementation.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
-import * as Constants from "../vivliostyle/constants";
+import * as Constants from "./constants";
 import * as Epub from "./epub";
 import * as Exprs from "./exprs";
 import * as Font from "./font";
-import * as Logging from "../vivliostyle/logging";
-import * as Plugin from "../vivliostyle/plugin";
-import * as Profile from "../vivliostyle/profile";
+import * as Logging from "./logging";
+import * as Plugin from "./plugin";
+import * as Profile from "./profile";
 import * as Task from "./task";
 import * as TaskUtil from "./taskutil";
 import * as Vgen from "./vgen";
diff --git a/src/ts/adapt/base.ts b/src/ts/vivliostyle/base.ts
similarity index 99%
rename from src/ts/adapt/base.ts
rename to src/ts/vivliostyle/base.ts
index 14e059380..ad404d174 100644
--- a/src/ts/adapt/base.ts
+++ b/src/ts/vivliostyle/base.ts
@@ -18,7 +18,7 @@
  *
  * @fileoverview Base - Common utilities.
  */
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 
 export let emptyObj = {};
 
diff --git a/src/ts/vivliostyle/break.ts b/src/ts/vivliostyle/break.ts
index 214b044df..1487b73e6 100644
--- a/src/ts/vivliostyle/break.ts
+++ b/src/ts/vivliostyle/break.ts
@@ -17,7 +17,7 @@
  *
  * @fileoverview Break - Control fragmentation.
  */
-import * as Css from "../adapt/css";
+import * as Css from "./css";
 import * as Plugin from "./plugin";
 
 /**
diff --git a/src/ts/adapt/cfi.ts b/src/ts/vivliostyle/cfi.ts
similarity index 100%
rename from src/ts/adapt/cfi.ts
rename to src/ts/vivliostyle/cfi.ts
diff --git a/src/ts/vivliostyle/columns.ts b/src/ts/vivliostyle/columns.ts
index 1ac888de3..033dae6ca 100644
--- a/src/ts/vivliostyle/columns.ts
+++ b/src/ts/vivliostyle/columns.ts
@@ -18,11 +18,11 @@
  * @fileoverview Columns - Control column layout.
  */
 import * as Asserts from "./asserts";
-import * as Css from "../adapt/css";
+import * as Css from "./css";
 import * as MathUtil from "./mathutil";
 import * as PageFloats from "./pagefloats";
-import * as Task from "../adapt/task";
-import * as Vtree from "../adapt/vtree";
+import * as Task from "./task";
+import * as Vtree from "./vtree";
 import { Layout } from "./types";
 
 export type ColumnLayoutResult = {
diff --git a/src/ts/vivliostyle/counters.ts b/src/ts/vivliostyle/counters.ts
index cce72a0e3..15ab54b83 100644
--- a/src/ts/vivliostyle/counters.ts
+++ b/src/ts/vivliostyle/counters.ts
@@ -18,13 +18,13 @@
  * @fileoverview Counters
  */
 import * as Asserts from "./asserts";
-import * as Base from "../adapt/base";
-import * as CssCasc from "../adapt/csscasc";
-import * as CssProp from "../adapt/cssprop";
-import * as CssStyler from "../adapt/cssstyler";
-import * as Exprs from "../adapt/exprs";
-import * as Vgen from "../adapt/vgen";
-import * as Vtree from "../adapt/vtree";
+import * as Base from "./base";
+import * as CssCasc from "./csscasc";
+import * as CssProp from "./cssprop";
+import * as CssStyler from "./cssstyler";
+import * as Exprs from "./exprs";
+import * as Vgen from "./vgen";
+import * as Vtree from "./vtree";
 import { Layout } from "./types";
 
 /**
diff --git a/src/ts/adapt/css.ts b/src/ts/vivliostyle/css.ts
similarity index 100%
rename from src/ts/adapt/css.ts
rename to src/ts/vivliostyle/css.ts
diff --git a/src/ts/adapt/csscasc.ts b/src/ts/vivliostyle/csscasc.ts
similarity index 99%
rename from src/ts/adapt/csscasc.ts
rename to src/ts/vivliostyle/csscasc.ts
index cafda8ef3..f78015829 100644
--- a/src/ts/adapt/csscasc.ts
+++ b/src/ts/vivliostyle/csscasc.ts
@@ -18,7 +18,7 @@
  *
  * @fileoverview CssCasc - CSS Cascade.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
 import * as Css from "./css";
 import * as CssParse from "./cssparse";
@@ -26,11 +26,11 @@ import * as CssProp from "./cssprop";
 import * as CssTok from "./csstok";
 import * as CssValid from "./cssvalid";
 import * as Exprs from "./exprs";
-import * as Logging from "../vivliostyle/logging";
-import * as Matchers from "../vivliostyle/matchers";
-import * as Plugin from "../vivliostyle/plugin";
+import * as Logging from "./logging";
+import * as Matchers from "./matchers";
+import * as Plugin from "./plugin";
 import * as Vtree from "./vtree";
-import { CssCasc } from "../vivliostyle/types";
+import { CssCasc } from "./types";
 
 export interface ElementStyle extends CssCasc.ElementStyle {}
 
diff --git a/src/ts/adapt/cssparse.ts b/src/ts/vivliostyle/cssparse.ts
similarity index 99%
rename from src/ts/adapt/cssparse.ts
rename to src/ts/vivliostyle/cssparse.ts
index 31c684909..d5dbd1ecc 100644
--- a/src/ts/adapt/cssparse.ts
+++ b/src/ts/vivliostyle/cssparse.ts
@@ -22,7 +22,7 @@ import * as Base from "./base";
 import * as Css from "./css";
 import * as CssTok from "./csstok";
 import * as Exprs from "./exprs";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import * as Net from "./net";
 import * as Task from "./task";
 
diff --git a/src/ts/adapt/cssprop.ts b/src/ts/vivliostyle/cssprop.ts
similarity index 99%
rename from src/ts/adapt/cssprop.ts
rename to src/ts/vivliostyle/cssprop.ts
index d568bf8e2..7c17f94f1 100644
--- a/src/ts/adapt/cssprop.ts
+++ b/src/ts/vivliostyle/cssprop.ts
@@ -23,7 +23,7 @@ import * as Base from "./base";
 import * as Css from "./css";
 import * as Exprs from "./exprs";
 import * as Geom from "./geom";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 
 //---------------------- value parsers ----------------------------------
 export class SetVisitor extends Css.Visitor {
diff --git a/src/ts/adapt/cssstyler.ts b/src/ts/vivliostyle/cssstyler.ts
similarity index 99%
rename from src/ts/adapt/cssstyler.ts
rename to src/ts/vivliostyle/cssstyler.ts
index b6a57c621..dd4af38e2 100644
--- a/src/ts/adapt/cssstyler.ts
+++ b/src/ts/vivliostyle/cssstyler.ts
@@ -19,18 +19,18 @@
  * @fileoverview CssStyler - Apply CSS cascade to a document incrementally and
  * cache the result.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
-import * as Break from "../vivliostyle/break";
+import * as Break from "./break";
 import * as Css from "./css";
 import * as CssCasc from "./csscasc";
 import * as CssParse from "./cssparse";
 import * as CssProp from "./cssprop";
 import * as CssValid from "./cssvalid";
-import * as Display from "../vivliostyle/display";
+import * as Display from "./display";
 import * as Exprs from "./exprs";
 import * as Vtree from "./vtree";
-import { CssStyler, XmlDoc } from "../vivliostyle/types";
+import { CssStyler, XmlDoc } from "./types";
 
 export class SlipRange {
   endStuckFixed: number;
diff --git a/src/ts/adapt/csstok.ts b/src/ts/vivliostyle/csstok.ts
similarity index 100%
rename from src/ts/adapt/csstok.ts
rename to src/ts/vivliostyle/csstok.ts
diff --git a/src/ts/adapt/cssvalid.ts b/src/ts/vivliostyle/cssvalid.ts
similarity index 99%
rename from src/ts/adapt/cssvalid.ts
rename to src/ts/vivliostyle/cssvalid.ts
index a8691a889..8167fb2d9 100644
--- a/src/ts/adapt/cssvalid.ts
+++ b/src/ts/vivliostyle/cssvalid.ts
@@ -22,7 +22,7 @@
 import * as Css from "./css";
 import * as CssParse from "./cssparse";
 import * as CssTok from "./csstok";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import ValidationTxt from "../../resources/validation.txt";
 
 export interface PropertyReceiver {
diff --git a/src/ts/vivliostyle/display.ts b/src/ts/vivliostyle/display.ts
index b53230acf..a73ba41e5 100644
--- a/src/ts/vivliostyle/display.ts
+++ b/src/ts/vivliostyle/display.ts
@@ -17,7 +17,7 @@
  *
  * @fileoverview Display - CSS Display Module
  */
-import * as Css from "../adapt/css";
+import * as Css from "./css";
 
 export const FLOW_ROOT_ATTR = "data-vivliostyle-flow-root";
 
diff --git a/src/ts/adapt/epub.ts b/src/ts/vivliostyle/epub.ts
similarity index 99%
rename from src/ts/adapt/epub.ts
rename to src/ts/vivliostyle/epub.ts
index 4b58fef02..37d984abe 100644
--- a/src/ts/adapt/epub.ts
+++ b/src/ts/vivliostyle/epub.ts
@@ -18,18 +18,18 @@
  *
  * @fileoverview Epub - Deal with META-INF/ and .opf files in EPUB container.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
 import * as Cfi from "./cfi";
-import * as Constants from "../vivliostyle/constants";
-import * as Counters from "../vivliostyle/counters";
+import * as Constants from "./constants";
+import * as Counters from "./counters";
 import * as Css from "./css";
 import * as CssCasc from "./csscasc";
 import * as CssParse from "./cssparse";
 import * as CssTok from "./csstok";
 import * as Exprs from "./exprs";
 import * as Font from "./font";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import * as Net from "./net";
 import * as Ops from "./ops";
 import * as Sha1 from "./sha1";
diff --git a/src/ts/adapt/exprs.ts b/src/ts/vivliostyle/exprs.ts
similarity index 100%
rename from src/ts/adapt/exprs.ts
rename to src/ts/vivliostyle/exprs.ts
diff --git a/src/ts/adapt/font.ts b/src/ts/vivliostyle/font.ts
similarity index 99%
rename from src/ts/adapt/font.ts
rename to src/ts/vivliostyle/font.ts
index 051c1cba2..62490c232 100644
--- a/src/ts/adapt/font.ts
+++ b/src/ts/vivliostyle/font.ts
@@ -22,7 +22,7 @@ import * as Base from "./base";
 import * as Css from "./css";
 import * as CssCasc from "./csscasc";
 import * as Exprs from "./exprs";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import * as Net from "./net";
 import * as Task from "./task";
 import * as TaskUtil from "./taskutil";
diff --git a/src/ts/vivliostyle/footnotes.ts b/src/ts/vivliostyle/footnotes.ts
index 48f7ae9a2..07dcd9629 100644
--- a/src/ts/vivliostyle/footnotes.ts
+++ b/src/ts/vivliostyle/footnotes.ts
@@ -18,10 +18,10 @@
  * @fileoverview Footnotes
  */
 import * as Asserts from "./asserts";
-import * as Css from "../adapt/css";
+import * as Css from "./css";
 import * as PageFloats from "./pagefloats";
-import * as Task from "../adapt/task";
-import * as Vtree from "../adapt/vtree";
+import * as Task from "./task";
+import * as Vtree from "./vtree";
 import { Layout } from "./types";
 
 const PageFloatFragment = PageFloats.PageFloatFragment;
diff --git a/src/ts/adapt/geom.ts b/src/ts/vivliostyle/geom.ts
similarity index 100%
rename from src/ts/adapt/geom.ts
rename to src/ts/vivliostyle/geom.ts
diff --git a/src/ts/adapt/layout.ts b/src/ts/vivliostyle/layout.ts
similarity index 99%
rename from src/ts/adapt/layout.ts
rename to src/ts/vivliostyle/layout.ts
index 4514accb8..86840a1da 100644
--- a/src/ts/adapt/layout.ts
+++ b/src/ts/vivliostyle/layout.ts
@@ -21,26 +21,26 @@
  * Instead it goes through the layout interface that gives it one view tree
  * node at a time.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
-import * as Break from "../vivliostyle/break";
-import * as BreakPosition from "../vivliostyle/breakposition";
+import * as Break from "./break";
+import * as BreakPosition from "./breakposition";
 import * as Css from "./css";
-import * as Diff from "../vivliostyle/diff";
+import * as Diff from "./diff";
 import * as Geom from "./geom";
-import * as LayoutHelper from "../vivliostyle/layouthelper";
-import * as LayoutProcessor from "../vivliostyle/layoutprocessor";
-import * as LayoutRetryers from "../vivliostyle/layoutretryers";
-import * as Logging from "../vivliostyle/logging";
-import * as PageFloats from "../vivliostyle/pagefloats";
-import * as Plugin from "../vivliostyle/plugin";
-import * as Selectors from "../vivliostyle/selectors";
-import * as Shared from "../vivliostyle/shared";
-import * as Sizing from "../vivliostyle/sizing";
+import * as LayoutHelper from "./layouthelper";
+import * as LayoutProcessor from "./layoutprocessor";
+import * as LayoutRetryers from "./layoutretryers";
+import * as Logging from "./logging";
+import * as PageFloats from "./pagefloats";
+import * as Plugin from "./plugin";
+import * as Selectors from "./selectors";
+import * as Shared from "./shared";
+import * as Sizing from "./sizing";
 import * as Task from "./task";
 import * as Vgen from "./vgen";
 import * as VtreeImpl from "./vtree";
-import { Layout, RepetitiveElement, Table, Vtree } from "../vivliostyle/types";
+import { Layout, RepetitiveElement, Table, Vtree } from "./types";
 
 export const mediaTags = {
   img: true,
diff --git a/src/ts/vivliostyle/layouthelper.ts b/src/ts/vivliostyle/layouthelper.ts
index 3fef6d851..3fd9f4e09 100644
--- a/src/ts/vivliostyle/layouthelper.ts
+++ b/src/ts/vivliostyle/layouthelper.ts
@@ -16,9 +16,9 @@
  *
  * @fileoverview LayoutHelper - Helper functions of Layout.
  */
-import * as Base from "../adapt/base";
+import * as Base from "./base";
 import * as Logging from "./logging";
-import * as VtreeImpl from "../adapt/vtree";
+import * as VtreeImpl from "./vtree";
 import { Layout, Vtree } from "./types";
 
 /**
diff --git a/src/ts/vivliostyle/layoutprocessor.ts b/src/ts/vivliostyle/layoutprocessor.ts
index d2d27ae2f..8b503cd96 100644
--- a/src/ts/vivliostyle/layoutprocessor.ts
+++ b/src/ts/vivliostyle/layoutprocessor.ts
@@ -20,7 +20,7 @@ import * as BreakPosition from "./breakposition";
 import * as Display from "./display";
 import * as LayoutHelper from "./layouthelper";
 import * as Plugin from "./plugin";
-import * as Task from "../adapt/task";
+import * as Task from "./task";
 import { FormattingContextType, Layout, LayoutProcessor, Vtree } from "./types";
 
 /**
diff --git a/src/ts/vivliostyle/layoutretryers.ts b/src/ts/vivliostyle/layoutretryers.ts
index 7011dcb74..bb55b70b8 100644
--- a/src/ts/vivliostyle/layoutretryers.ts
+++ b/src/ts/vivliostyle/layoutretryers.ts
@@ -17,7 +17,7 @@
  * @fileoverview LayoutRetryers - Definitions of LayoutRetryer.
  */
 import * as Asserts from "./asserts";
-import * as Task from "../adapt/task";
+import * as Task from "./task";
 import { Layout, Vtree } from "./types";
 
 /**
diff --git a/src/ts/vivliostyle/layoututil.ts b/src/ts/vivliostyle/layoututil.ts
index b73ebfcfb..a29811031 100644
--- a/src/ts/vivliostyle/layoututil.ts
+++ b/src/ts/vivliostyle/layoututil.ts
@@ -19,9 +19,9 @@
  */
 import * as Break from "./break";
 import * as BreakPosition from "./breakposition";
-import * as LayoutImpl from "../adapt/layout";
-import * as Task from "../adapt/task";
-import * as VtreeImpl from "../adapt/vtree";
+import * as LayoutImpl from "./layout";
+import * as Task from "./task";
+import * as VtreeImpl from "./vtree";
 import { Layout, Vtree } from "./types";
 
 export type LayoutIteratorState = {
diff --git a/src/ts/adapt/net.ts b/src/ts/vivliostyle/net.ts
similarity index 98%
rename from src/ts/adapt/net.ts
rename to src/ts/vivliostyle/net.ts
index 836f5292c..96d064bc0 100644
--- a/src/ts/adapt/net.ts
+++ b/src/ts/vivliostyle/net.ts
@@ -19,10 +19,10 @@
  * @fileoverview Net - Fetch resource from a URL.
  */
 import * as Base from "./base";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import * as Task from "./task";
 import * as TaskUtil from "./taskutil";
-import { Net, XmlDoc } from "../vivliostyle/types";
+import { Net, XmlDoc } from "./types";
 import UserAgentXml from "../../resources/user-agent.xml";
 
 /**
diff --git a/src/ts/adapt/ops.ts b/src/ts/vivliostyle/ops.ts
similarity index 99%
rename from src/ts/adapt/ops.ts
rename to src/ts/vivliostyle/ops.ts
index d081ea9a7..fe71ccd14 100644
--- a/src/ts/adapt/ops.ts
+++ b/src/ts/vivliostyle/ops.ts
@@ -19,14 +19,14 @@
  * @fileoverview Ops - Render EPUB content files by applying page masters,
  * styling and layout.
  */
-import "../vivliostyle/footnotes";
-import "../vivliostyle/table";
-import * as Asserts from "../vivliostyle/asserts";
+import "./footnotes";
+import "./table";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
-import * as Break from "../vivliostyle/break";
-import * as Columns from "../vivliostyle/columns";
-import * as Constants from "../vivliostyle/constants";
-import * as Counters from "../vivliostyle/counters";
+import * as Break from "./break";
+import * as Columns from "./columns";
+import * as Constants from "./constants";
+import * as Counters from "./counters";
 import * as Css from "./css";
 import * as CssCasc from "./csscasc";
 import * as CssParse from "./cssparse";
@@ -38,19 +38,19 @@ import * as Exprs from "./exprs";
 import * as Font from "./font";
 import * as Geom from "./geom";
 import * as LayoutImpl from "./layout";
-import * as LayoutProcessor from "../vivliostyle/layoutprocessor";
-import * as Logging from "../vivliostyle/logging";
+import * as LayoutProcessor from "./layoutprocessor";
+import * as Logging from "./logging";
 import * as Net from "./net";
-import * as PageFloats from "../vivliostyle/pagefloats";
-import * as Pages from "../vivliostyle/pages";
-import * as Plugin from "../vivliostyle/plugin";
+import * as PageFloats from "./pagefloats";
+import * as Pages from "./pages";
+import * as Plugin from "./plugin";
 import * as Pm from "./pm";
 import * as Task from "./task";
 import * as TaskUtil from "./taskutil";
 import * as Vgen from "./vgen";
 import * as Vtree from "./vtree";
 import * as XmlDoc from "./xmldoc";
-import { Layout } from "../vivliostyle/types";
+import { Layout } from "./types";
 import UserAgentBaseCss from "../../resources/user-agent-base.css";
 import UserAgentPageCss from "../../resources/user-agent-page.css";
 
diff --git a/src/ts/vivliostyle/pagefloats.ts b/src/ts/vivliostyle/pagefloats.ts
index ef08db173..ff742d923 100644
--- a/src/ts/vivliostyle/pagefloats.ts
+++ b/src/ts/vivliostyle/pagefloats.ts
@@ -18,13 +18,13 @@
  * @fileoverview PageFloats - CSS Page Floats
  */
 import * as Asserts from "./asserts";
-import * as Css from "../adapt/css";
-import * as Geom from "../adapt/geom";
+import * as Css from "./css";
+import * as Geom from "./geom";
 import * as Logging from "./logging";
 import * as Logical from "./logical";
 import * as Sizing from "./sizing";
-import * as Task from "../adapt/task";
-import * as VtreeImpl from "../adapt/vtree";
+import * as Task from "./task";
+import * as VtreeImpl from "./vtree";
 import { Layout, PageFloats, Vtree } from "./types";
 
 export const FloatReference = PageFloats.FloatReference;
diff --git a/src/ts/vivliostyle/pages.ts b/src/ts/vivliostyle/pages.ts
index 851572941..1a3051c17 100644
--- a/src/ts/vivliostyle/pages.ts
+++ b/src/ts/vivliostyle/pages.ts
@@ -18,17 +18,17 @@
  * @fileoverview Pages - `@page` rule (CSS Paged Media) support
  */
 import * as Asserts from "./asserts";
-import * as Base from "../adapt/base";
+import * as Base from "./base";
 import * as Constants from "./constants";
-import * as Css from "../adapt/css";
-import * as CssCasc from "../adapt/csscasc";
-import * as CssParse from "../adapt/cssparse";
-import * as CssValid from "../adapt/cssvalid";
-import * as Exprs from "../adapt/exprs";
-import * as Font from "../adapt/font";
-import * as Pm from "../adapt/pm";
+import * as Css from "./css";
+import * as CssCasc from "./csscasc";
+import * as CssParse from "./cssparse";
+import * as CssValid from "./cssvalid";
+import * as Exprs from "./exprs";
+import * as Font from "./font";
+import * as Pm from "./pm";
 import * as Sizing from "./sizing";
-import * as Vtree from "../adapt/vtree";
+import * as Vtree from "./vtree";
 
 /**
  * Resolve page progression direction from writing-mode and direction.
diff --git a/src/ts/vivliostyle/plugin.ts b/src/ts/vivliostyle/plugin.ts
index 35c33a4c6..414cf4fb0 100644
--- a/src/ts/vivliostyle/plugin.ts
+++ b/src/ts/vivliostyle/plugin.ts
@@ -17,11 +17,11 @@
  *
  * @fileoverview Plugin - Plugin mechanism
  */
-import * as Base from "../adapt/base";
-import * as Css from "../adapt/css";
+import * as Base from "./base";
+import * as Css from "./css";
 import * as LayoutProcessor from "./layoutprocessor";
 import * as Logging from "./logging";
-import * as Task from "../adapt/task";
+import * as Task from "./task";
 import { Layout, Vtree } from "./types";
 
 /**
diff --git a/src/ts/adapt/pm.ts b/src/ts/vivliostyle/pm.ts
similarity index 100%
rename from src/ts/adapt/pm.ts
rename to src/ts/vivliostyle/pm.ts
diff --git a/src/ts/vivliostyle/pseudoelement.ts b/src/ts/vivliostyle/pseudoelement.ts
index 3b8abc1dd..0621a7407 100644
--- a/src/ts/vivliostyle/pseudoelement.ts
+++ b/src/ts/vivliostyle/pseudoelement.ts
@@ -16,12 +16,12 @@
  *
  * @fileoverview PseudoElement - CSS pseudo elements.
  */
-import * as Base from "../adapt/base";
-import * as Css from "../adapt/css";
-import * as CssCasc from "../adapt/csscasc";
-import * as CssStyler from "../adapt/cssstyler";
-import * as Exprs from "../adapt/exprs";
-import * as Vtree from "../adapt/vtree";
+import * as Base from "./base";
+import * as Css from "./css";
+import * as CssCasc from "./csscasc";
+import * as CssStyler from "./cssstyler";
+import * as Exprs from "./exprs";
+import * as Vtree from "./vtree";
 import { PseudoElement } from "./types";
 
 export const document = new DOMParser().parseFromString(
diff --git a/src/ts/vivliostyle/repetitiveelement.ts b/src/ts/vivliostyle/repetitiveelement.ts
index 723847497..06c374d2b 100644
--- a/src/ts/vivliostyle/repetitiveelement.ts
+++ b/src/ts/vivliostyle/repetitiveelement.ts
@@ -26,8 +26,8 @@ import * as LayoutUtil from "./layoututil";
 import * as Plugin from "./plugin";
 import * as Selectors from "./selectors";
 import * as Shared from "./shared";
-import * as Task from "../adapt/task";
-import * as VtreeImpl from "../adapt/vtree";
+import * as Task from "./task";
+import * as VtreeImpl from "./vtree";
 import {
   FormattingContextType,
   FragmentLayoutConstraintType,
diff --git a/src/ts/vivliostyle/selectors.ts b/src/ts/vivliostyle/selectors.ts
index c0eeb4679..99c2e3725 100644
--- a/src/ts/vivliostyle/selectors.ts
+++ b/src/ts/vivliostyle/selectors.ts
@@ -18,12 +18,12 @@
  * @fileoverview Selectors - Utilities for selectors.
  */
 import * as Asserts from "./asserts";
-import * as Base from "../adapt/base";
+import * as Base from "./base";
 import * as LayoutHelper from "./layouthelper";
 import * as Matchers from "./matchers";
 import * as PseudoElement from "./pseudoelement";
-import * as Task from "../adapt/task";
-import * as VtreeImpl from "../adapt/vtree";
+import * as Task from "./task";
+import * as VtreeImpl from "./vtree";
 import {
   FragmentLayoutConstraintType,
   Layout,
diff --git a/src/ts/adapt/sha1.ts b/src/ts/vivliostyle/sha1.ts
similarity index 100%
rename from src/ts/adapt/sha1.ts
rename to src/ts/vivliostyle/sha1.ts
diff --git a/src/ts/vivliostyle/sizing.ts b/src/ts/vivliostyle/sizing.ts
index 11b9d9e47..69a415b32 100644
--- a/src/ts/vivliostyle/sizing.ts
+++ b/src/ts/vivliostyle/sizing.ts
@@ -17,8 +17,8 @@
  *
  * @fileoverview Sizing - CSS Intrinsic & Extrinsic Sizing
  */
-import * as Base from "../adapt/base";
-import * as Vtree from "../adapt/vtree";
+import * as Base from "./base";
+import * as Vtree from "./vtree";
 
 /**
  * Box sizes defined in css-sizing.
diff --git a/src/ts/vivliostyle/table.ts b/src/ts/vivliostyle/table.ts
index 6e1a9a483..1ab426c8b 100644
--- a/src/ts/vivliostyle/table.ts
+++ b/src/ts/vivliostyle/table.ts
@@ -18,9 +18,9 @@
  * @fileoverview Table - Table formatting context and layout.
  */
 import * as Asserts from "./asserts";
-import * as Base from "../adapt/base";
+import * as Base from "./base";
 import * as BreakPosition from "./breakposition";
-import * as Css from "../adapt/css";
+import * as Css from "./css";
 import * as LayoutHelper from "./layouthelper";
 import * as LayoutProcessor from "./layoutprocessor";
 import * as LayoutRetryers from "./layoutretryers";
@@ -28,9 +28,9 @@ import * as LayoutUtil from "./layoututil";
 import * as Plugin from "./plugin";
 import * as RepetitiveElementImpl from "./repetitiveelement";
 import * as Selectors from "./selectors";
-import * as Task from "../adapt/task";
-import * as Vgen from "../adapt/vgen";
-import * as VtreeImpl from "../adapt/vtree";
+import * as Task from "./task";
+import * as Vgen from "./vgen";
+import * as VtreeImpl from "./vtree";
 import {
   FormattingContextType,
   FragmentLayoutConstraintType,
diff --git a/src/ts/adapt/task.ts b/src/ts/vivliostyle/task.ts
similarity index 99%
rename from src/ts/adapt/task.ts
rename to src/ts/vivliostyle/task.ts
index 84dbdeca9..a808c8cd6 100644
--- a/src/ts/adapt/task.ts
+++ b/src/ts/vivliostyle/task.ts
@@ -20,7 +20,7 @@
  * multitasking.
  */
 import * as Base from "./base";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 
 /**
  * External timer. Only needed for testing.
diff --git a/src/ts/adapt/taskutil.ts b/src/ts/vivliostyle/taskutil.ts
similarity index 98%
rename from src/ts/adapt/taskutil.ts
rename to src/ts/vivliostyle/taskutil.ts
index 314ac077e..59c8592fd 100644
--- a/src/ts/adapt/taskutil.ts
+++ b/src/ts/vivliostyle/taskutil.ts
@@ -20,7 +20,7 @@
  * multitasking.
  */
 import * as Base from "./base";
-import * as Logging from "../vivliostyle/logging";
+import * as Logging from "./logging";
 import * as Task from "./task";
 
 /**
diff --git a/src/ts/adapt/toc.ts b/src/ts/vivliostyle/toc.ts
similarity index 99%
rename from src/ts/adapt/toc.ts
rename to src/ts/vivliostyle/toc.ts
index 45044b18f..ecee872bf 100644
--- a/src/ts/adapt/toc.ts
+++ b/src/ts/vivliostyle/toc.ts
@@ -19,7 +19,7 @@
  * @fileoverview Toc - Table of Contents view.
  */
 import * as Base from "./base";
-import * as Counters from "../vivliostyle/counters";
+import * as Counters from "./counters";
 import * as Css from "./css";
 import * as Exprs from "./exprs";
 import * as Font from "./font";
diff --git a/src/ts/vivliostyle/types.ts b/src/ts/vivliostyle/types.ts
index 4975d5bf9..e71840550 100644
--- a/src/ts/vivliostyle/types.ts
+++ b/src/ts/vivliostyle/types.ts
@@ -16,13 +16,13 @@
  *
  * @fileoverview Types - Type definiions.
  */
-import * as Base from "../adapt/base";
-import * as Css from "../adapt/css";
+import * as Base from "./base";
+import * as Css from "./css";
 import * as Diff from "./diff";
-import * as Exprs from "../adapt/exprs";
-import * as Geom from "../adapt/geom";
-import * as Task from "../adapt/task";
-import * as TaskUtil from "../adapt/taskutil";
+import * as Exprs from "./exprs";
+import * as Geom from "./geom";
+import * as Task from "./task";
+import * as TaskUtil from "./taskutil";
 
 export type FormattingContextType =
   | "Block"
diff --git a/src/ts/adapt/vgen.ts b/src/ts/vivliostyle/vgen.ts
similarity index 99%
rename from src/ts/adapt/vgen.ts
rename to src/ts/vivliostyle/vgen.ts
index 5697d6839..121f65b10 100644
--- a/src/ts/adapt/vgen.ts
+++ b/src/ts/vivliostyle/vgen.ts
@@ -18,27 +18,27 @@
  *
  * @fileoverview Vgen - View tree generator.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
 import * as Css from "./css";
 import * as CssCasc from "./csscasc";
 import * as CssProp from "./cssprop";
 import * as CssStyler from "./cssstyler";
-import * as Diff from "../vivliostyle/diff";
-import * as Display from "../vivliostyle/display";
+import * as Diff from "./diff";
+import * as Display from "./display";
 import * as Exprs from "./exprs";
 import * as Font from "./font";
-import * as Matchers from "../vivliostyle/matchers";
-import * as PageFloats from "../vivliostyle/pagefloats";
-import * as Plugin from "../vivliostyle/plugin";
-import * as PseudoElement from "../vivliostyle/pseudoelement";
-import * as RepetitiveElement from "../vivliostyle/repetitiveelement";
-import * as Selectors from "../vivliostyle/selectors";
+import * as Matchers from "./matchers";
+import * as PageFloats from "./pagefloats";
+import * as Plugin from "./plugin";
+import * as PseudoElement from "./pseudoelement";
+import * as RepetitiveElement from "./repetitiveelement";
+import * as Selectors from "./selectors";
 import * as Task from "./task";
 import * as TaskUtil from "./taskutil";
-import * as Urls from "../vivliostyle/urls";
+import * as Urls from "./urls";
 import * as Vtree from "./vtree";
-import { XmlDoc } from "../vivliostyle/types";
+import { XmlDoc } from "./types";
 
 const namespacePrefixMap = {};
 
diff --git a/src/ts/vivliostyle/viewer.ts b/src/ts/vivliostyle/viewer.ts
index 6b170ab9c..eb315923a 100644
--- a/src/ts/vivliostyle/viewer.ts
+++ b/src/ts/vivliostyle/viewer.ts
@@ -17,8 +17,8 @@
  *
  * @fileoverview Viewer - Vivliostyle Viewer class
  */
-import * as AdaptViewer from "../adapt/adaptviewer";
-import * as Base from "../adapt/base";
+import * as AdaptViewer from "./adaptviewer";
+import * as Base from "./base";
 import * as Constants from "./constants";
 import * as Profile from "./profile";
 
diff --git a/src/ts/vivliostyle/viewerapp.ts b/src/ts/vivliostyle/viewerapp.ts
index 096611914..458f3fb2e 100644
--- a/src/ts/vivliostyle/viewerapp.ts
+++ b/src/ts/vivliostyle/viewerapp.ts
@@ -18,8 +18,8 @@
  *
  * @fileoverview ViewerApp - (Deprecated) Vivliostyle page viewer base on adapt.sampleapp
  */
-import * as AdaptViewer from "../adapt/adaptviewer";
-import * as Base from "../adapt/base";
+import * as AdaptViewer from "./adaptviewer";
+import * as Base from "./base";
 import * as Constants from "./constants";
 
 export let fontSize: number = 16;
diff --git a/src/ts/adapt/vtree.ts b/src/ts/vivliostyle/vtree.ts
similarity index 99%
rename from src/ts/adapt/vtree.ts
rename to src/ts/vivliostyle/vtree.ts
index 812dd0536..c4c54e311 100644
--- a/src/ts/adapt/vtree.ts
+++ b/src/ts/vivliostyle/vtree.ts
@@ -18,18 +18,18 @@
  *
  * @fileoverview Vtree - Basic view tree data structures and support utilities.
  */
-import * as Asserts from "../vivliostyle/asserts";
+import * as Asserts from "./asserts";
 import * as Base from "./base";
-import * as Constants from "../vivliostyle/constants";
+import * as Constants from "./constants";
 import * as Css from "./css";
 import * as CssParse from "./cssparse";
 import * as CssProp from "./cssprop";
 import * as CssTok from "./csstok";
-import * as Diff from "../vivliostyle/diff";
+import * as Diff from "./diff";
 import * as Exprs from "./exprs";
 import * as Geom from "./geom";
 import * as TaskUtil from "./taskutil";
-import { PageFloats, Selectors, Vtree, XmlDoc } from "../vivliostyle/types";
+import { PageFloats, Selectors, Vtree, XmlDoc } from "./types";
 
 export const delayedProps = {
   transform: true,
diff --git a/src/ts/adapt/xmldoc.ts b/src/ts/vivliostyle/xmldoc.ts
similarity index 99%
rename from src/ts/adapt/xmldoc.ts
rename to src/ts/vivliostyle/xmldoc.ts
index a0abdfe9d..3021f7398 100644
--- a/src/ts/adapt/xmldoc.ts
+++ b/src/ts/vivliostyle/xmldoc.ts
@@ -22,7 +22,7 @@
 import * as Base from "./base";
 import * as Net from "./net";
 import * as Task from "./task";
-import { XmlDoc } from "../vivliostyle/types";
+import { XmlDoc } from "./types";
 
 export type XMLDocStore = XmlDoc.XMLDocStore;
 
diff --git a/test/spec/adapt/base-spec.js b/test/spec/vivliostyle/base-spec.js
similarity index 97%
rename from test/spec/adapt/base-spec.js
rename to test/spec/vivliostyle/base-spec.js
index 63456ab90..418c7dca0 100644
--- a/test/spec/adapt/base-spec.js
+++ b/test/spec/vivliostyle/base-spec.js
@@ -15,7 +15,7 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_base from "../../../src/ts/adapt/base";
+import * as adapt_base from "../../../src/ts/vivliostyle/base";
 
 describe("base", function() {
     var module = adapt_base;
diff --git a/test/spec/vivliostyle/break-spec.js b/test/spec/vivliostyle/break-spec.js
index 259bf4623..7412c7f61 100644
--- a/test/spec/vivliostyle/break-spec.js
+++ b/test/spec/vivliostyle/break-spec.js
@@ -15,7 +15,7 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_css from "../../../src/ts/adapt/css";
+import * as adapt_css from "../../../src/ts/vivliostyle/css";
 import * as vivliostyle_break from "../../../src/ts/vivliostyle/break";
 
 describe("break", function() {
diff --git a/test/spec/vivliostyle/column-spec.js b/test/spec/vivliostyle/column-spec.js
index 866e508e9..189148da8 100644
--- a/test/spec/vivliostyle/column-spec.js
+++ b/test/spec/vivliostyle/column-spec.js
@@ -15,7 +15,7 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_vtree from "../../../src/ts/adapt/vtree";
+import * as adapt_vtree from "../../../src/ts/vivliostyle/vtree";
 import * as vivliostyle_columns from "../../../src/ts/vivliostyle/columns";
 
 // FIXME: cannot spyOn(module, "...")
diff --git a/test/spec/adapt/csscasc-spec.js b/test/spec/vivliostyle/csscasc-spec.js
similarity index 99%
rename from test/spec/adapt/csscasc-spec.js
rename to test/spec/vivliostyle/csscasc-spec.js
index 61d1db716..b3582b93b 100644
--- a/test/spec/adapt/csscasc-spec.js
+++ b/test/spec/vivliostyle/csscasc-spec.js
@@ -15,9 +15,9 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_css from "../../../src/ts/adapt/css";
-import * as adapt_csscasc from "../../../src/ts/adapt/csscasc";
-import * as adapt_csstok from "../../../src/ts/adapt/csstok";
+import * as adapt_css from "../../../src/ts/vivliostyle/css";
+import * as adapt_csscasc from "../../../src/ts/vivliostyle/csscasc";
+import * as adapt_csstok from "../../../src/ts/vivliostyle/csstok";
 import * as vivliostyle_plugin from "../../../src/ts/vivliostyle/plugin";
 import * as vivliostyle_test_util_mock_plugin from "../../util/mock/vivliostyle/plugin-mock";
 
diff --git a/test/spec/adapt/cssparse-spec.js b/test/spec/vivliostyle/cssparse-spec.js
similarity index 99%
rename from test/spec/adapt/cssparse-spec.js
rename to test/spec/vivliostyle/cssparse-spec.js
index 6fc1fd9aa..19a940265 100644
--- a/test/spec/adapt/cssparse-spec.js
+++ b/test/spec/vivliostyle/cssparse-spec.js
@@ -15,9 +15,9 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_cssparse from "../../../src/ts/adapt/cssparse";
-import * as adapt_csstok from "../../../src/ts/adapt/csstok";
-import * as adapt_task from "../../../src/ts/adapt/task";
+import * as adapt_cssparse from "../../../src/ts/vivliostyle/cssparse";
+import * as adapt_csstok from "../../../src/ts/vivliostyle/csstok";
+import * as adapt_task from "../../../src/ts/vivliostyle/task";
 
 describe("cssparse", function() {
     describe("Parser", function() {
diff --git a/test/spec/adapt/cssvalid-spec.js b/test/spec/vivliostyle/cssvalid-spec.js
similarity index 97%
rename from test/spec/adapt/cssvalid-spec.js
rename to test/spec/vivliostyle/cssvalid-spec.js
index 2fe610388..a0c37c9b0 100644
--- a/test/spec/adapt/cssvalid-spec.js
+++ b/test/spec/vivliostyle/cssvalid-spec.js
@@ -15,10 +15,10 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_csscasc from "../../../src/ts/adapt/csscasc";
-import * as adapt_cssparse from "../../../src/ts/adapt/cssparse";
-import * as adapt_cssvalid from "../../../src/ts/adapt/cssvalid";
-import * as adapt_task from "../../../src/ts/adapt/task";
+import * as adapt_csscasc from "../../../src/ts/vivliostyle/csscasc";
+import * as adapt_cssparse from "../../../src/ts/vivliostyle/cssparse";
+import * as adapt_cssvalid from "../../../src/ts/vivliostyle/cssvalid";
+import * as adapt_task from "../../../src/ts/vivliostyle/task";
 import * as vivliostyle_logging from "../../../src/ts/vivliostyle/logging";
 
 describe("cssvalid", function() {
diff --git a/test/spec/adapt/epub-spec.js b/test/spec/vivliostyle/epub-spec.js
similarity index 98%
rename from test/spec/adapt/epub-spec.js
rename to test/spec/vivliostyle/epub-spec.js
index 3cfa1e2bb..f66682a54 100644
--- a/test/spec/adapt/epub-spec.js
+++ b/test/spec/vivliostyle/epub-spec.js
@@ -15,7 +15,7 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_epub from "../../../src/ts/adapt/epub";
+import * as adapt_epub from "../../../src/ts/vivliostyle/epub";
 
 describe("epub", function() {
     describe("OPFDoc", function() {
diff --git a/test/spec/adapt/layout-spec.js b/test/spec/vivliostyle/layout-spec.js
similarity index 97%
rename from test/spec/adapt/layout-spec.js
rename to test/spec/vivliostyle/layout-spec.js
index 5022e174e..06b3e1110 100644
--- a/test/spec/adapt/layout-spec.js
+++ b/test/spec/vivliostyle/layout-spec.js
@@ -15,8 +15,8 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_layout from "../../../src/ts/adapt/layout";
-import * as adapt_vtree from "../../../src/ts/adapt/vtree";
+import * as adapt_layout from "../../../src/ts/vivliostyle/layout";
+import * as adapt_vtree from "../../../src/ts/vivliostyle/vtree";
 
 describe("layout", function() {
 
diff --git a/test/spec/vivliostyle/page-spec.js b/test/spec/vivliostyle/page-spec.js
index 28af1fe23..1263bfea6 100644
--- a/test/spec/vivliostyle/page-spec.js
+++ b/test/spec/vivliostyle/page-spec.js
@@ -15,9 +15,9 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_css from "../../../src/ts/adapt/css";
-import * as adapt_csscasc from "../../../src/ts/adapt/csscasc";
-import * as adapt_cssparse from "../../../src/ts/adapt/cssparse";
+import * as adapt_css from "../../../src/ts/vivliostyle/css";
+import * as adapt_csscasc from "../../../src/ts/vivliostyle/csscasc";
+import * as adapt_cssparse from "../../../src/ts/vivliostyle/cssparse";
 import * as vivliostyle_pages from "../../../src/ts/vivliostyle/pages";
 
 describe("page", function() {
diff --git a/test/spec/vivliostyle/pagefloat-spec.js b/test/spec/vivliostyle/pagefloat-spec.js
index c18ec5abe..7ebcf54a0 100644
--- a/test/spec/vivliostyle/pagefloat-spec.js
+++ b/test/spec/vivliostyle/pagefloat-spec.js
@@ -15,7 +15,7 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_css from "../../../src/ts/adapt/css";
+import * as adapt_css from "../../../src/ts/vivliostyle/css";
 import * as vivliostyle_pagefloat from "../../../src/ts/vivliostyle/pagefloats";
 
 describe("pagefloats", function() {
diff --git a/test/spec/vivliostyle/selectors-spec.js b/test/spec/vivliostyle/selectors-spec.js
index 82cd297b3..325af3e21 100644
--- a/test/spec/vivliostyle/selectors-spec.js
+++ b/test/spec/vivliostyle/selectors-spec.js
@@ -15,8 +15,8 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_css from "../../../src/ts/adapt/css";
-import * as adapt_csscasc from "../../../src/ts/adapt/csscasc";
+import * as adapt_css from "../../../src/ts/vivliostyle/css";
+import * as adapt_csscasc from "../../../src/ts/vivliostyle/csscasc";
 import * as vivliostyle_matchers from "../../../src/ts/vivliostyle/matchers";
 import * as vivliostyle_selectors from "../../../src/ts/vivliostyle/selectors";
 
diff --git a/test/spec/vivliostyle/sizing-spec.js b/test/spec/vivliostyle/sizing-spec.js
index ae52aecdf..0177408c1 100644
--- a/test/spec/vivliostyle/sizing-spec.js
+++ b/test/spec/vivliostyle/sizing-spec.js
@@ -15,8 +15,8 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_base from "../../../src/ts/adapt/base";
-import * as adapt_vgen from "../../../src/ts/adapt/vgen";
+import * as adapt_base from "../../../src/ts/vivliostyle/base";
+import * as adapt_vgen from "../../../src/ts/vivliostyle/vgen";
 import * as vivliostyle_sizing from "../../../src/ts/vivliostyle/sizing";
 import * as vivliostyle_test_util_dom from "../../util/dom";
 import * as vivliostyle_test_util_matchers from "../../util/matchers";
diff --git a/test/spec/adapt/xmldoc-spec.js b/test/spec/vivliostyle/xmldoc-spec.js
similarity index 98%
rename from test/spec/adapt/xmldoc-spec.js
rename to test/spec/vivliostyle/xmldoc-spec.js
index 849f03152..f29793b50 100644
--- a/test/spec/adapt/xmldoc-spec.js
+++ b/test/spec/vivliostyle/xmldoc-spec.js
@@ -15,8 +15,8 @@
  * along with Vivliostyle.js.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-import * as adapt_base from "../../../src/ts/adapt/base";
-import * as adapt_xmldoc from "../../../src/ts/adapt/xmldoc";
+import * as adapt_base from "../../../src/ts/vivliostyle/base";
+import * as adapt_xmldoc from "../../../src/ts/vivliostyle/xmldoc";
 
 describe("xmldoc", function() {