diff --git a/.eslintignore b/.eslintignore
index 2132595..2a6813c 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,5 +1,5 @@
 /.nyc_output
-/browser
+/packages/pegjs/dist
 /coverage
 /node_modules
 /website
diff --git a/.gitattributes b/.gitattributes
index 7fa350e..44aaa50 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,2 @@
 * text=auto
-bin/*.js text eol=lf
+packages/pegjs/bin/*.js text eol=lf
diff --git a/.gitignore b/.gitignore
index 2c8dccc..19cd755 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 /.idea
-/browser
+/packages/pegjs/dist
 /examples/*.js
 /node_modules
 /coverage
diff --git a/.nycrc b/.nycrc
index 8e97d7b..c8676fe 100644
--- a/.nycrc
+++ b/.nycrc
@@ -1,6 +1,7 @@
 {
     "exclude": [
         "test",
+        "website",
         "gulpfile.js",
         "**/.eslintrc.js"
     ],
diff --git a/gulpfile.js b/gulpfile.js
index 08fbdec..7855857 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -37,8 +37,7 @@ task( "lint", () => pump(
 
     src( [
         "**/.*rc.js",
-        "bin/*.js",
-        "lib/**/*.js",
+        "packages/**/*.js",
         "test/benchmark/**/*.js",
         "test/benchmark/run",
         "test/impact",
@@ -71,7 +70,7 @@ task( "benchmark", cb => {
 // Generate the grammar parser.
 task( "build:parser", cb => {
 
-    node( "bin/peg src/parser.pegjs -o lib/parser.js -c src/pegjs.config.js", cb );
+    node( "packages/pegjs/bin/peg src/parser.pegjs -o packages/pegjs/lib/parser.js -c src/pegjs.config.js", cb );
 
 } );
 
@@ -104,12 +103,12 @@ task( "build:browser", () => {
 
     return pump(
 
-        browserify( "lib/peg.js", options )
+        browserify( "packages/pegjs/lib/peg.js", options )
             .transform( babelify )
             .bundle(),
         stream( "peg.js" ),
         header( HEADER ),
-        dest( "browser" ),
+        dest( "packages/pegjs/dist" ),
         rename( options ),
         buffer(),
         uglify(),
diff --git a/lib/peg.d.ts b/lib/peg.d.ts
deleted file mode 100644
index 0f15990..0000000
--- a/lib/peg.d.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-import api from "./typings/api"
-export = api;
diff --git a/now.json b/now.json
index 22816d6..709fcf2 100644
--- a/now.json
+++ b/now.json
@@ -8,7 +8,7 @@
     ],
     "files": [
         "examples",
-        "lib",
+        "packages",
         "test",
         "website",
         ".babelrc",
diff --git a/package.json b/package.json
index cf261cd..65d5362 100644
--- a/package.json
+++ b/package.json
@@ -1,30 +1,9 @@
 {
-    "name": "pegjs",
-    "version": "0.11.0-dev",
-    "description": "Parser generator for JavaScript",
-    "keywords": [
-        "PEG.js",
-        "pegjs",
-        "grammar",
-        "parser",
-        "generator",
-        "language",
-        "PEG"
+    "name": "pegjs-dev",
+    "private": true,
+    "workspaces": [
+        "packages/*"
     ],
-    "homepage": "https://pegjs.org/",
-    "repository": "pegjs/pegjs",
-    "license": "MIT",
-    "contributors": [
-        "David Majda <david@majda.cz> (https://majda.cz/)",
-        "Futago-za Ryuu <futagoza.ryuu@gmail.com>"
-    ],
-    "files": [
-        "bin",
-        "lib"
-    ],
-    "types": "lib/typings/pegjs.d.ts",
-    "main": "lib/peg.js",
-    "bin": "bin/peg.js",
     "scripts": {
         "lint": "gulp lint",
         "spec": "gulp test",
diff --git a/packages/pegjs/LICENSE b/packages/pegjs/LICENSE
new file mode 100644
index 0000000..1ec26a4
--- /dev/null
+++ b/packages/pegjs/LICENSE
@@ -0,0 +1,22 @@
+MIT License
+
+Copyright (c) 2010-2016 David Majda
+Copyright (c) 2017+ Futago-za Ryuu
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/packages/pegjs/README.md b/packages/pegjs/README.md
new file mode 100644
index 0000000..75f632d
--- /dev/null
+++ b/packages/pegjs/README.md
@@ -0,0 +1,35 @@
+[![ci](https://img.shields.io/travis/pegjs/pegjs.svg)](https://travis-ci.org/pegjs/pegjs)
+[![coverage](https://img.shields.io/coveralls/github/pegjs/pegjs.svg)](https://coveralls.io/github/pegjs/pegjs)
+[![license](https://img.shields.io/badge/license-mit-blue.svg)](https://opensource.org/licenses/MIT)
+
+PEG.js is a simple parser generator for JavaScript that produces fast parsers with excellent error reporting. You can use it to process complex data or computer languages and build transformers, interpreters, compilers and other tools easily.
+
+> PEG.js is still very much work in progress. There are no compatibility guarantees until version 1.0
+
+## features
+
+  * Simple and expressive grammar syntax
+  * Integrates both lexical and syntactical analysis
+  * Parsers have excellent error reporting out of the box
+  * Based on [parsing expression grammar](http://en.wikipedia.org/wiki/Parsing_expression_grammar) formalism - more powerful than traditional LL(*k*) and LR(*k*) parsers
+  * Usable [from your browser](https://pegjs.org/online), from the command line, or via JavaScript API
+
+## documentation
+
+- [Getting Started](https://github.com/pegjs/pegjs/blob/master/docs/guides/getting-started.md)
+- [Installation](https://github.com/pegjs/pegjs/blob/master/docs/guides/installation.md)
+- [Generating a Parser](https://github.com/pegjs/pegjs/blob/master/docs/guides/generating-a-parser.md)
+- [Using the Parser](https://github.com/pegjs/pegjs/blob/master/docs/guides/using-the-parser.md)
+- [Grammar Syntax and Semantics](https://github.com/pegjs/pegjs/tree/master/docs/grammar)
+- [JavaScript API](https://github.com/pegjs/pegjs/blob/master/docs/guides/javascript-api.md)
+- [Plugins](https://github.com/pegjs/pegjs/blob/master/docs/guides/plugins.md)
+- [Compatibility](https://github.com/pegjs/pegjs/blob/master/docs/notes/compatibility.md)
+- [Development](https://github.com/pegjs/pegjs/blob/master/docs/notes/development.md)
+- [Useful Links](https://github.com/pegjs/pegjs/blob/master/docs/notes/useful-links.md)
+
+## license
+
+Released under the [MIT License](https://opensource.org/licenses/MIT).
+
+Copyright (c) 2010-2016 [David Majda](https://majda.cz/)<br>
+Copyright (c) 2017+ [Futago-za Ryuu](https://github.com/futagoza)
diff --git a/bin/options.js b/packages/pegjs/bin/options.js
similarity index 100%
rename from bin/options.js
rename to packages/pegjs/bin/options.js
diff --git a/bin/peg.js b/packages/pegjs/bin/peg.js
similarity index 100%
rename from bin/peg.js
rename to packages/pegjs/bin/peg.js
diff --git a/bin/usage.js b/packages/pegjs/bin/usage.js
similarity index 100%
rename from bin/usage.js
rename to packages/pegjs/bin/usage.js
diff --git a/lib/ast/Grammar.js b/packages/pegjs/lib/ast/Grammar.js
similarity index 100%
rename from lib/ast/Grammar.js
rename to packages/pegjs/lib/ast/Grammar.js
diff --git a/lib/ast/Node.js b/packages/pegjs/lib/ast/Node.js
similarity index 100%
rename from lib/ast/Node.js
rename to packages/pegjs/lib/ast/Node.js
diff --git a/lib/ast/index.js b/packages/pegjs/lib/ast/index.js
similarity index 100%
rename from lib/ast/index.js
rename to packages/pegjs/lib/ast/index.js
diff --git a/lib/ast/visitor.js b/packages/pegjs/lib/ast/visitor.js
similarity index 100%
rename from lib/ast/visitor.js
rename to packages/pegjs/lib/ast/visitor.js
diff --git a/lib/compiler/index.js b/packages/pegjs/lib/compiler/index.js
similarity index 100%
rename from lib/compiler/index.js
rename to packages/pegjs/lib/compiler/index.js
diff --git a/lib/compiler/opcodes.js b/packages/pegjs/lib/compiler/opcodes.js
similarity index 100%
rename from lib/compiler/opcodes.js
rename to packages/pegjs/lib/compiler/opcodes.js
diff --git a/lib/compiler/passes/calc-report-failures.js b/packages/pegjs/lib/compiler/passes/calc-report-failures.js
similarity index 100%
rename from lib/compiler/passes/calc-report-failures.js
rename to packages/pegjs/lib/compiler/passes/calc-report-failures.js
diff --git a/lib/compiler/passes/generate-bytecode.js b/packages/pegjs/lib/compiler/passes/generate-bytecode.js
similarity index 100%
rename from lib/compiler/passes/generate-bytecode.js
rename to packages/pegjs/lib/compiler/passes/generate-bytecode.js
diff --git a/lib/compiler/passes/generate-js.js b/packages/pegjs/lib/compiler/passes/generate-js.js
similarity index 100%
rename from lib/compiler/passes/generate-js.js
rename to packages/pegjs/lib/compiler/passes/generate-js.js
diff --git a/lib/compiler/passes/inference-match-result.js b/packages/pegjs/lib/compiler/passes/inference-match-result.js
similarity index 100%
rename from lib/compiler/passes/inference-match-result.js
rename to packages/pegjs/lib/compiler/passes/inference-match-result.js
diff --git a/lib/compiler/passes/remove-proxy-rules.js b/packages/pegjs/lib/compiler/passes/remove-proxy-rules.js
similarity index 100%
rename from lib/compiler/passes/remove-proxy-rules.js
rename to packages/pegjs/lib/compiler/passes/remove-proxy-rules.js
diff --git a/lib/compiler/passes/report-duplicate-labels.js b/packages/pegjs/lib/compiler/passes/report-duplicate-labels.js
similarity index 100%
rename from lib/compiler/passes/report-duplicate-labels.js
rename to packages/pegjs/lib/compiler/passes/report-duplicate-labels.js
diff --git a/lib/compiler/passes/report-duplicate-rules.js b/packages/pegjs/lib/compiler/passes/report-duplicate-rules.js
similarity index 100%
rename from lib/compiler/passes/report-duplicate-rules.js
rename to packages/pegjs/lib/compiler/passes/report-duplicate-rules.js
diff --git a/lib/compiler/passes/report-infinite-recursion.js b/packages/pegjs/lib/compiler/passes/report-infinite-recursion.js
similarity index 100%
rename from lib/compiler/passes/report-infinite-recursion.js
rename to packages/pegjs/lib/compiler/passes/report-infinite-recursion.js
diff --git a/lib/compiler/passes/report-infinite-repetition.js b/packages/pegjs/lib/compiler/passes/report-infinite-repetition.js
similarity index 100%
rename from lib/compiler/passes/report-infinite-repetition.js
rename to packages/pegjs/lib/compiler/passes/report-infinite-repetition.js
diff --git a/lib/compiler/passes/report-undefined-rules.js b/packages/pegjs/lib/compiler/passes/report-undefined-rules.js
similarity index 100%
rename from lib/compiler/passes/report-undefined-rules.js
rename to packages/pegjs/lib/compiler/passes/report-undefined-rules.js
diff --git a/lib/compiler/passes/report-unused-rules.js b/packages/pegjs/lib/compiler/passes/report-unused-rules.js
similarity index 100%
rename from lib/compiler/passes/report-unused-rules.js
rename to packages/pegjs/lib/compiler/passes/report-unused-rules.js
diff --git a/lib/compiler/session.js b/packages/pegjs/lib/compiler/session.js
similarity index 100%
rename from lib/compiler/session.js
rename to packages/pegjs/lib/compiler/session.js
diff --git a/lib/grammar-error.js b/packages/pegjs/lib/grammar-error.js
similarity index 100%
rename from lib/grammar-error.js
rename to packages/pegjs/lib/grammar-error.js
diff --git a/lib/parser.js b/packages/pegjs/lib/parser.js
similarity index 100%
rename from lib/parser.js
rename to packages/pegjs/lib/parser.js
diff --git a/lib/peg.js b/packages/pegjs/lib/peg.js
similarity index 100%
rename from lib/peg.js
rename to packages/pegjs/lib/peg.js
diff --git a/lib/util/index.js b/packages/pegjs/lib/util/index.js
similarity index 100%
rename from lib/util/index.js
rename to packages/pegjs/lib/util/index.js
diff --git a/lib/util/js.js b/packages/pegjs/lib/util/js.js
similarity index 100%
rename from lib/util/js.js
rename to packages/pegjs/lib/util/js.js
diff --git a/lib/util/objects.js b/packages/pegjs/lib/util/objects.js
similarity index 100%
rename from lib/util/objects.js
rename to packages/pegjs/lib/util/objects.js
diff --git a/lib/util/vm.js b/packages/pegjs/lib/util/vm.js
similarity index 100%
rename from lib/util/vm.js
rename to packages/pegjs/lib/util/vm.js
diff --git a/packages/pegjs/package.json b/packages/pegjs/package.json
new file mode 100644
index 0000000..921eded
--- /dev/null
+++ b/packages/pegjs/package.json
@@ -0,0 +1,27 @@
+{
+    "name": "pegjs",
+    "version": "0.11.0-dev",
+    "description": "Parser generator for JavaScript",
+    "keywords": [
+        "PEG.js",
+        "pegjs",
+        "grammar",
+        "parser",
+        "generator",
+        "language",
+        "PEG"
+    ],
+    "homepage": "https://pegjs.org/",
+    "repository": "pegjs/pegjs",
+    "license": "MIT",
+    "contributors": [
+        "David Majda <david@majda.cz> (https://majda.cz/)",
+        "Futago-za Ryuu <futagoza.ryuu@gmail.com>"
+    ],
+    "types": "typings/pegjs.d.ts",
+    "main": "lib/peg.js",
+    "bin": "bin/peg.js",
+    "engines": {
+        "node": ">= 6"
+    }
+}
diff --git a/lib/typings/api.d.ts b/packages/pegjs/typings/api.d.ts
similarity index 100%
rename from lib/typings/api.d.ts
rename to packages/pegjs/typings/api.d.ts
diff --git a/lib/typings/generated-parser.d.ts b/packages/pegjs/typings/generated-parser.d.ts
similarity index 100%
rename from lib/typings/generated-parser.d.ts
rename to packages/pegjs/typings/generated-parser.d.ts
diff --git a/lib/typings/modules.d.ts b/packages/pegjs/typings/modules.d.ts
similarity index 100%
rename from lib/typings/modules.d.ts
rename to packages/pegjs/typings/modules.d.ts
diff --git a/lib/typings/pegjs.d.ts b/packages/pegjs/typings/pegjs.d.ts
similarity index 100%
rename from lib/typings/pegjs.d.ts
rename to packages/pegjs/typings/pegjs.d.ts
diff --git a/test/README.md b/test/README.md
index 319d54e..32bc4b4 100644
--- a/test/README.md
+++ b/test/README.md
@@ -6,8 +6,6 @@ This directory contains various test suites and scripts to ensure PEG.js works c
 * [Benchmark Suite](benchmark): It measures speed of the parsers generated by PEG.js on various inputs. Its main goal is to provide data for code generator optimizations.
 * [Impact Script](impact): Measures impact of a Git commit (or multiple commits) on generated parsers speed and size.
 
-> Note: The package `pegjs-dev`, used by the benchmark and spec modules within this directory, points to '[test/node_modules/pegjs-dev.js](node_modules/pegjs-dev.js)', which is an alias module for '[lib/peg.js](../lib/peg.js)'
-
 ## Download and Install
 
 To run the PEG.js test suites you most download the and install the module via the git repository:
diff --git a/test/benchmark/runner.js b/test/benchmark/runner.js
index ddb654d..baa2dee 100644
--- a/test/benchmark/runner.js
+++ b/test/benchmark/runner.js
@@ -1,6 +1,6 @@
 "use strict";
 
-const peg = require( "pegjs-dev" );
+const peg = require( "pegjs" );
 
 const Runner = {
     run( benchmarks, runCount, options, callbacks ) {
diff --git a/test/spec/api/generated-parser-api.spec.js b/test/spec/api/generated-parser-api.spec.js
index 3c68bb8..9544fa1 100644
--- a/test/spec/api/generated-parser-api.spec.js
+++ b/test/spec/api/generated-parser-api.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chai = require( "chai" );
-const peg = require( "pegjs-dev" );
+const peg = require( "pegjs" );
 const sinon = require( "sinon" );
 
 const expect = chai.expect;
diff --git a/test/spec/api/pegjs-api.spec.js b/test/spec/api/pegjs-api.spec.js
index 830cb1e..b73268d 100644
--- a/test/spec/api/pegjs-api.spec.js
+++ b/test/spec/api/pegjs-api.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chai = require( "chai" );
-const peg = require( "pegjs-dev" );
+const peg = require( "pegjs" );
 const sinon = require( "sinon" );
 
 const expect = chai.expect;
diff --git a/test/spec/api/pegjs-util.spec.js b/test/spec/api/pegjs-util.spec.js
index 9a18d68..a5dfa3d 100644
--- a/test/spec/api/pegjs-util.spec.js
+++ b/test/spec/api/pegjs-util.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chai = require( "chai" );
-const util = require( "pegjs-dev" ).util;
+const util = require( "pegjs" ).util;
 
 const expect = chai.expect;
 
diff --git a/test/spec/api/plugin-api.spec.js b/test/spec/api/plugin-api.spec.js
index fdc9427..9873f12 100644
--- a/test/spec/api/plugin-api.spec.js
+++ b/test/spec/api/plugin-api.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chai = require( "chai" );
-const peg = require( "pegjs-dev" );
+const peg = require( "pegjs" );
 
 const expect = chai.expect;
 
diff --git a/test/spec/behavior/generated-parser-behavior.spec.js b/test/spec/behavior/generated-parser-behavior.spec.js
index 0ad8627..b603467 100644
--- a/test/spec/behavior/generated-parser-behavior.spec.js
+++ b/test/spec/behavior/generated-parser-behavior.spec.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const chai = require( "chai" );
-const peg = require( "pegjs-dev" );
+const peg = require( "pegjs" );
 const sinon = require( "sinon" );
 
 const expect = chai.expect;
diff --git a/test/spec/unit/compiler/passes/generate-bytecode.spec.js b/test/spec/unit/compiler/passes/generate-bytecode.spec.js
index 406a117..58c7fa4 100644
--- a/test/spec/unit/compiler/passes/generate-bytecode.spec.js
+++ b/test/spec/unit/compiler/passes/generate-bytecode.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.generate.generateBytecode;
+const pass = require( "pegjs" ).compiler.passes.generate.generateBytecode;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/helpers.js b/test/spec/unit/compiler/passes/helpers.js
index 683f7c0..026bce3 100644
--- a/test/spec/unit/compiler/passes/helpers.js
+++ b/test/spec/unit/compiler/passes/helpers.js
@@ -1,7 +1,7 @@
 "use strict";
 
 const LikeHelper = require( "chai-like" );
-const Session = require( "pegjs-dev" ).compiler.Session;
+const Session = require( "pegjs" ).compiler.Session;
 
 module.exports = function ( chai, utils ) {
 
diff --git a/test/spec/unit/compiler/passes/inference-match-result.spec.js b/test/spec/unit/compiler/passes/inference-match-result.spec.js
index 5e2f3de..14e69c5 100644
--- a/test/spec/unit/compiler/passes/inference-match-result.spec.js
+++ b/test/spec/unit/compiler/passes/inference-match-result.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.generate.inferenceMatchResult;
+const pass = require( "pegjs" ).compiler.passes.generate.inferenceMatchResult;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js b/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
index 817111e..4b4520a 100644
--- a/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
+++ b/test/spec/unit/compiler/passes/remove-proxy-rules.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.transform.removeProxyRules;
+const pass = require( "pegjs" ).compiler.passes.transform.removeProxyRules;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js b/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
index 8ca045a..fb4e01c 100644
--- a/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
+++ b/test/spec/unit/compiler/passes/report-duplicate-labels.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportDuplicateLabels;
+const pass = require( "pegjs" ).compiler.passes.check.reportDuplicateLabels;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js b/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
index 97a6f45..7b405ff 100644
--- a/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
+++ b/test/spec/unit/compiler/passes/report-duplicate-rules.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportDuplicateRules;
+const pass = require( "pegjs" ).compiler.passes.check.reportDuplicateRules;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js b/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
index c470e92..d99f2a8 100644
--- a/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
+++ b/test/spec/unit/compiler/passes/report-infinite-recursion.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportInfiniteRecursion;
+const pass = require( "pegjs" ).compiler.passes.check.reportInfiniteRecursion;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js b/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
index a1f2ff8..cd7ac97 100644
--- a/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
+++ b/test/spec/unit/compiler/passes/report-infinite-repetition.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportInfiniteRepetition;
+const pass = require( "pegjs" ).compiler.passes.check.reportInfiniteRepetition;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-undefined-rules.spec.js b/test/spec/unit/compiler/passes/report-undefined-rules.spec.js
index 6a64a56..09eebf2 100644
--- a/test/spec/unit/compiler/passes/report-undefined-rules.spec.js
+++ b/test/spec/unit/compiler/passes/report-undefined-rules.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportUndefinedRules;
+const pass = require( "pegjs" ).compiler.passes.check.reportUndefinedRules;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/compiler/passes/report-unused-rules.spec.js b/test/spec/unit/compiler/passes/report-unused-rules.spec.js
index 52b7d9b..3638357 100644
--- a/test/spec/unit/compiler/passes/report-unused-rules.spec.js
+++ b/test/spec/unit/compiler/passes/report-unused-rules.spec.js
@@ -2,7 +2,7 @@
 
 const chai = require( "chai" );
 const helpers = require( "./helpers" );
-const pass = require( "pegjs-dev" ).compiler.passes.check.reportUnusedRules;
+const pass = require( "pegjs" ).compiler.passes.check.reportUnusedRules;
 
 chai.use( helpers );
 
diff --git a/test/spec/unit/parser.spec.js b/test/spec/unit/parser.spec.js
index 53dbd1a..84796f8 100644
--- a/test/spec/unit/parser.spec.js
+++ b/test/spec/unit/parser.spec.js
@@ -1,9 +1,11 @@
 "use strict";
 
 const chai = require( "chai" );
-const parser = require( "pegjs-dev" ).parser;
-const util = require( "pegjs-dev" ).util;
-const visitor = require( "pegjs-dev" ).ast.visitor;
+const {
+    parser,
+    util,
+    ast,
+} = require( "pegjs" );
 
 const expect = chai.expect;
 
@@ -194,7 +196,7 @@ describe( "PEG.js grammar parser", function () {
 
         }
 
-        strip = visitor.build( {
+        strip = ast.visitor.build( {
             grammar( node ) {
 
                 delete node.location;