diff --git a/js/playback.js b/js/components/playback.js
similarity index 100%
rename from js/playback.js
rename to js/components/playback.js
diff --git a/js/reveal.js b/js/reveal.js
index c696b0884245b4c2ac20264b23023cd93d15511b..65df5a9da8606373693ea513099efc6f9d7e1d27 100644
--- a/js/reveal.js
+++ b/js/reveal.js
@@ -1,4 +1,4 @@
-import Playback from './playback.js'
+import Playback from './components/playback.js'
 
 /**
  * reveal.js
diff --git a/test/examples/auto-animate.html b/test/examples/auto-animate.html
index b4bc193f865ac7d90d3a93d548067e0b80b5a368..a1c0c9539650a15ae928b855119d5d4263c54065 100644
--- a/test/examples/auto-animate.html
+++ b/test/examples/auto-animate.html
@@ -8,8 +8,8 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-		<link rel="stylesheet" href="../../css/reveal.css">
-		<link rel="stylesheet" href="../../css/theme/black.css" id="theme">
+		<link rel="stylesheet" href="../../dist/reveal.css">
+		<link rel="stylesheet" href="../../dist/theme/black.css" id="theme">
 		<link rel="stylesheet" href="../../lib/css/monokai.css">
 	</head>
 
@@ -162,7 +162,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/examples/barebones.html b/test/examples/barebones.html
index 2bee3cb02c7201beace21bd83721e98a6c909fd4..29dc4517623cefbc236df6c1fce2e319db6f2685 100644
--- a/test/examples/barebones.html
+++ b/test/examples/barebones.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Barebones</title>
 
-		<link rel="stylesheet" href="../../css/reveal.css">
+		<link rel="stylesheet" href="../../dist/reveal.css">
 	</head>
 
 	<body>
@@ -29,7 +29,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/examples/embedded-media.html b/test/examples/embedded-media.html
index 91457e4928c99d19f342f7acc8642576e77ad921..9ef35b865ac07503d095492dc22bfa9189f8dc6a 100644
--- a/test/examples/embedded-media.html
+++ b/test/examples/embedded-media.html
@@ -8,8 +8,8 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-		<link rel="stylesheet" href="../../css/reveal.css">
-		<link rel="stylesheet" href="../../css/theme/default.css" id="theme">
+		<link rel="stylesheet" href="../../dist/reveal.css">
+		<link rel="stylesheet" href="../../dist/theme/default.css" id="theme">
 	</head>
 
 	<body>
@@ -39,7 +39,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/examples/math.html b/test/examples/math.html
index 0f74a8f5639b6288bd29814369802fe357e80cf8..c50d25a5e4c30088f18076f6211624083c3b6874 100644
--- a/test/examples/math.html
+++ b/test/examples/math.html
@@ -8,8 +8,8 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-		<link rel="stylesheet" href="../../css/reveal.css">
-		<link rel="stylesheet" href="../../css/theme/night.css" id="theme">
+		<link rel="stylesheet" href="../../dist/reveal.css">
+		<link rel="stylesheet" href="../../dist/theme/night.css" id="theme">
 	</head>
 
 	<body>
@@ -175,7 +175,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/examples/slide-backgrounds.html b/test/examples/slide-backgrounds.html
index e08d260c0dc2d5e80a90c981c62495d33106de0e..19579e80a7bca1d1695a7cc11eb358940ee35f5c 100644
--- a/test/examples/slide-backgrounds.html
+++ b/test/examples/slide-backgrounds.html
@@ -8,8 +8,8 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no">
 
-		<link rel="stylesheet" href="../../css/reveal.css">
-		<link rel="stylesheet" href="../../css/theme/serif.css" id="theme">
+		<link rel="stylesheet" href="../../dist/reveal.css">
+		<link rel="stylesheet" href="../../dist/theme/serif.css" id="theme">
 		<style type="text/css" media="screen">
 			.slides section.has-dark-background,
 			.slides section.has-dark-background h2 {
@@ -122,7 +122,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/examples/slide-transitions.html b/test/examples/slide-transitions.html
index b7520ab0910de57f91ef5ba0ddda2fa27c9519a9..69d8f1f6877b5ae11494993023163214452801e4 100644
--- a/test/examples/slide-transitions.html
+++ b/test/examples/slide-transitions.html
@@ -6,8 +6,8 @@
 
 		<title>reveal.js - Slide Transitions</title>
 
-		<link rel="stylesheet" href="../../css/reveal.css">
-		<link rel="stylesheet" href="../../css/theme/white.css" id="theme">
+		<link rel="stylesheet" href="../../dist/reveal.css">
+		<link rel="stylesheet" href="../../dist/theme/white.css" id="theme">
 		<style type="text/css" media="screen">
 			.slides section.has-dark-background,
 			.slides section.has-dark-background h3 {
@@ -81,7 +81,7 @@
 
 		</div>
 
-		<script src="../../js/reveal.js"></script>
+		<script src="../../dist/reveal.min.js"></script>
 
 		<script>
 
diff --git a/test/test-auto-animate.html b/test/test-auto-animate.html
index 60c32f4bbcb1d03e559f38779211192629dc220e..19e0419996ec751222f45ab4d3912419151c51b2 100644
--- a/test/test-auto-animate.html
+++ b/test/test-auto-animate.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Auto-Animate</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -45,7 +45,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-dependencies-async.html b/test/test-dependencies-async.html
index b36c31b5d141387c2590cdfaa2637c0f1ee34144..78e9f011074b74ee57fb21cb1117fd17646e833d 100644
--- a/test/test-dependencies-async.html
+++ b/test/test-dependencies-async.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Async Dependencies</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -25,7 +25,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-dependencies.html b/test/test-dependencies.html
index 49aaf60e7dec693d21ebb9434459eb14b6b94992..48791958112373233a738a1544e7a2886bef1a24 100644
--- a/test/test-dependencies.html
+++ b/test/test-dependencies.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Dependencies</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -25,7 +25,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-grid-navigation.html b/test/test-grid-navigation.html
index 21e7636c7b4f35211599120cb67286e3cde2ded6..b53dcb389fa799ff17dfdfe4f62d47306a855254 100644
--- a/test/test-grid-navigation.html
+++ b/test/test-grid-navigation.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Grid</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -37,7 +37,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-iframe-backgrounds.html b/test/test-iframe-backgrounds.html
index 15888bcbe7b82dbe28c9c627f97f14c8db574bd0..59e7aed52568e6f17688ba88e94e56d2f0b69322 100644
--- a/test/test-iframe-backgrounds.html
+++ b/test/test-iframe-backgrounds.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Iframe Backgrounds</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -30,7 +30,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-iframes.html b/test/test-iframes.html
index 979bb7d60939a22ac0575e5a18d69ac5eb1941af..b2b7d96d045e54d9caecb70857ee649be2fa1bb8 100644
--- a/test/test-iframes.html
+++ b/test/test-iframes.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Iframes</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -30,7 +30,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-markdown-element-attributes.html b/test/test-markdown-element-attributes.html
index 741131f6743543806586b362d45e63e4ac7e3e06..ce8ca465d20040cb2bbf3b68d8a86d044153f26f 100644
--- a/test/test-markdown-element-attributes.html
+++ b/test/test-markdown-element-attributes.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Markdown Element Attributes</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -121,7 +121,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="../plugin/markdown/marked.js"></script>
 		<script src="../plugin/markdown/markdown.js"></script>
 		<script src="qunit-2.5.0.js"></script>
diff --git a/test/test-markdown-external.html b/test/test-markdown-external.html
index 93cd9839903593dcf9058b04f7728459ac006069..4db4228e0e37c60a5cf944c6712410da406663af 100644
--- a/test/test-markdown-external.html
+++ b/test/test-markdown-external.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Markdown</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -23,7 +23,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="../plugin/highlight/highlight.js"></script>
 		<script src="../plugin/markdown/marked.js"></script>
 		<script src="../plugin/markdown/markdown.js"></script>
diff --git a/test/test-markdown-options.html b/test/test-markdown-options.html
index 5391a195f99df9102ff863ca880975ff23b90067..653f858eef11c208156138af317165d2987484b7 100644
--- a/test/test-markdown-options.html
+++ b/test/test-markdown-options.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Markdown Options</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -31,7 +31,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script src="test-markdown-options.js"></script>
diff --git a/test/test-markdown-slide-attributes.html b/test/test-markdown-slide-attributes.html
index ba9e710000254c3a671a5b8f44d9d1a71b89eb9d..a596019da710cfbc12a92aee866b2e958e19698b 100644
--- a/test/test-markdown-slide-attributes.html
+++ b/test/test-markdown-slide-attributes.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Markdown Attributes</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -116,7 +116,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="../plugin/markdown/marked.js"></script>
 		<script src="../plugin/markdown/markdown.js"></script>
 		<script src="qunit-2.5.0.js"></script>
diff --git a/test/test-markdown.html b/test/test-markdown.html
index e1e5926e8b4a70d8785e3480eae5a004803ffeea..c6b55425559787796cd0bc284635c3472cd9702d 100644
--- a/test/test-markdown.html
+++ b/test/test-markdown.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Markdown</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -40,7 +40,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="../plugin/markdown/marked.js"></script>
 		<script src="../plugin/markdown/markdown.js"></script>
 		<script src="qunit-2.5.0.js"></script>
diff --git a/test/test-pdf.html b/test/test-pdf.html
index a0b82824213224380fb694d3c307253f2278d703..09ffa22d849792afcfb4711153b1795a4ce03d0e 100644
--- a/test/test-pdf.html
+++ b/test/test-pdf.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test PDF exports</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="../css/print/pdf.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
@@ -73,7 +73,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script src="test-pdf.js"></script>
diff --git a/test/test-plugins.html b/test/test-plugins.html
index dfd65b74ded73f5803f30b8168ae6fe4e5890887..4bdbfd221e78a8eb064e592670c908a6456fc174 100644
--- a/test/test-plugins.html
+++ b/test/test-plugins.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test Plugins</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -25,7 +25,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test-state.html b/test/test-state.html
index e6ae42309a4af14f8089f914d5982d2f20c19483..61736d030a197f6269434496e0eb9472e51255b3 100644
--- a/test/test-state.html
+++ b/test/test-state.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Test State</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -35,7 +35,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script>
diff --git a/test/test.html b/test/test.html
index 309b2017fa0fdb4c637cec90716cb8ece4953226..2e9b3d20bdfbcde84290b40a7b6c7dc2c41e0e26 100644
--- a/test/test.html
+++ b/test/test.html
@@ -6,7 +6,7 @@
 
 		<title>reveal.js - Tests</title>
 
-		<link rel="stylesheet" href="../css/reveal.css">
+		<link rel="stylesheet" href="../dist/reveal.css">
 		<link rel="stylesheet" href="qunit-2.5.0.css">
 	</head>
 
@@ -76,7 +76,7 @@
 
 		</div>
 
-		<script src="../js/reveal.js"></script>
+		<script src="../dist/reveal.min.js"></script>
 		<script src="qunit-2.5.0.js"></script>
 
 		<script src="test.js"></script>