diff --git a/basic/main.go b/basic/main.go
index f1d02f2..6003c25 100644
--- a/basic/main.go
+++ b/basic/main.go
@@ -15,6 +15,7 @@ type builder struct{}
 
 func (b *builder) Build(contentDir, buildDir, cacheDir string) {
 	errs := goldsmith.Begin(contentDir).
+		Cache(cacheDir).
 		Chain(frontmatter.New()).
 		Chain(markdown.New()).
 		Chain(layout.New()).
diff --git a/bootstrap/src/blog/post1.md b/bootstrap/content/blog/post1.md
similarity index 100%
rename from bootstrap/src/blog/post1.md
rename to bootstrap/content/blog/post1.md
diff --git a/bootstrap/src/blog/post2.md b/bootstrap/content/blog/post2.md
similarity index 100%
rename from bootstrap/src/blog/post2.md
rename to bootstrap/content/blog/post2.md
diff --git a/bootstrap/src/blog/post3.md b/bootstrap/content/blog/post3.md
similarity index 100%
rename from bootstrap/src/blog/post3.md
rename to bootstrap/content/blog/post3.md
diff --git a/bootstrap/src/blog/post4.md b/bootstrap/content/blog/post4.md
similarity index 100%
rename from bootstrap/src/blog/post4.md
rename to bootstrap/content/blog/post4.md
diff --git a/bootstrap/src/blog/post5.md b/bootstrap/content/blog/post5.md
similarity index 100%
rename from bootstrap/src/blog/post5.md
rename to bootstrap/content/blog/post5.md
diff --git a/bootstrap/src/blog/post6.md b/bootstrap/content/blog/post6.md
similarity index 100%
rename from bootstrap/src/blog/post6.md
rename to bootstrap/content/blog/post6.md
diff --git a/bootstrap/src/blog/post7.md b/bootstrap/content/blog/post7.md
similarity index 100%
rename from bootstrap/src/blog/post7.md
rename to bootstrap/content/blog/post7.md
diff --git a/bootstrap/src/blog/post8.md b/bootstrap/content/blog/post8.md
similarity index 100%
rename from bootstrap/src/blog/post8.md
rename to bootstrap/content/blog/post8.md
diff --git a/bootstrap/src/blog/post9.md b/bootstrap/content/blog/post9.md
similarity index 100%
rename from bootstrap/src/blog/post9.md
rename to bootstrap/content/blog/post9.md
diff --git a/bootstrap/src/index.md b/bootstrap/content/index.md
similarity index 83%
rename from bootstrap/src/index.md
rename to bootstrap/content/index.md
index 7f7447f..5bb0e55 100644
--- a/bootstrap/src/index.md
+++ b/bootstrap/content/index.md
@@ -3,6 +3,5 @@ Area = "blog"
 CrumbName = "blog"
 Layout = "collection"
 Title = "Blog"
-Paginate = true
 +++
 
diff --git a/bootstrap/layouts/breadcrumbs.html b/bootstrap/content/layouts/breadcrumbs.gohtml
similarity index 100%
rename from bootstrap/layouts/breadcrumbs.html
rename to bootstrap/content/layouts/breadcrumbs.gohtml
diff --git a/bootstrap/layouts/cloud.html b/bootstrap/content/layouts/cloud.gohtml
similarity index 100%
rename from bootstrap/layouts/cloud.html
rename to bootstrap/content/layouts/cloud.gohtml
diff --git a/bootstrap/content/layouts/collection.gohtml b/bootstrap/content/layouts/collection.gohtml
new file mode 100644
index 0000000..33db243
--- /dev/null
+++ b/bootstrap/content/layouts/collection.gohtml
@@ -0,0 +1,16 @@
+{{define "collection"}}
+{{template "header" .}}
+{{template "navbar" .}}
+<div class="container">
+    {{range .Meta.Groups.Blog}}
+    <div>
+        <h2><a href="{{.Path}}">{{.Meta.Title}}</a></h2>
+        <p>
+            {{.Meta.Summary}}
+            <a href="{{.Path}}">&hellip;</a>
+        </p>
+    </div>
+    {{end}}
+</div>
+{{template "footer" .}}
+{{end}}
diff --git a/bootstrap/layouts/content.html b/bootstrap/content/layouts/content.gohtml
similarity index 100%
rename from bootstrap/layouts/content.html
rename to bootstrap/content/layouts/content.gohtml
diff --git a/bootstrap/layouts/github.html b/bootstrap/content/layouts/github.gohtml
similarity index 100%
rename from bootstrap/layouts/github.html
rename to bootstrap/content/layouts/github.gohtml
diff --git a/bootstrap/layouts/outer.html b/bootstrap/content/layouts/outer.gohtml
similarity index 100%
rename from bootstrap/layouts/outer.html
rename to bootstrap/content/layouts/outer.gohtml
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-grid.css b/bootstrap/content/lib/bootstrap/css/bootstrap-grid.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-grid.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap-grid.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-grid.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap-grid.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-grid.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap-grid.css.map
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-grid.min.css b/bootstrap/content/lib/bootstrap/css/bootstrap-grid.min.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-grid.min.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap-grid.min.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-grid.min.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap-grid.min.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-grid.min.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap-grid.min.css.map
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-reboot.css b/bootstrap/content/lib/bootstrap/css/bootstrap-reboot.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-reboot.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap-reboot.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-reboot.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap-reboot.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-reboot.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap-reboot.css.map
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-reboot.min.css b/bootstrap/content/lib/bootstrap/css/bootstrap-reboot.min.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-reboot.min.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap-reboot.min.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap-reboot.min.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap-reboot.min.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap-reboot.min.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap-reboot.min.css.map
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap.css b/bootstrap/content/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap.css.map
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap.min.css b/bootstrap/content/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap.min.css
rename to bootstrap/content/lib/bootstrap/css/bootstrap.min.css
diff --git a/bootstrap/src/lib/bootstrap/css/bootstrap.min.css.map b/bootstrap/content/lib/bootstrap/css/bootstrap.min.css.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/css/bootstrap.min.css.map
rename to bootstrap/content/lib/bootstrap/css/bootstrap.min.css.map
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.bundle.js b/bootstrap/content/lib/bootstrap/js/bootstrap.bundle.js
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.bundle.js
rename to bootstrap/content/lib/bootstrap/js/bootstrap.bundle.js
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.bundle.js.map b/bootstrap/content/lib/bootstrap/js/bootstrap.bundle.js.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.bundle.js.map
rename to bootstrap/content/lib/bootstrap/js/bootstrap.bundle.js.map
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.bundle.min.js b/bootstrap/content/lib/bootstrap/js/bootstrap.bundle.min.js
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.bundle.min.js
rename to bootstrap/content/lib/bootstrap/js/bootstrap.bundle.min.js
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.bundle.min.js.map b/bootstrap/content/lib/bootstrap/js/bootstrap.bundle.min.js.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.bundle.min.js.map
rename to bootstrap/content/lib/bootstrap/js/bootstrap.bundle.min.js.map
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.js b/bootstrap/content/lib/bootstrap/js/bootstrap.js
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.js
rename to bootstrap/content/lib/bootstrap/js/bootstrap.js
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.js.map b/bootstrap/content/lib/bootstrap/js/bootstrap.js.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.js.map
rename to bootstrap/content/lib/bootstrap/js/bootstrap.js.map
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.min.js b/bootstrap/content/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.min.js
rename to bootstrap/content/lib/bootstrap/js/bootstrap.min.js
diff --git a/bootstrap/src/lib/bootstrap/js/bootstrap.min.js.map b/bootstrap/content/lib/bootstrap/js/bootstrap.min.js.map
similarity index 100%
rename from bootstrap/src/lib/bootstrap/js/bootstrap.min.js.map
rename to bootstrap/content/lib/bootstrap/js/bootstrap.min.js.map
diff --git a/bootstrap/src/lib/jquery.min.js b/bootstrap/content/lib/jquery.min.js
similarity index 100%
rename from bootstrap/src/lib/jquery.min.js
rename to bootstrap/content/lib/jquery.min.js
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.css b/bootstrap/content/lib/lightbox/ekko-lightbox.css
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.css
rename to bootstrap/content/lib/lightbox/ekko-lightbox.css
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.js b/bootstrap/content/lib/lightbox/ekko-lightbox.js
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.js
rename to bootstrap/content/lib/lightbox/ekko-lightbox.js
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.js.map b/bootstrap/content/lib/lightbox/ekko-lightbox.js.map
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.js.map
rename to bootstrap/content/lib/lightbox/ekko-lightbox.js.map
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.min.css b/bootstrap/content/lib/lightbox/ekko-lightbox.min.css
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.min.css
rename to bootstrap/content/lib/lightbox/ekko-lightbox.min.css
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.min.css.map b/bootstrap/content/lib/lightbox/ekko-lightbox.min.css.map
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.min.css.map
rename to bootstrap/content/lib/lightbox/ekko-lightbox.min.css.map
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.min.js b/bootstrap/content/lib/lightbox/ekko-lightbox.min.js
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.min.js
rename to bootstrap/content/lib/lightbox/ekko-lightbox.min.js
diff --git a/bootstrap/src/lib/lightbox/ekko-lightbox.min.js.map b/bootstrap/content/lib/lightbox/ekko-lightbox.min.js.map
similarity index 100%
rename from bootstrap/src/lib/lightbox/ekko-lightbox.min.js.map
rename to bootstrap/content/lib/lightbox/ekko-lightbox.min.js.map
diff --git a/bootstrap/src/lib/tether/.gitignore b/bootstrap/content/lib/tether/.gitignore
similarity index 100%
rename from bootstrap/src/lib/tether/.gitignore
rename to bootstrap/content/lib/tether/.gitignore
diff --git a/bootstrap/src/lib/tether/.hsdoc b/bootstrap/content/lib/tether/.hsdoc
similarity index 100%
rename from bootstrap/src/lib/tether/.hsdoc
rename to bootstrap/content/lib/tether/.hsdoc
diff --git a/bootstrap/src/lib/tether/css/tether-theme-arrows-dark.css b/bootstrap/content/lib/tether/css/tether-theme-arrows-dark.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-arrows-dark.css
rename to bootstrap/content/lib/tether/css/tether-theme-arrows-dark.css
diff --git a/bootstrap/src/lib/tether/css/tether-theme-arrows-dark.min.css b/bootstrap/content/lib/tether/css/tether-theme-arrows-dark.min.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-arrows-dark.min.css
rename to bootstrap/content/lib/tether/css/tether-theme-arrows-dark.min.css
diff --git a/bootstrap/src/lib/tether/css/tether-theme-arrows.css b/bootstrap/content/lib/tether/css/tether-theme-arrows.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-arrows.css
rename to bootstrap/content/lib/tether/css/tether-theme-arrows.css
diff --git a/bootstrap/src/lib/tether/css/tether-theme-arrows.min.css b/bootstrap/content/lib/tether/css/tether-theme-arrows.min.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-arrows.min.css
rename to bootstrap/content/lib/tether/css/tether-theme-arrows.min.css
diff --git a/bootstrap/src/lib/tether/css/tether-theme-basic.css b/bootstrap/content/lib/tether/css/tether-theme-basic.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-basic.css
rename to bootstrap/content/lib/tether/css/tether-theme-basic.css
diff --git a/bootstrap/src/lib/tether/css/tether-theme-basic.min.css b/bootstrap/content/lib/tether/css/tether-theme-basic.min.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether-theme-basic.min.css
rename to bootstrap/content/lib/tether/css/tether-theme-basic.min.css
diff --git a/bootstrap/src/lib/tether/css/tether.css b/bootstrap/content/lib/tether/css/tether.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether.css
rename to bootstrap/content/lib/tether/css/tether.css
diff --git a/bootstrap/src/lib/tether/css/tether.min.css b/bootstrap/content/lib/tether/css/tether.min.css
similarity index 100%
rename from bootstrap/src/lib/tether/css/tether.min.css
rename to bootstrap/content/lib/tether/css/tether.min.css
diff --git a/bootstrap/src/lib/tether/js/tether.js b/bootstrap/content/lib/tether/js/tether.js
similarity index 100%
rename from bootstrap/src/lib/tether/js/tether.js
rename to bootstrap/content/lib/tether/js/tether.js
diff --git a/bootstrap/src/lib/tether/js/tether.min.js b/bootstrap/content/lib/tether/js/tether.min.js
similarity index 100%
rename from bootstrap/src/lib/tether/js/tether.min.js
rename to bootstrap/content/lib/tether/js/tether.min.js
diff --git a/bootstrap/src/main.css b/bootstrap/content/main.css
similarity index 100%
rename from bootstrap/src/main.css
rename to bootstrap/content/main.css
diff --git a/bootstrap/src/main.js b/bootstrap/content/main.js
similarity index 100%
rename from bootstrap/src/main.js
rename to bootstrap/content/main.js
diff --git a/bootstrap/src/portfolio/index.md b/bootstrap/content/portfolio/index.md
similarity index 100%
rename from bootstrap/src/portfolio/index.md
rename to bootstrap/content/portfolio/index.md
diff --git a/bootstrap/src/projects/gadget/img/screenshot1.png b/bootstrap/content/projects/gadget/img/screenshot1.png
similarity index 100%
rename from bootstrap/src/projects/gadget/img/screenshot1.png
rename to bootstrap/content/projects/gadget/img/screenshot1.png
diff --git a/bootstrap/src/projects/gadget/img/screenshot2.png b/bootstrap/content/projects/gadget/img/screenshot2.png
similarity index 100%
rename from bootstrap/src/projects/gadget/img/screenshot2.png
rename to bootstrap/content/projects/gadget/img/screenshot2.png
diff --git a/bootstrap/src/projects/gadget/index.md b/bootstrap/content/projects/gadget/index.md
similarity index 100%
rename from bootstrap/src/projects/gadget/index.md
rename to bootstrap/content/projects/gadget/index.md
diff --git a/bootstrap/src/projects/index.md b/bootstrap/content/projects/index.md
similarity index 100%
rename from bootstrap/src/projects/index.md
rename to bootstrap/content/projects/index.md
diff --git a/bootstrap/src/projects/widget/img/screenshot1.png b/bootstrap/content/projects/widget/img/screenshot1.png
similarity index 100%
rename from bootstrap/src/projects/widget/img/screenshot1.png
rename to bootstrap/content/projects/widget/img/screenshot1.png
diff --git a/bootstrap/src/projects/widget/img/screenshot2.png b/bootstrap/content/projects/widget/img/screenshot2.png
similarity index 100%
rename from bootstrap/src/projects/widget/img/screenshot2.png
rename to bootstrap/content/projects/widget/img/screenshot2.png
diff --git a/bootstrap/src/projects/widget/index.md b/bootstrap/content/projects/widget/index.md
similarity index 100%
rename from bootstrap/src/projects/widget/index.md
rename to bootstrap/content/projects/widget/index.md
diff --git a/bootstrap/src/tags/index.md b/bootstrap/content/tags/index.md
similarity index 100%
rename from bootstrap/src/tags/index.md
rename to bootstrap/content/tags/index.md
diff --git a/bootstrap/layouts/collection.html b/bootstrap/layouts/collection.html
deleted file mode 100644
index 7b7d966..0000000
--- a/bootstrap/layouts/collection.html
+++ /dev/null
@@ -1,52 +0,0 @@
-{{define "collection"}}
-{{template "header" .}}
-{{template "navbar" .}}
-<div class="container">
-    {{range .Meta.Pager.PageCurr.Items}}
-    <div>
-        <h2><a href="{{.Path}}">{{.Meta.Title}}</a></h2>
-        <p>
-            {{.Meta.Summary.Summary}}
-            <a href="{{.Path}}">[&hellip;more]</a>
-        </p>
-    </div>
-    {{end}}
-
-    {{if .Meta.Pager.Paged}}
-    <ul class="pagination justify-content-center">
-        {{if .Meta.Pager.PageCurr.Prev}}
-        <li class="page-item">
-            <a class="page-link" href="{{.Meta.Pager.PageCurr.Prev.File.Path}}" tabindex="-1">Previous</a>
-        </li>
-        {{else}}
-        <li class="page-item disabled">
-            <a class="page-link" href="#" tabindex="-1">Previous</a>
-        </li>
-        {{end}}
-
-        {{range .Meta.Pager.PagesAll}}
-        {{if eq $.Meta.Pager.PageCurr.Index .Index}}
-        <li class="page-item disabled">
-            <a class="page-link" href="#">{{.Index}}</a>
-        </li>
-        {{else}}
-        <li class="page-item">
-            <a class="page-link" href="{{.File.Path}}">{{.Index}}</a>
-        </li>
-        {{end}}
-        {{end}}
-
-        {{if .Meta.Pager.PageCurr.Next}}
-        <li class="page-item">
-            <a class="page-link" href="{{.Meta.Pager.PageCurr.Next.File.Path}}" tabindex="-1">Next</a>
-        </li>
-        {{else}}
-        <li class="page-item disabled">
-            <a class="page-link" href="#" tabindex="-1">Next</a>
-        </li>
-        {{end}}
-    </ul>
-    {{end}}
-</div>
-{{template "footer" .}}
-{{end}}
diff --git a/bootstrap/main.go b/bootstrap/main.go
index 75f258a..34d1a29 100644
--- a/bootstrap/main.go
+++ b/bootstrap/main.go
@@ -1,25 +1,3 @@
-/*
- * Copyright (c) 2015 Alex Yatskov <alex@foosoft.net>
- * Author: Alex Yatskov <alex@foosoft.net>
- *
- * 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.
- */
-
 package main
 
 import (
@@ -29,15 +7,14 @@ import (
 	"github.com/FooSoft/goldsmith"
 	"github.com/FooSoft/goldsmith-components/devserver"
 	"github.com/FooSoft/goldsmith-components/filters/condition"
-	"github.com/FooSoft/goldsmith-components/plugins/abs"
+	"github.com/FooSoft/goldsmith-components/plugins/absolute"
 	"github.com/FooSoft/goldsmith-components/plugins/breadcrumbs"
 	"github.com/FooSoft/goldsmith-components/plugins/collection"
-	"github.com/FooSoft/goldsmith-components/plugins/dom"
+	"github.com/FooSoft/goldsmith-components/plugins/document"
 	"github.com/FooSoft/goldsmith-components/plugins/frontmatter"
 	"github.com/FooSoft/goldsmith-components/plugins/index"
 	"github.com/FooSoft/goldsmith-components/plugins/layout"
 	"github.com/FooSoft/goldsmith-components/plugins/markdown"
-	"github.com/FooSoft/goldsmith-components/plugins/paginate"
 	"github.com/FooSoft/goldsmith-components/plugins/summary"
 	"github.com/FooSoft/goldsmith-components/plugins/syntax"
 	"github.com/FooSoft/goldsmith-components/plugins/tags"
@@ -63,7 +40,7 @@ type builder struct {
 	root string
 }
 
-func (b *builder) Build(srcDir, dstDir string) {
+func (b *builder) Build(contentDir, buildDir, cacheDir string) {
 	tagMeta := map[string]interface{}{
 		"Area":        "tags",
 		"CrumbParent": "tags",
@@ -74,23 +51,23 @@ func (b *builder) Build(srcDir, dstDir string) {
 		"Layout": "index",
 	}
 
-	errs := goldsmith.Begin(srcDir).
+	errs := goldsmith.Begin(contentDir).
+		Cache(cacheDir).
 		Chain(frontmatter.New()).
 		Chain(markdown.New()).
 		Chain(summary.New()).
 		Chain(collection.New()).
-		Chain(paginate.New("Groups.Blog").InheritKeys("Layout").ItemsPerPage(4)).
 		Chain(index.New(indexMeta)).
 		Chain(tags.New().IndexMeta(tagMeta)).
 		Chain(breadcrumbs.New()).
-		Chain(layout.New("layouts/*.html")).
+		Chain(layout.New()).
 		Chain(syntax.New().Placement(syntax.PlaceInline)).
-		Chain(dom.New(fixup)).
+		Chain(document.New(fixup)).
 		Chain(thumbnail.New()).
 		FilterPush(condition.New(len(b.root) > 0)).
-		Chain(abs.New().BaseURL(b.root)).
+		Chain(absolute.New().BaseUrl(b.root)).
 		FilterPop().
-		End(dstDir)
+		End(buildDir)
 
 	for _, err := range errs {
 		log.Print(err)
@@ -98,11 +75,9 @@ func (b *builder) Build(srcDir, dstDir string) {
 }
 
 func main() {
-	var (
-		dst  = flag.String("dst", "dst", "destination directory")
-		root = flag.String("root", "", "root directory")
-		port = flag.Int("port", 8080, "server port")
-	)
+	root := flag.String("root", "", "server root")
+	port := flag.Int("port", 8080, "server port")
 	flag.Parse()
-	devserver.DevServe(&builder{*root}, *port, "src", *dst, "layouts")
+
+	devserver.DevServe(&builder{*root}, *port, "content", "build", "cache")
 }