talks: update repo to be deployable on App Engine again
This change moves the talk content in the content/ subdirectory
now that the default for App Engine is to use that directory per
golang.org/cl/140841.
Also update the README, app.yaml, and add a .gcloudignore since
running gcloud app deploy will add it to the file tree if it
doesn't exist.
Fixes golang/go#28080
Change-Id: Ie5dff7844d272d21ccb6db28aa1ca231f703787a
Reviewed-on: https://go-review.googlesource.com/c/141317
Reviewed-by: Andrew Gerrand <adg@golang.org>
diff --git a/.gcloudignore b/.gcloudignore
new file mode 100644
index 0000000..199e6d9
--- /dev/null
+++ b/.gcloudignore
@@ -0,0 +1,25 @@
+# This file specifies files that are *not* uploaded to Google Cloud Platform
+# using gcloud. It follows the same syntax as .gitignore, with the addition of
+# "#!include" directives (which insert the entries of the given .gitignore-style
+# file at that point).
+#
+# For more information, run:
+# $ gcloud topic gcloudignore
+#
+.gcloudignore
+# If you would like to upload your .git directory, .gitignore file or files
+# from your .gitignore file, remove the corresponding line
+# below:
+.git
+.gitignore
+
+# Binaries for programs and plugins
+*.exe
+*.exe~
+*.dll
+*.so
+*.dylib
+# Test binary, build with `go test -c`
+*.test
+# Output of the go coverage tool, specifically when used with LiteIDE
+*.out
\ No newline at end of file
diff --git a/README b/README
index 757846e..597ee4c 100644
--- a/README
+++ b/README
@@ -4,9 +4,9 @@
go get golang.org/x/tools/cmd/present
-To deploy these talks to App Engine, copy the tools/cmd/present directory to
+To deploy these talks to App Engine, copy the contents of tools/cmd/present to
the root of this repository and run:
- appcfg.py update -A your-app-id -V your-app-version /path/to/talks
+ gcloud app deploy
To submit changes to this repository, see http://golang.org/doc/contribute.html.
diff --git a/app.yaml b/app.yaml
index 9c98af8..c835cbf 100644
--- a/app.yaml
+++ b/app.yaml
@@ -1,16 +1,13 @@
-application: golang-org
-version: talks-test
-runtime: go
-api_version: go1
+service: talks
+runtime: go111
handlers:
- url: /favicon.ico
- static_files: present/static/favicon.ico
- upload: present/static/favicon.ico
+ static_files: static/favicon.ico
+ upload: static/favicon.ico
- url: /static
- static_dir: present/static
- application_readable: true
+ static_dir: static
- url: /.*
- script: _go_app
+ script: auto
-nobuild_files: ^201[0-9]/
+nobuild_files: content/
diff --git a/2009/go_talk-20091030.pdf b/content/2009/go_talk-20091030.pdf
similarity index 100%
rename from 2009/go_talk-20091030.pdf
rename to content/2009/go_talk-20091030.pdf
Binary files differ
diff --git a/2010/ExpressivenessOfGo-2010.pdf b/content/2010/ExpressivenessOfGo-2010.pdf
similarity index 100%
rename from 2010/ExpressivenessOfGo-2010.pdf
rename to content/2010/ExpressivenessOfGo-2010.pdf
Binary files differ
diff --git a/2010/go_talk-20100112.html b/content/2010/go_talk-20100112.html
similarity index 100%
rename from 2010/go_talk-20100112.html
rename to content/2010/go_talk-20100112.html
diff --git a/2010/go_talk-20100121.html b/content/2010/go_talk-20100121.html
similarity index 100%
rename from 2010/go_talk-20100121.html
rename to content/2010/go_talk-20100121.html
diff --git a/2010/go_talk-20100323.html b/content/2010/go_talk-20100323.html
similarity index 100%
rename from 2010/go_talk-20100323.html
rename to content/2010/go_talk-20100323.html
diff --git a/2010/gofrontend-gcc-summit-2010.pdf b/content/2010/gofrontend-gcc-summit-2010.pdf
similarity index 100%
rename from 2010/gofrontend-gcc-summit-2010.pdf
rename to content/2010/gofrontend-gcc-summit-2010.pdf
Binary files differ
diff --git a/2010/io/balance.go b/content/2010/io/balance.go
similarity index 100%
rename from 2010/io/balance.go
rename to content/2010/io/balance.go
diff --git a/2010/io/decrypt.go b/content/2010/io/decrypt.go
similarity index 100%
rename from 2010/io/decrypt.go
rename to content/2010/io/decrypt.go
diff --git a/2010/io/encrypt.go b/content/2010/io/encrypt.go
similarity index 100%
rename from 2010/io/encrypt.go
rename to content/2010/io/encrypt.go
diff --git a/2010/io/eval1.go b/content/2010/io/eval1.go
similarity index 100%
rename from 2010/io/eval1.go
rename to content/2010/io/eval1.go
diff --git a/2010/io/eval2.go b/content/2010/io/eval2.go
similarity index 100%
rename from 2010/io/eval2.go
rename to content/2010/io/eval2.go
diff --git a/2010/io/talk.pdf b/content/2010/io/talk.pdf
similarity index 100%
rename from 2010/io/talk.pdf
rename to content/2010/io/talk.pdf
Binary files differ
diff --git a/2010/support/bumper480x270.png b/content/2010/support/bumper480x270.png
similarity index 100%
rename from 2010/support/bumper480x270.png
rename to content/2010/support/bumper480x270.png
Binary files differ
diff --git a/2010/support/bumper640x360.png b/content/2010/support/bumper640x360.png
similarity index 100%
rename from 2010/support/bumper640x360.png
rename to content/2010/support/bumper640x360.png
Binary files differ
diff --git a/2010/support/go-logo-white.png b/content/2010/support/go-logo-white.png
similarity index 100%
rename from 2010/support/go-logo-white.png
rename to content/2010/support/go-logo-white.png
Binary files differ
diff --git a/2010/support/java-typing.png b/content/2010/support/java-typing.png
similarity index 100%
rename from 2010/support/java-typing.png
rename to content/2010/support/java-typing.png
Binary files differ
diff --git a/2010/support/slidy.css b/content/2010/support/slidy.css
similarity index 100%
rename from 2010/support/slidy.css
rename to content/2010/support/slidy.css
diff --git a/2010/support/slidy.js b/content/2010/support/slidy.js
similarity index 100%
rename from 2010/support/slidy.js
rename to content/2010/support/slidy.js
diff --git a/2011/Real_World_Go.pdf b/content/2011/Real_World_Go.pdf
similarity index 100%
rename from 2011/Real_World_Go.pdf
rename to content/2011/Real_World_Go.pdf
Binary files differ
diff --git a/2011/Writing_Web_Apps_in_Go.pdf b/content/2011/Writing_Web_Apps_in_Go.pdf
similarity index 100%
rename from 2011/Writing_Web_Apps_in_Go.pdf
rename to content/2011/Writing_Web_Apps_in_Go.pdf
Binary files differ
diff --git a/2011/lex.slide b/content/2011/lex.slide
similarity index 100%
rename from 2011/lex.slide
rename to content/2011/lex.slide
diff --git a/2011/lex/lex1.oldgo b/content/2011/lex/lex1.oldgo
similarity index 100%
rename from 2011/lex/lex1.oldgo
rename to content/2011/lex/lex1.oldgo
diff --git a/2011/lex/r59-lex.go b/content/2011/lex/r59-lex.go
similarity index 100%
rename from 2011/lex/r59-lex.go
rename to content/2011/lex/r59-lex.go
diff --git a/2011/lex/snippets b/content/2011/lex/snippets
similarity index 100%
rename from 2011/lex/snippets
rename to content/2011/lex/snippets
diff --git a/2012/10things.slide b/content/2012/10things.slide
similarity index 100%
rename from 2012/10things.slide
rename to content/2012/10things.slide
diff --git a/2012/10things/10.go b/content/2012/10things/10.go
similarity index 100%
rename from 2012/10things/10.go
rename to content/2012/10things/10.go
diff --git a/2012/10things/8.go b/content/2012/10things/8.go
similarity index 100%
rename from 2012/10things/8.go
rename to content/2012/10things/8.go
diff --git a/2012/10things/9.go b/content/2012/10things/9.go
similarity index 100%
rename from 2012/10things/9.go
rename to content/2012/10things/9.go
diff --git a/2012/10things/9b.go b/content/2012/10things/9b.go
similarity index 100%
rename from 2012/10things/9b.go
rename to content/2012/10things/9b.go
diff --git a/2012/10things/gopher.jpg b/content/2012/10things/gopher.jpg
similarity index 100%
rename from 2012/10things/gopher.jpg
rename to content/2012/10things/gopher.jpg
Binary files differ
diff --git a/2012/README b/content/2012/README
similarity index 100%
rename from 2012/README
rename to content/2012/README
diff --git a/2012/chat.slide b/content/2012/chat.slide
similarity index 100%
rename from 2012/chat.slide
rename to content/2012/chat.slide
diff --git a/2012/chat/both/chat.go b/content/2012/chat/both/chat.go
similarity index 100%
rename from 2012/chat/both/chat.go
rename to content/2012/chat/both/chat.go
diff --git a/2012/chat/both/html.go b/content/2012/chat/both/html.go
similarity index 100%
rename from 2012/chat/both/html.go
rename to content/2012/chat/both/html.go
diff --git a/2012/chat/both/markov.go b/content/2012/chat/both/markov.go
similarity index 100%
rename from 2012/chat/both/markov.go
rename to content/2012/chat/both/markov.go
diff --git a/2012/chat/diagrams.png b/content/2012/chat/diagrams.png
similarity index 100%
rename from 2012/chat/diagrams.png
rename to content/2012/chat/diagrams.png
Binary files differ
diff --git a/2012/chat/gophers.jpg b/content/2012/chat/gophers.jpg
similarity index 100%
rename from 2012/chat/gophers.jpg
rename to content/2012/chat/gophers.jpg
Binary files differ
diff --git a/2012/chat/http-noembed/chat.go b/content/2012/chat/http-noembed/chat.go
similarity index 100%
rename from 2012/chat/http-noembed/chat.go
rename to content/2012/chat/http-noembed/chat.go
diff --git a/2012/chat/http-noembed/html.go b/content/2012/chat/http-noembed/html.go
similarity index 100%
rename from 2012/chat/http-noembed/html.go
rename to content/2012/chat/http-noembed/html.go
diff --git a/2012/chat/http/chat.go b/content/2012/chat/http/chat.go
similarity index 100%
rename from 2012/chat/http/chat.go
rename to content/2012/chat/http/chat.go
diff --git a/2012/chat/http/html.go b/content/2012/chat/http/html.go
similarity index 100%
rename from 2012/chat/http/html.go
rename to content/2012/chat/http/html.go
diff --git a/2012/chat/markov/chat.go b/content/2012/chat/markov/chat.go
similarity index 100%
rename from 2012/chat/markov/chat.go
rename to content/2012/chat/markov/chat.go
diff --git a/2012/chat/markov/html.go b/content/2012/chat/markov/html.go
similarity index 100%
rename from 2012/chat/markov/html.go
rename to content/2012/chat/markov/html.go
diff --git a/2012/chat/markov/markov.go b/content/2012/chat/markov/markov.go
similarity index 100%
rename from 2012/chat/markov/markov.go
rename to content/2012/chat/markov/markov.go
diff --git a/2012/chat/support/chan.go b/content/2012/chat/support/chan.go
similarity index 100%
rename from 2012/chat/support/chan.go
rename to content/2012/chat/support/chan.go
diff --git a/2012/chat/support/defs.go b/content/2012/chat/support/defs.go
similarity index 100%
rename from 2012/chat/support/defs.go
rename to content/2012/chat/support/defs.go
diff --git a/2012/chat/support/echo-no-concurrency.go b/content/2012/chat/support/echo-no-concurrency.go
similarity index 100%
rename from 2012/chat/support/echo-no-concurrency.go
rename to content/2012/chat/support/echo-no-concurrency.go
diff --git a/2012/chat/support/echo.go b/content/2012/chat/support/echo.go
similarity index 100%
rename from 2012/chat/support/echo.go
rename to content/2012/chat/support/echo.go
diff --git a/2012/chat/support/embed.go b/content/2012/chat/support/embed.go
similarity index 100%
rename from 2012/chat/support/embed.go
rename to content/2012/chat/support/embed.go
diff --git a/2012/chat/support/goroutines.go b/content/2012/chat/support/goroutines.go
similarity index 100%
rename from 2012/chat/support/goroutines.go
rename to content/2012/chat/support/goroutines.go
diff --git a/2012/chat/support/hello-net.go b/content/2012/chat/support/hello-net.go
similarity index 100%
rename from 2012/chat/support/hello-net.go
rename to content/2012/chat/support/hello-net.go
diff --git a/2012/chat/support/hello-web.go b/content/2012/chat/support/hello-web.go
similarity index 100%
rename from 2012/chat/support/hello-web.go
rename to content/2012/chat/support/hello-web.go
diff --git a/2012/chat/support/hello.go b/content/2012/chat/support/hello.go
similarity index 100%
rename from 2012/chat/support/hello.go
rename to content/2012/chat/support/hello.go
diff --git a/2012/chat/support/markov.txt b/content/2012/chat/support/markov.txt
similarity index 100%
rename from 2012/chat/support/markov.txt
rename to content/2012/chat/support/markov.txt
diff --git a/2012/chat/support/select.go b/content/2012/chat/support/select.go
similarity index 100%
rename from 2012/chat/support/select.go
rename to content/2012/chat/support/select.go
diff --git a/2012/chat/support/websocket.go b/content/2012/chat/support/websocket.go
similarity index 100%
rename from 2012/chat/support/websocket.go
rename to content/2012/chat/support/websocket.go
diff --git a/2012/chat/support/websocket.js b/content/2012/chat/support/websocket.js
similarity index 100%
rename from 2012/chat/support/websocket.js
rename to content/2012/chat/support/websocket.js
diff --git a/2012/chat/tcp-simple/chat.go b/content/2012/chat/tcp-simple/chat.go
similarity index 100%
rename from 2012/chat/tcp-simple/chat.go
rename to content/2012/chat/tcp-simple/chat.go
diff --git a/2012/chat/tcp/chat.go b/content/2012/chat/tcp/chat.go
similarity index 100%
rename from 2012/chat/tcp/chat.go
rename to content/2012/chat/tcp/chat.go
diff --git a/2012/concurrency.slide b/content/2012/concurrency.slide
similarity index 100%
rename from 2012/concurrency.slide
rename to content/2012/concurrency.slide
diff --git a/2012/concurrency/images/gophereartrumpet.jpg b/content/2012/concurrency/images/gophereartrumpet.jpg
similarity index 100%
rename from 2012/concurrency/images/gophereartrumpet.jpg
rename to content/2012/concurrency/images/gophereartrumpet.jpg
Binary files differ
diff --git a/2012/concurrency/images/gophermegaphones.jpg b/content/2012/concurrency/images/gophermegaphones.jpg
similarity index 100%
rename from 2012/concurrency/images/gophermegaphones.jpg
rename to content/2012/concurrency/images/gophermegaphones.jpg
Binary files differ
diff --git a/2012/concurrency/support/boring.go b/content/2012/concurrency/support/boring.go
similarity index 100%
rename from 2012/concurrency/support/boring.go
rename to content/2012/concurrency/support/boring.go
diff --git a/2012/concurrency/support/changoboring.go b/content/2012/concurrency/support/changoboring.go
similarity index 100%
rename from 2012/concurrency/support/changoboring.go
rename to content/2012/concurrency/support/changoboring.go
diff --git a/2012/concurrency/support/chat.go b/content/2012/concurrency/support/chat.go
similarity index 100%
rename from 2012/concurrency/support/chat.go
rename to content/2012/concurrency/support/chat.go
diff --git a/2012/concurrency/support/daisy.go b/content/2012/concurrency/support/daisy.go
similarity index 100%
rename from 2012/concurrency/support/daisy.go
rename to content/2012/concurrency/support/daisy.go
diff --git a/2012/concurrency/support/faninboring.go b/content/2012/concurrency/support/faninboring.go
similarity index 100%
rename from 2012/concurrency/support/faninboring.go
rename to content/2012/concurrency/support/faninboring.go
diff --git a/2012/concurrency/support/generator2boring.go b/content/2012/concurrency/support/generator2boring.go
similarity index 100%
rename from 2012/concurrency/support/generator2boring.go
rename to content/2012/concurrency/support/generator2boring.go
diff --git a/2012/concurrency/support/generatorboring.go b/content/2012/concurrency/support/generatorboring.go
similarity index 100%
rename from 2012/concurrency/support/generatorboring.go
rename to content/2012/concurrency/support/generatorboring.go
diff --git a/2012/concurrency/support/goboring.go b/content/2012/concurrency/support/goboring.go
similarity index 100%
rename from 2012/concurrency/support/goboring.go
rename to content/2012/concurrency/support/goboring.go
diff --git a/2012/concurrency/support/google.go b/content/2012/concurrency/support/google.go
similarity index 100%
rename from 2012/concurrency/support/google.go
rename to content/2012/concurrency/support/google.go
diff --git a/2012/concurrency/support/google2.1.go b/content/2012/concurrency/support/google2.1.go
similarity index 100%
rename from 2012/concurrency/support/google2.1.go
rename to content/2012/concurrency/support/google2.1.go
diff --git a/2012/concurrency/support/google2.2.go b/content/2012/concurrency/support/google2.2.go
similarity index 100%
rename from 2012/concurrency/support/google2.2.go
rename to content/2012/concurrency/support/google2.2.go
diff --git a/2012/concurrency/support/google2.3.go b/content/2012/concurrency/support/google2.3.go
similarity index 100%
rename from 2012/concurrency/support/google2.3.go
rename to content/2012/concurrency/support/google2.3.go
diff --git a/2012/concurrency/support/google3.0.go b/content/2012/concurrency/support/google3.0.go
similarity index 100%
rename from 2012/concurrency/support/google3.0.go
rename to content/2012/concurrency/support/google3.0.go
diff --git a/2012/concurrency/support/helpers.go b/content/2012/concurrency/support/helpers.go
similarity index 100%
rename from 2012/concurrency/support/helpers.go
rename to content/2012/concurrency/support/helpers.go
diff --git a/2012/concurrency/support/lessboring.go b/content/2012/concurrency/support/lessboring.go
similarity index 100%
rename from 2012/concurrency/support/lessboring.go
rename to content/2012/concurrency/support/lessboring.go
diff --git a/2012/concurrency/support/mainboring.go b/content/2012/concurrency/support/mainboring.go
similarity index 100%
rename from 2012/concurrency/support/mainboring.go
rename to content/2012/concurrency/support/mainboring.go
diff --git a/2012/concurrency/support/quit.go b/content/2012/concurrency/support/quit.go
similarity index 100%
rename from 2012/concurrency/support/quit.go
rename to content/2012/concurrency/support/quit.go
diff --git a/2012/concurrency/support/rcvquit.go b/content/2012/concurrency/support/rcvquit.go
similarity index 100%
rename from 2012/concurrency/support/rcvquit.go
rename to content/2012/concurrency/support/rcvquit.go
diff --git a/2012/concurrency/support/select.go b/content/2012/concurrency/support/select.go
similarity index 100%
rename from 2012/concurrency/support/select.go
rename to content/2012/concurrency/support/select.go
diff --git a/2012/concurrency/support/selectboring.go b/content/2012/concurrency/support/selectboring.go
similarity index 100%
rename from 2012/concurrency/support/selectboring.go
rename to content/2012/concurrency/support/selectboring.go
diff --git a/2012/concurrency/support/sequenceboring.go b/content/2012/concurrency/support/sequenceboring.go
similarity index 100%
rename from 2012/concurrency/support/sequenceboring.go
rename to content/2012/concurrency/support/sequenceboring.go
diff --git a/2012/concurrency/support/timeout.go b/content/2012/concurrency/support/timeout.go
similarity index 100%
rename from 2012/concurrency/support/timeout.go
rename to content/2012/concurrency/support/timeout.go
diff --git a/2012/concurrency/support/timeoutall.go b/content/2012/concurrency/support/timeoutall.go
similarity index 100%
rename from 2012/concurrency/support/timeoutall.go
rename to content/2012/concurrency/support/timeoutall.go
diff --git a/2012/concurrency/support/waitgoboring.go b/content/2012/concurrency/support/waitgoboring.go
similarity index 100%
rename from 2012/concurrency/support/waitgoboring.go
rename to content/2012/concurrency/support/waitgoboring.go
diff --git a/2012/go-docs.slide b/content/2012/go-docs.slide
similarity index 100%
rename from 2012/go-docs.slide
rename to content/2012/go-docs.slide
diff --git a/2012/go-docs/blog.png b/content/2012/go-docs/blog.png
similarity index 100%
rename from 2012/go-docs/blog.png
rename to content/2012/go-docs/blog.png
Binary files differ
diff --git a/2012/go-docs/codewalk.png b/content/2012/go-docs/codewalk.png
similarity index 100%
rename from 2012/go-docs/codewalk.png
rename to content/2012/go-docs/codewalk.png
Binary files differ
diff --git a/2012/go-docs/faninboring.go b/content/2012/go-docs/faninboring.go
similarity index 100%
rename from 2012/go-docs/faninboring.go
rename to content/2012/go-docs/faninboring.go
diff --git a/2012/go-docs/gobyexample.png b/content/2012/go-docs/gobyexample.png
similarity index 100%
rename from 2012/go-docs/gobyexample.png
rename to content/2012/go-docs/gobyexample.png
Binary files differ
diff --git a/2012/go-docs/godoc.png b/content/2012/go-docs/godoc.png
similarity index 100%
rename from 2012/go-docs/godoc.png
rename to content/2012/go-docs/godoc.png
Binary files differ
diff --git a/2012/go-docs/godoc1.png b/content/2012/go-docs/godoc1.png
similarity index 100%
rename from 2012/go-docs/godoc1.png
rename to content/2012/go-docs/godoc1.png
Binary files differ
diff --git a/2012/go-docs/gopkgdoc.png b/content/2012/go-docs/gopkgdoc.png
similarity index 100%
rename from 2012/go-docs/gopkgdoc.png
rename to content/2012/go-docs/gopkgdoc.png
Binary files differ
diff --git a/2012/go-docs/gowiki.png b/content/2012/go-docs/gowiki.png
similarity index 100%
rename from 2012/go-docs/gowiki.png
rename to content/2012/go-docs/gowiki.png
Binary files differ
diff --git a/2012/go-docs/javadoc.png b/content/2012/go-docs/javadoc.png
similarity index 100%
rename from 2012/go-docs/javadoc.png
rename to content/2012/go-docs/javadoc.png
Binary files differ
diff --git a/2012/go-docs/javadoc1.png b/content/2012/go-docs/javadoc1.png
similarity index 100%
rename from 2012/go-docs/javadoc1.png
rename to content/2012/go-docs/javadoc1.png
Binary files differ
diff --git a/2012/go-docs/lseek.png b/content/2012/go-docs/lseek.png
similarity index 100%
rename from 2012/go-docs/lseek.png
rename to content/2012/go-docs/lseek.png
Binary files differ
diff --git a/2012/go-docs/play.png b/content/2012/go-docs/play.png
similarity index 100%
rename from 2012/go-docs/play.png
rename to content/2012/go-docs/play.png
Binary files differ
diff --git a/2012/go-docs/seek.png b/content/2012/go-docs/seek.png
similarity index 100%
rename from 2012/go-docs/seek.png
rename to content/2012/go-docs/seek.png
Binary files differ
diff --git a/2012/go-docs/tour.png b/content/2012/go-docs/tour.png
similarity index 100%
rename from 2012/go-docs/tour.png
rename to content/2012/go-docs/tour.png
Binary files differ
diff --git a/2012/go1.slide b/content/2012/go1.slide
similarity index 100%
rename from 2012/go1.slide
rename to content/2012/go1.slide
diff --git a/2012/go1/changes.png b/content/2012/go1/changes.png
similarity index 100%
rename from 2012/go1/changes.png
rename to content/2012/go1/changes.png
Binary files differ
diff --git a/2012/go1/errordiff1.png b/content/2012/go1/errordiff1.png
similarity index 100%
rename from 2012/go1/errordiff1.png
rename to content/2012/go1/errordiff1.png
Binary files differ
diff --git a/2012/go1/errordiff2.png b/content/2012/go1/errordiff2.png
similarity index 100%
rename from 2012/go1/errordiff2.png
rename to content/2012/go1/errordiff2.png
Binary files differ
diff --git a/2012/go1/go1lines.png b/content/2012/go1/go1lines.png
similarity index 100%
rename from 2012/go1/go1lines.png
rename to content/2012/go1/go1lines.png
Binary files differ
diff --git a/2012/goforc.slide b/content/2012/goforc.slide
similarity index 100%
rename from 2012/goforc.slide
rename to content/2012/goforc.slide
diff --git a/2012/goforc/adder.go b/content/2012/goforc/adder.go
similarity index 100%
rename from 2012/goforc/adder.go
rename to content/2012/goforc/adder.go
diff --git a/2012/goforc/cat.go b/content/2012/goforc/cat.go
similarity index 100%
rename from 2012/goforc/cat.go
rename to content/2012/goforc/cat.go
diff --git a/2012/goforc/celsius.go b/content/2012/goforc/celsius.go
similarity index 100%
rename from 2012/goforc/celsius.go
rename to content/2012/goforc/celsius.go
diff --git a/2012/goforc/channels.go b/content/2012/goforc/channels.go
similarity index 100%
rename from 2012/goforc/channels.go
rename to content/2012/goforc/channels.go
diff --git a/2012/goforc/communication1.go b/content/2012/goforc/communication1.go
similarity index 100%
rename from 2012/goforc/communication1.go
rename to content/2012/goforc/communication1.go
diff --git a/2012/goforc/communication2.go b/content/2012/goforc/communication2.go
similarity index 100%
rename from 2012/goforc/communication2.go
rename to content/2012/goforc/communication2.go
diff --git a/2012/goforc/consts.go b/content/2012/goforc/consts.go
similarity index 100%
rename from 2012/goforc/consts.go
rename to content/2012/goforc/consts.go
diff --git a/2012/goforc/decls.go b/content/2012/goforc/decls.go
similarity index 100%
rename from 2012/goforc/decls.go
rename to content/2012/goforc/decls.go
diff --git a/2012/goforc/example0.go b/content/2012/goforc/example0.go
similarity index 100%
rename from 2012/goforc/example0.go
rename to content/2012/goforc/example0.go
diff --git a/2012/goforc/example1.go b/content/2012/goforc/example1.go
similarity index 100%
rename from 2012/goforc/example1.go
rename to content/2012/goforc/example1.go
diff --git a/2012/goforc/example2.go b/content/2012/goforc/example2.go
similarity index 100%
rename from 2012/goforc/example2.go
rename to content/2012/goforc/example2.go
diff --git a/2012/goforc/forloop.go b/content/2012/goforc/forloop.go
similarity index 100%
rename from 2012/goforc/forloop.go
rename to content/2012/goforc/forloop.go
diff --git a/2012/goforc/hello.go b/content/2012/goforc/hello.go
similarity index 100%
rename from 2012/goforc/hello.go
rename to content/2012/goforc/hello.go
diff --git a/2012/goforc/interface.go b/content/2012/goforc/interface.go
similarity index 100%
rename from 2012/goforc/interface.go
rename to content/2012/goforc/interface.go
diff --git a/2012/goforc/point.go b/content/2012/goforc/point.go
similarity index 100%
rename from 2012/goforc/point.go
rename to content/2012/goforc/point.go
diff --git a/2012/goforc/stmts.go b/content/2012/goforc/stmts.go
similarity index 100%
rename from 2012/goforc/stmts.go
rename to content/2012/goforc/stmts.go
diff --git a/2012/goforc/vars.go b/content/2012/goforc/vars.go
similarity index 100%
rename from 2012/goforc/vars.go
rename to content/2012/goforc/vars.go
diff --git a/2012/goforc/worker1.go b/content/2012/goforc/worker1.go
similarity index 100%
rename from 2012/goforc/worker1.go
rename to content/2012/goforc/worker1.go
diff --git a/2012/goforc/worker2.go b/content/2012/goforc/worker2.go
similarity index 100%
rename from 2012/goforc/worker2.go
rename to content/2012/goforc/worker2.go
diff --git a/2012/insidepresent.slide b/content/2012/insidepresent.slide
similarity index 100%
rename from 2012/insidepresent.slide
rename to content/2012/insidepresent.slide
diff --git a/2012/insidepresent/hello.go b/content/2012/insidepresent/hello.go
similarity index 100%
rename from 2012/insidepresent/hello.go
rename to content/2012/insidepresent/hello.go
diff --git a/2012/insidepresent/socket-simple.go b/content/2012/insidepresent/socket-simple.go
similarity index 100%
rename from 2012/insidepresent/socket-simple.go
rename to content/2012/insidepresent/socket-simple.go
diff --git a/2012/insidepresent/socket.go b/content/2012/insidepresent/socket.go
similarity index 100%
rename from 2012/insidepresent/socket.go
rename to content/2012/insidepresent/socket.go
diff --git a/2012/insidepresent/websocket.go b/content/2012/insidepresent/websocket.go
similarity index 100%
rename from 2012/insidepresent/websocket.go
rename to content/2012/insidepresent/websocket.go
diff --git a/2012/insidepresent/websocket.js b/content/2012/insidepresent/websocket.js
similarity index 100%
rename from 2012/insidepresent/websocket.js
rename to content/2012/insidepresent/websocket.js
diff --git a/2012/insidepresent/wire.html b/content/2012/insidepresent/wire.html
similarity index 100%
rename from 2012/insidepresent/wire.html
rename to content/2012/insidepresent/wire.html
diff --git a/2012/simple.slide b/content/2012/simple.slide
similarity index 100%
rename from 2012/simple.slide
rename to content/2012/simple.slide
diff --git a/2012/simple/flag.go b/content/2012/simple/flag.go
similarity index 100%
rename from 2012/simple/flag.go
rename to content/2012/simple/flag.go
diff --git a/2012/simple/gopher.jpg b/content/2012/simple/gopher.jpg
similarity index 100%
rename from 2012/simple/gopher.jpg
rename to content/2012/simple/gopher.jpg
Binary files differ
diff --git a/2012/simple/hello-web.go b/content/2012/simple/hello-web.go
similarity index 100%
rename from 2012/simple/hello-web.go
rename to content/2012/simple/hello-web.go
diff --git a/2012/simple/hello.go b/content/2012/simple/hello.go
similarity index 100%
rename from 2012/simple/hello.go
rename to content/2012/simple/hello.go
diff --git a/2012/simple/io/io.go b/content/2012/simple/io/io.go
similarity index 100%
rename from 2012/simple/io/io.go
rename to content/2012/simple/io/io.go
diff --git a/2012/simple/json.go b/content/2012/simple/json.go
similarity index 100%
rename from 2012/simple/json.go
rename to content/2012/simple/json.go
diff --git a/2012/simple/reader.go b/content/2012/simple/reader.go
similarity index 100%
rename from 2012/simple/reader.go
rename to content/2012/simple/reader.go
diff --git a/2012/simple/split.png b/content/2012/simple/split.png
similarity index 100%
rename from 2012/simple/split.png
rename to content/2012/simple/split.png
Binary files differ
diff --git a/2012/simple/test.go b/content/2012/simple/test.go
similarity index 100%
rename from 2012/simple/test.go
rename to content/2012/simple/test.go
diff --git a/2012/simple/test/string_test.go b/content/2012/simple/test/string_test.go
similarity index 100%
rename from 2012/simple/test/string_test.go
rename to content/2012/simple/test/string_test.go
diff --git a/2012/simple/time.go b/content/2012/simple/time.go
similarity index 100%
rename from 2012/simple/time.go
rename to content/2012/simple/time.go
diff --git a/2012/simple/time2.go b/content/2012/simple/time2.go
similarity index 100%
rename from 2012/simple/time2.go
rename to content/2012/simple/time2.go
diff --git a/2012/simple/time3.go b/content/2012/simple/time3.go
similarity index 100%
rename from 2012/simple/time3.go
rename to content/2012/simple/time3.go
diff --git a/2012/simple/webfront/main.go b/content/2012/simple/webfront/main.go
similarity index 100%
rename from 2012/simple/webfront/main.go
rename to content/2012/simple/webfront/main.go
diff --git a/2012/simple/webfront/server_test.go b/content/2012/simple/webfront/server_test.go
similarity index 100%
rename from 2012/simple/webfront/server_test.go
rename to content/2012/simple/webfront/server_test.go
diff --git a/2012/simple/webfront/testdata/index.html b/content/2012/simple/webfront/testdata/index.html
similarity index 100%
rename from 2012/simple/webfront/testdata/index.html
rename to content/2012/simple/webfront/testdata/index.html
diff --git a/2012/splash.article b/content/2012/splash.article
similarity index 100%
rename from 2012/splash.article
rename to content/2012/splash.article
diff --git a/2012/splash.slide b/content/2012/splash.slide
similarity index 100%
rename from 2012/splash.slide
rename to content/2012/splash.slide
diff --git a/2012/splash/appenginegophercolor.jpg b/content/2012/splash/appenginegophercolor.jpg
similarity index 100%
rename from 2012/splash/appenginegophercolor.jpg
rename to content/2012/splash/appenginegophercolor.jpg
Binary files differ
diff --git a/2012/splash/datacenter.jpg b/content/2012/splash/datacenter.jpg
similarity index 100%
rename from 2012/splash/datacenter.jpg
rename to content/2012/splash/datacenter.jpg
Binary files differ
diff --git a/2012/splash/fire.jpg b/content/2012/splash/fire.jpg
similarity index 100%
rename from 2012/splash/fire.jpg
rename to content/2012/splash/fire.jpg
Binary files differ
diff --git a/2012/tutorial.slide b/content/2012/tutorial.slide
similarity index 100%
rename from 2012/tutorial.slide
rename to content/2012/tutorial.slide
diff --git a/2012/tutorial/1get.go b/content/2012/tutorial/1get.go
similarity index 100%
rename from 2012/tutorial/1get.go
rename to content/2012/tutorial/1get.go
diff --git a/2012/tutorial/2json.go b/content/2012/tutorial/2json.go
similarity index 100%
rename from 2012/tutorial/2json.go
rename to content/2012/tutorial/2json.go
diff --git a/2012/tutorial/3func.go b/content/2012/tutorial/3func.go
similarity index 100%
rename from 2012/tutorial/3func.go
rename to content/2012/tutorial/3func.go
diff --git a/2012/tutorial/4method.go b/content/2012/tutorial/4method.go
similarity index 100%
rename from 2012/tutorial/4method.go
rename to content/2012/tutorial/4method.go
diff --git a/2012/tutorial/golang.json b/content/2012/tutorial/golang.json
similarity index 100%
rename from 2012/tutorial/golang.json
rename to content/2012/tutorial/golang.json
diff --git a/2012/tutorial/hello.go b/content/2012/tutorial/hello.go
similarity index 100%
rename from 2012/tutorial/hello.go
rename to content/2012/tutorial/hello.go
diff --git a/2012/tutorial/jsonserve.go b/content/2012/tutorial/jsonserve.go
similarity index 100%
rename from 2012/tutorial/jsonserve.go
rename to content/2012/tutorial/jsonserve.go
diff --git a/2012/tutorial/main.go b/content/2012/tutorial/main.go
similarity index 100%
rename from 2012/tutorial/main.go
rename to content/2012/tutorial/main.go
diff --git a/2012/tutorial/reddit/reddit.go b/content/2012/tutorial/reddit/reddit.go
similarity index 100%
rename from 2012/tutorial/reddit/reddit.go
rename to content/2012/tutorial/reddit/reddit.go
diff --git a/2012/waza.slide b/content/2012/waza.slide
similarity index 100%
rename from 2012/waza.slide
rename to content/2012/waza.slide
diff --git a/2012/waza/balance.go b/content/2012/waza/balance.go
similarity index 100%
rename from 2012/waza/balance.go
rename to content/2012/waza/balance.go
diff --git a/2012/waza/gopherchart.jpg b/content/2012/waza/gopherchart.jpg
similarity index 100%
rename from 2012/waza/gopherchart.jpg
rename to content/2012/waza/gopherchart.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex0.jpg b/content/2012/waza/gophercomplex0.jpg
similarity index 100%
rename from 2012/waza/gophercomplex0.jpg
rename to content/2012/waza/gophercomplex0.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex1.jpg b/content/2012/waza/gophercomplex1.jpg
similarity index 100%
rename from 2012/waza/gophercomplex1.jpg
rename to content/2012/waza/gophercomplex1.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex2.jpg b/content/2012/waza/gophercomplex2.jpg
similarity index 100%
rename from 2012/waza/gophercomplex2.jpg
rename to content/2012/waza/gophercomplex2.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex3.jpg b/content/2012/waza/gophercomplex3.jpg
similarity index 100%
rename from 2012/waza/gophercomplex3.jpg
rename to content/2012/waza/gophercomplex3.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex4.jpg b/content/2012/waza/gophercomplex4.jpg
similarity index 100%
rename from 2012/waza/gophercomplex4.jpg
rename to content/2012/waza/gophercomplex4.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex5.jpg b/content/2012/waza/gophercomplex5.jpg
similarity index 100%
rename from 2012/waza/gophercomplex5.jpg
rename to content/2012/waza/gophercomplex5.jpg
Binary files differ
diff --git a/2012/waza/gophercomplex6.jpg b/content/2012/waza/gophercomplex6.jpg
similarity index 100%
rename from 2012/waza/gophercomplex6.jpg
rename to content/2012/waza/gophercomplex6.jpg
Binary files differ
diff --git a/2012/waza/gophersimple1.jpg b/content/2012/waza/gophersimple1.jpg
similarity index 100%
rename from 2012/waza/gophersimple1.jpg
rename to content/2012/waza/gophersimple1.jpg
Binary files differ
diff --git a/2012/waza/gophersimple2.jpg b/content/2012/waza/gophersimple2.jpg
similarity index 100%
rename from 2012/waza/gophersimple2.jpg
rename to content/2012/waza/gophersimple2.jpg
Binary files differ
diff --git a/2012/waza/gophersimple3.jpg b/content/2012/waza/gophersimple3.jpg
similarity index 100%
rename from 2012/waza/gophersimple3.jpg
rename to content/2012/waza/gophersimple3.jpg
Binary files differ
diff --git a/2012/waza/gophersimple4.jpg b/content/2012/waza/gophersimple4.jpg
similarity index 100%
rename from 2012/waza/gophersimple4.jpg
rename to content/2012/waza/gophersimple4.jpg
Binary files differ
diff --git a/2012/waza/load1 b/content/2012/waza/load1
similarity index 100%
rename from 2012/waza/load1
rename to content/2012/waza/load1
diff --git a/2012/waza/load2 b/content/2012/waza/load2
similarity index 100%
rename from 2012/waza/load2
rename to content/2012/waza/load2
diff --git a/2012/waza/snippets b/content/2012/waza/snippets
similarity index 100%
rename from 2012/waza/snippets
rename to content/2012/waza/snippets
diff --git a/2012/zen.slide b/content/2012/zen.slide
similarity index 100%
rename from 2012/zen.slide
rename to content/2012/zen.slide
diff --git a/2012/zen/hello.go b/content/2012/zen/hello.go
similarity index 100%
rename from 2012/zen/hello.go
rename to content/2012/zen/hello.go
diff --git a/2012/zen/http.go b/content/2012/zen/http.go
similarity index 100%
rename from 2012/zen/http.go
rename to content/2012/zen/http.go
diff --git a/2012/zen/jsonformat.go b/content/2012/zen/jsonformat.go
similarity index 100%
rename from 2012/zen/jsonformat.go
rename to content/2012/zen/jsonformat.go
diff --git a/2012/zen/race.go b/content/2012/zen/race.go
similarity index 100%
rename from 2012/zen/race.go
rename to content/2012/zen/race.go
diff --git a/2013/advconc.slide b/content/2013/advconc.slide
similarity index 100%
rename from 2013/advconc.slide
rename to content/2013/advconc.slide
diff --git a/2013/advconc/buffer/buffer.go b/content/2013/advconc/buffer/buffer.go
similarity index 100%
rename from 2013/advconc/buffer/buffer.go
rename to content/2013/advconc/buffer/buffer.go
diff --git a/2013/advconc/dedupermain/dedupermain.go b/content/2013/advconc/dedupermain/dedupermain.go
similarity index 100%
rename from 2013/advconc/dedupermain/dedupermain.go
rename to content/2013/advconc/dedupermain/dedupermain.go
diff --git a/2013/advconc/fakemain/fakemain.go b/content/2013/advconc/fakemain/fakemain.go
similarity index 100%
rename from 2013/advconc/fakemain/fakemain.go
rename to content/2013/advconc/fakemain/fakemain.go
diff --git a/2013/advconc/gopherhat.jpg b/content/2013/advconc/gopherhat.jpg
similarity index 100%
rename from 2013/advconc/gopherhat.jpg
rename to content/2013/advconc/gopherhat.jpg
Binary files differ
diff --git a/2013/advconc/gopherrunning.jpg b/content/2013/advconc/gopherrunning.jpg
similarity index 100%
rename from 2013/advconc/gopherrunning.jpg
rename to content/2013/advconc/gopherrunning.jpg
Binary files differ
diff --git a/2013/advconc/gopherswim.jpg b/content/2013/advconc/gopherswim.jpg
similarity index 100%
rename from 2013/advconc/gopherswim.jpg
rename to content/2013/advconc/gopherswim.jpg
Binary files differ
diff --git a/2013/advconc/gopherswrench.jpg b/content/2013/advconc/gopherswrench.jpg
similarity index 100%
rename from 2013/advconc/gopherswrench.jpg
rename to content/2013/advconc/gopherswrench.jpg
Binary files differ
diff --git a/2013/advconc/naivemain/naivemain.go b/content/2013/advconc/naivemain/naivemain.go
similarity index 100%
rename from 2013/advconc/naivemain/naivemain.go
rename to content/2013/advconc/naivemain/naivemain.go
diff --git a/2013/advconc/nilselect/nilselect.go b/content/2013/advconc/nilselect/nilselect.go
similarity index 100%
rename from 2013/advconc/nilselect/nilselect.go
rename to content/2013/advconc/nilselect/nilselect.go
diff --git a/2013/advconc/pingpong/pingpong.go b/content/2013/advconc/pingpong/pingpong.go
similarity index 100%
rename from 2013/advconc/pingpong/pingpong.go
rename to content/2013/advconc/pingpong/pingpong.go
diff --git a/2013/advconc/pingpong1.go b/content/2013/advconc/pingpong1.go
similarity index 100%
rename from 2013/advconc/pingpong1.go
rename to content/2013/advconc/pingpong1.go
diff --git a/2013/advconc/pingpongdeadlock/pingpongdeadlock.go b/content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go
similarity index 100%
rename from 2013/advconc/pingpongdeadlock/pingpongdeadlock.go
rename to content/2013/advconc/pingpongdeadlock/pingpongdeadlock.go
diff --git a/2013/advconc/pingpongpanic/pingpongpanic.go b/content/2013/advconc/pingpongpanic/pingpongpanic.go
similarity index 100%
rename from 2013/advconc/pingpongpanic/pingpongpanic.go
rename to content/2013/advconc/pingpongpanic/pingpongpanic.go
diff --git a/2013/advconc/race.out b/content/2013/advconc/race.out
similarity index 100%
rename from 2013/advconc/race.out
rename to content/2013/advconc/race.out
diff --git a/2013/advconc/race.png b/content/2013/advconc/race.png
similarity index 100%
rename from 2013/advconc/race.png
rename to content/2013/advconc/race.png
Binary files differ
diff --git a/2013/advconc/realmain/realmain.go b/content/2013/advconc/realmain/realmain.go
similarity index 100%
rename from 2013/advconc/realmain/realmain.go
rename to content/2013/advconc/realmain/realmain.go
diff --git a/2013/bestpractices.slide b/content/2013/bestpractices.slide
similarity index 100%
rename from 2013/bestpractices.slide
rename to content/2013/bestpractices.slide
diff --git a/2013/bestpractices/bufchan.go b/content/2013/bestpractices/bufchan.go
similarity index 100%
rename from 2013/bestpractices/bufchan.go
rename to content/2013/bestpractices/bufchan.go
diff --git a/2013/bestpractices/bufchanfix.go b/content/2013/bestpractices/bufchanfix.go
similarity index 100%
rename from 2013/bestpractices/bufchanfix.go
rename to content/2013/bestpractices/bufchanfix.go
diff --git a/2013/bestpractices/cmd.png b/content/2013/bestpractices/cmd.png
similarity index 100%
rename from 2013/bestpractices/cmd.png
rename to content/2013/bestpractices/cmd.png
Binary files differ
diff --git a/2013/bestpractices/concurrency1.go b/content/2013/bestpractices/concurrency1.go
similarity index 100%
rename from 2013/bestpractices/concurrency1.go
rename to content/2013/bestpractices/concurrency1.go
diff --git a/2013/bestpractices/concurrency2.go b/content/2013/bestpractices/concurrency2.go
similarity index 100%
rename from 2013/bestpractices/concurrency2.go
rename to content/2013/bestpractices/concurrency2.go
diff --git a/2013/bestpractices/funcdraw/cmd/funcdraw.go b/content/2013/bestpractices/funcdraw/cmd/funcdraw.go
similarity index 100%
rename from 2013/bestpractices/funcdraw/cmd/funcdraw.go
rename to content/2013/bestpractices/funcdraw/cmd/funcdraw.go
diff --git a/2013/bestpractices/funcdraw/drawer/dependent.go b/content/2013/bestpractices/funcdraw/drawer/dependent.go
similarity index 100%
rename from 2013/bestpractices/funcdraw/drawer/dependent.go
rename to content/2013/bestpractices/funcdraw/drawer/dependent.go
diff --git a/2013/bestpractices/funcdraw/drawer/drawer.go b/content/2013/bestpractices/funcdraw/drawer/drawer.go
similarity index 100%
rename from 2013/bestpractices/funcdraw/drawer/drawer.go
rename to content/2013/bestpractices/funcdraw/drawer/drawer.go
diff --git a/2013/bestpractices/funcdraw/drawer/drawer_test.go b/content/2013/bestpractices/funcdraw/drawer/drawer_test.go
similarity index 100%
rename from 2013/bestpractices/funcdraw/drawer/drawer_test.go
rename to content/2013/bestpractices/funcdraw/drawer/drawer_test.go
diff --git a/2013/bestpractices/funcdraw/parser/parser.go b/content/2013/bestpractices/funcdraw/parser/parser.go
similarity index 100%
rename from 2013/bestpractices/funcdraw/parser/parser.go
rename to content/2013/bestpractices/funcdraw/parser/parser.go
diff --git a/2013/bestpractices/httphandler.go b/content/2013/bestpractices/httphandler.go
similarity index 100%
rename from 2013/bestpractices/httphandler.go
rename to content/2013/bestpractices/httphandler.go
diff --git a/2013/bestpractices/quitchan.go b/content/2013/bestpractices/quitchan.go
similarity index 100%
rename from 2013/bestpractices/quitchan.go
rename to content/2013/bestpractices/quitchan.go
diff --git a/2013/bestpractices/server.go b/content/2013/bestpractices/server.go
similarity index 100%
rename from 2013/bestpractices/server.go
rename to content/2013/bestpractices/server.go
diff --git a/2013/bestpractices/shortercode1.go b/content/2013/bestpractices/shortercode1.go
similarity index 100%
rename from 2013/bestpractices/shortercode1.go
rename to content/2013/bestpractices/shortercode1.go
diff --git a/2013/bestpractices/shortercode2.go b/content/2013/bestpractices/shortercode2.go
similarity index 100%
rename from 2013/bestpractices/shortercode2.go
rename to content/2013/bestpractices/shortercode2.go
diff --git a/2013/bestpractices/shortercode3.go b/content/2013/bestpractices/shortercode3.go
similarity index 100%
rename from 2013/bestpractices/shortercode3.go
rename to content/2013/bestpractices/shortercode3.go
diff --git a/2013/bestpractices/shortercode4.go b/content/2013/bestpractices/shortercode4.go
similarity index 100%
rename from 2013/bestpractices/shortercode4.go
rename to content/2013/bestpractices/shortercode4.go
diff --git a/2013/bestpractices/shortercode5.go b/content/2013/bestpractices/shortercode5.go
similarity index 100%
rename from 2013/bestpractices/shortercode5.go
rename to content/2013/bestpractices/shortercode5.go
diff --git a/2013/bestpractices/shortercode6.go b/content/2013/bestpractices/shortercode6.go
similarity index 100%
rename from 2013/bestpractices/shortercode6.go
rename to content/2013/bestpractices/shortercode6.go
diff --git a/2013/distsys.slide b/content/2013/distsys.slide
similarity index 100%
rename from 2013/distsys.slide
rename to content/2013/distsys.slide
diff --git a/2013/distsys/addr1.go b/content/2013/distsys/addr1.go
similarity index 100%
rename from 2013/distsys/addr1.go
rename to content/2013/distsys/addr1.go
diff --git a/2013/distsys/addr2.go b/content/2013/distsys/addr2.go
similarity index 100%
rename from 2013/distsys/addr2.go
rename to content/2013/distsys/addr2.go
diff --git a/2013/distsys/addr3.go b/content/2013/distsys/addr3.go
similarity index 100%
rename from 2013/distsys/addr3.go
rename to content/2013/distsys/addr3.go
diff --git a/2013/distsys/addr4.go b/content/2013/distsys/addr4.go
similarity index 100%
rename from 2013/distsys/addr4.go
rename to content/2013/distsys/addr4.go
diff --git a/2013/distsys/addr5.go b/content/2013/distsys/addr5.go
similarity index 100%
rename from 2013/distsys/addr5.go
rename to content/2013/distsys/addr5.go
diff --git a/2013/distsys/finger.go b/content/2013/distsys/finger.go
similarity index 100%
rename from 2013/distsys/finger.go
rename to content/2013/distsys/finger.go
diff --git a/2013/distsys/hello.go b/content/2013/distsys/hello.go
similarity index 100%
rename from 2013/distsys/hello.go
rename to content/2013/distsys/hello.go
diff --git a/2013/distsys/hello0.go b/content/2013/distsys/hello0.go
similarity index 100%
rename from 2013/distsys/hello0.go
rename to content/2013/distsys/hello0.go
diff --git a/2013/distsys/hello1.go b/content/2013/distsys/hello1.go
similarity index 100%
rename from 2013/distsys/hello1.go
rename to content/2013/distsys/hello1.go
diff --git a/2013/distsys/replread.go b/content/2013/distsys/replread.go
similarity index 100%
rename from 2013/distsys/replread.go
rename to content/2013/distsys/replread.go
diff --git a/2013/distsys/replwrite.go b/content/2013/distsys/replwrite.go
similarity index 100%
rename from 2013/distsys/replwrite.go
rename to content/2013/distsys/replwrite.go
diff --git a/2013/distsys/writebuffer.go b/content/2013/distsys/writebuffer.go
similarity index 100%
rename from 2013/distsys/writebuffer.go
rename to content/2013/distsys/writebuffer.go
diff --git a/2013/distsys/writebuffer2.go b/content/2013/distsys/writebuffer2.go
similarity index 100%
rename from 2013/distsys/writebuffer2.go
rename to content/2013/distsys/writebuffer2.go
diff --git a/2013/go-sreops.slide b/content/2013/go-sreops.slide
similarity index 100%
rename from 2013/go-sreops.slide
rename to content/2013/go-sreops.slide
diff --git a/2013/go-sreops/goroutines-channels.go b/content/2013/go-sreops/goroutines-channels.go
similarity index 100%
rename from 2013/go-sreops/goroutines-channels.go
rename to content/2013/go-sreops/goroutines-channels.go
diff --git a/2013/go-sreops/goroutines.go b/content/2013/go-sreops/goroutines.go
similarity index 100%
rename from 2013/go-sreops/goroutines.go
rename to content/2013/go-sreops/goroutines.go
diff --git a/2013/go-sreops/hello.go b/content/2013/go-sreops/hello.go
similarity index 100%
rename from 2013/go-sreops/hello.go
rename to content/2013/go-sreops/hello.go
diff --git a/2013/go1.1.slide b/content/2013/go1.1.slide
similarity index 100%
rename from 2013/go1.1.slide
rename to content/2013/go1.1.slide
diff --git a/2013/go1.1/blockprofile.png b/content/2013/go1.1/blockprofile.png
similarity index 100%
rename from 2013/go1.1/blockprofile.png
rename to content/2013/go1.1/blockprofile.png
Binary files differ
diff --git a/2013/go1.1/blockprofile.svg b/content/2013/go1.1/blockprofile.svg
similarity index 100%
rename from 2013/go1.1/blockprofile.svg
rename to content/2013/go1.1/blockprofile.svg
diff --git a/2013/go1.1/chanof.go b/content/2013/go1.1/chanof.go
similarity index 100%
rename from 2013/go1.1/chanof.go
rename to content/2013/go1.1/chanof.go
diff --git a/2013/go1.1/intdiv.go b/content/2013/go1.1/intdiv.go
similarity index 100%
rename from 2013/go1.1/intdiv.go
rename to content/2013/go1.1/intdiv.go
diff --git a/2013/go1.1/makefunc.go b/content/2013/go1.1/makefunc.go
similarity index 100%
rename from 2013/go1.1/makefunc.go
rename to content/2013/go1.1/makefunc.go
diff --git a/2013/go1.1/methodvals-old.go b/content/2013/go1.1/methodvals-old.go
similarity index 100%
rename from 2013/go1.1/methodvals-old.go
rename to content/2013/go1.1/methodvals-old.go
diff --git a/2013/go1.1/methodvals.go b/content/2013/go1.1/methodvals.go
similarity index 100%
rename from 2013/go1.1/methodvals.go
rename to content/2013/go1.1/methodvals.go
diff --git a/2013/go1.1/race.go b/content/2013/go1.1/race.go
similarity index 100%
rename from 2013/go1.1/race.go
rename to content/2013/go1.1/race.go
diff --git a/2013/go1.1/return-old.go b/content/2013/go1.1/return-old.go
similarity index 100%
rename from 2013/go1.1/return-old.go
rename to content/2013/go1.1/return-old.go
diff --git a/2013/go1.1/return.go b/content/2013/go1.1/return.go
similarity index 100%
rename from 2013/go1.1/return.go
rename to content/2013/go1.1/return.go
diff --git a/2013/go1.1/scanner.go b/content/2013/go1.1/scanner.go
similarity index 100%
rename from 2013/go1.1/scanner.go
rename to content/2013/go1.1/scanner.go
diff --git a/2013/go1.1/scanner2.go b/content/2013/go1.1/scanner2.go
similarity index 100%
rename from 2013/go1.1/scanner2.go
rename to content/2013/go1.1/scanner2.go
diff --git a/2013/go1.1/timer.go b/content/2013/go1.1/timer.go
similarity index 100%
rename from 2013/go1.1/timer.go
rename to content/2013/go1.1/timer.go
diff --git a/2013/go1.1/yearday.go b/content/2013/go1.1/yearday.go
similarity index 100%
rename from 2013/go1.1/yearday.go
rename to content/2013/go1.1/yearday.go
diff --git a/2013/go4python.slide b/content/2013/go4python.slide
similarity index 100%
rename from 2013/go4python.slide
rename to content/2013/go4python.slide
diff --git a/2013/go4python/deco.go b/content/2013/go4python/deco.go
similarity index 100%
rename from 2013/go4python/deco.go
rename to content/2013/go4python/deco.go
diff --git a/2013/go4python/deco.py b/content/2013/go4python/deco.py
similarity index 100%
rename from 2013/go4python/deco.py
rename to content/2013/go4python/deco.py
diff --git a/2013/go4python/decoex.go b/content/2013/go4python/decoex.go
similarity index 100%
rename from 2013/go4python/decoex.go
rename to content/2013/go4python/decoex.go
diff --git a/2013/go4python/dyntyp.py b/content/2013/go4python/dyntyp.py
similarity index 100%
rename from 2013/go4python/dyntyp.py
rename to content/2013/go4python/dyntyp.py
diff --git a/2013/go4python/fib-gen.go b/content/2013/go4python/fib-gen.go
similarity index 100%
rename from 2013/go4python/fib-gen.go
rename to content/2013/go4python/fib-gen.go
diff --git a/2013/go4python/fib-gen.py b/content/2013/go4python/fib-gen.py
similarity index 100%
rename from 2013/go4python/fib-gen.py
rename to content/2013/go4python/fib-gen.py
diff --git a/2013/go4python/fib-gen2.go b/content/2013/go4python/fib-gen2.go
similarity index 100%
rename from 2013/go4python/fib-gen2.go
rename to content/2013/go4python/fib-gen2.go
diff --git a/2013/go4python/fib.go b/content/2013/go4python/fib.go
similarity index 100%
rename from 2013/go4python/fib.go
rename to content/2013/go4python/fib.go
diff --git a/2013/go4python/fib.py b/content/2013/go4python/fib.py
similarity index 100%
rename from 2013/go4python/fib.py
rename to content/2013/go4python/fib.py
diff --git a/2013/go4python/genex.go b/content/2013/go4python/genex.go
similarity index 100%
rename from 2013/go4python/genex.go
rename to content/2013/go4python/genex.go
diff --git a/2013/go4python/genex2.go b/content/2013/go4python/genex2.go
similarity index 100%
rename from 2013/go4python/genex2.go
rename to content/2013/go4python/genex2.go
diff --git a/2013/go4python/img/duck.jpg b/content/2013/go4python/img/duck.jpg
similarity index 100%
rename from 2013/go4python/img/duck.jpg
rename to content/2013/go4python/img/duck.jpg
Binary files differ
diff --git a/2013/go4python/img/fib-go.png b/content/2013/go4python/img/fib-go.png
similarity index 100%
rename from 2013/go4python/img/fib-go.png
rename to content/2013/go4python/img/fib-go.png
Binary files differ
diff --git a/2013/go4python/img/fib-py.png b/content/2013/go4python/img/fib-py.png
similarity index 100%
rename from 2013/go4python/img/fib-py.png
rename to content/2013/go4python/img/fib-py.png
Binary files differ
diff --git a/2013/go4python/img/funnelin.jpg b/content/2013/go4python/img/funnelin.jpg
similarity index 100%
rename from 2013/go4python/img/funnelin.jpg
rename to content/2013/go4python/img/funnelin.jpg
Binary files differ
diff --git a/2013/go4python/img/gopher.jpg b/content/2013/go4python/img/gopher.jpg
similarity index 100%
rename from 2013/go4python/img/gopher.jpg
rename to content/2013/go4python/img/gopher.jpg
Binary files differ
diff --git a/2013/go4python/img/monkey.jpg b/content/2013/go4python/img/monkey.jpg
similarity index 100%
rename from 2013/go4python/img/monkey.jpg
rename to content/2013/go4python/img/monkey.jpg
Binary files differ
diff --git a/2013/go4python/monkey.go b/content/2013/go4python/monkey.go
similarity index 100%
rename from 2013/go4python/monkey.go
rename to content/2013/go4python/monkey.go
diff --git a/2013/go4python/monkey.py b/content/2013/go4python/monkey.py
similarity index 100%
rename from 2013/go4python/monkey.py
rename to content/2013/go4python/monkey.py
diff --git a/2013/go4python/typesandmethods.go b/content/2013/go4python/typesandmethods.go
similarity index 100%
rename from 2013/go4python/typesandmethods.go
rename to content/2013/go4python/typesandmethods.go
diff --git a/2013/highperf.slide b/content/2013/highperf.slide
similarity index 100%
rename from 2013/highperf.slide
rename to content/2013/highperf.slide
diff --git a/2013/highperf/aegopher.jpg b/content/2013/highperf/aegopher.jpg
similarity index 100%
rename from 2013/highperf/aegopher.jpg
rename to content/2013/highperf/aegopher.jpg
Binary files differ
diff --git a/2013/highperf/appenginegophercolor.jpg b/content/2013/highperf/appenginegophercolor.jpg
similarity index 100%
rename from 2013/highperf/appenginegophercolor.jpg
rename to content/2013/highperf/appenginegophercolor.jpg
Binary files differ
diff --git a/2013/highperf/appstats1.png b/content/2013/highperf/appstats1.png
similarity index 100%
rename from 2013/highperf/appstats1.png
rename to content/2013/highperf/appstats1.png
Binary files differ
diff --git a/2013/highperf/appstats2.png b/content/2013/highperf/appstats2.png
similarity index 100%
rename from 2013/highperf/appstats2.png
rename to content/2013/highperf/appstats2.png
Binary files differ
diff --git a/2013/highperf/appstats3.png b/content/2013/highperf/appstats3.png
similarity index 100%
rename from 2013/highperf/appstats3.png
rename to content/2013/highperf/appstats3.png
Binary files differ
diff --git a/2013/highperf/art/gophercart.png b/content/2013/highperf/art/gophercart.png
similarity index 100%
rename from 2013/highperf/art/gophercart.png
rename to content/2013/highperf/art/gophercart.png
Binary files differ
diff --git a/2013/highperf/art/gophercheckout.png b/content/2013/highperf/art/gophercheckout.png
similarity index 100%
rename from 2013/highperf/art/gophercheckout.png
rename to content/2013/highperf/art/gophercheckout.png
Binary files differ
diff --git a/2013/highperf/art/gophermegaphone.png b/content/2013/highperf/art/gophermegaphone.png
similarity index 100%
rename from 2013/highperf/art/gophermegaphone.png
rename to content/2013/highperf/art/gophermegaphone.png
Binary files differ
diff --git a/2013/highperf/cachingembed.html b/content/2013/highperf/cachingembed.html
similarity index 100%
rename from 2013/highperf/cachingembed.html
rename to content/2013/highperf/cachingembed.html
diff --git a/2013/highperf/concurrency.go.notouch b/content/2013/highperf/concurrency.go.notouch
similarity index 100%
rename from 2013/highperf/concurrency.go.notouch
rename to content/2013/highperf/concurrency.go.notouch
diff --git a/2013/highperf/gophermart.png b/content/2013/highperf/gophermart.png
similarity index 100%
rename from 2013/highperf/gophermart.png
rename to content/2013/highperf/gophermart.png
Binary files differ
diff --git a/2013/highperf/gophermart2.png b/content/2013/highperf/gophermart2.png
similarity index 100%
rename from 2013/highperf/gophermart2.png
rename to content/2013/highperf/gophermart2.png
Binary files differ
diff --git a/2013/highperf/gopherrulespanner.png b/content/2013/highperf/gopherrulespanner.png
similarity index 100%
rename from 2013/highperf/gopherrulespanner.png
rename to content/2013/highperf/gopherrulespanner.png
Binary files differ
diff --git a/2013/highperf/longtail.go b/content/2013/highperf/longtail.go
similarity index 100%
rename from 2013/highperf/longtail.go
rename to content/2013/highperf/longtail.go
diff --git a/2013/highperf/mart/1/app.yaml b/content/2013/highperf/mart/1/app.yaml
similarity index 100%
rename from 2013/highperf/mart/1/app.yaml
rename to content/2013/highperf/mart/1/app.yaml
diff --git a/2013/highperf/mart/1/mart.go b/content/2013/highperf/mart/1/mart.go
similarity index 100%
rename from 2013/highperf/mart/1/mart.go
rename to content/2013/highperf/mart/1/mart.go
diff --git a/2013/highperf/mart/2/app.yaml b/content/2013/highperf/mart/2/app.yaml
similarity index 100%
rename from 2013/highperf/mart/2/app.yaml
rename to content/2013/highperf/mart/2/app.yaml
diff --git a/2013/highperf/mart/2/mart.go b/content/2013/highperf/mart/2/mart.go
similarity index 100%
rename from 2013/highperf/mart/2/mart.go
rename to content/2013/highperf/mart/2/mart.go
diff --git a/2013/highperf/mart/3/app.yaml b/content/2013/highperf/mart/3/app.yaml
similarity index 100%
rename from 2013/highperf/mart/3/app.yaml
rename to content/2013/highperf/mart/3/app.yaml
diff --git a/2013/highperf/mart/3/mart.go b/content/2013/highperf/mart/3/mart.go
similarity index 100%
rename from 2013/highperf/mart/3/mart.go
rename to content/2013/highperf/mart/3/mart.go
diff --git a/2013/highperf/mart/README b/content/2013/highperf/mart/README
similarity index 100%
rename from 2013/highperf/mart/README
rename to content/2013/highperf/mart/README
diff --git a/2013/highperf/santa.png b/content/2013/highperf/santa.png
similarity index 100%
rename from 2013/highperf/santa.png
rename to content/2013/highperf/santa.png
Binary files differ
diff --git a/2013/highperf/santaembed.html b/content/2013/highperf/santaembed.html
similarity index 100%
rename from 2013/highperf/santaembed.html
rename to content/2013/highperf/santaembed.html
diff --git a/2013/highperf/santagraph.png b/content/2013/highperf/santagraph.png
similarity index 100%
rename from 2013/highperf/santagraph.png
rename to content/2013/highperf/santagraph.png
Binary files differ
diff --git a/2013/highperf/turkey.png b/content/2013/highperf/turkey.png
similarity index 100%
rename from 2013/highperf/turkey.png
rename to content/2013/highperf/turkey.png
Binary files differ
diff --git a/2013/oscon-dl.slide b/content/2013/oscon-dl.slide
similarity index 100%
rename from 2013/oscon-dl.slide
rename to content/2013/oscon-dl.slide
diff --git a/2013/oscon-dl/after-code.png b/content/2013/oscon-dl/after-code.png
similarity index 100%
rename from 2013/oscon-dl/after-code.png
rename to content/2013/oscon-dl/after-code.png
Binary files differ
diff --git a/2013/oscon-dl/after.go b/content/2013/oscon-dl/after.go
similarity index 100%
rename from 2013/oscon-dl/after.go
rename to content/2013/oscon-dl/after.go
diff --git a/2013/oscon-dl/after.png b/content/2013/oscon-dl/after.png
similarity index 100%
rename from 2013/oscon-dl/after.png
rename to content/2013/oscon-dl/after.png
Binary files differ
diff --git a/2013/oscon-dl/before.png b/content/2013/oscon-dl/before.png
similarity index 100%
rename from 2013/oscon-dl/before.png
rename to content/2013/oscon-dl/before.png
Binary files differ
diff --git a/2013/oscon-dl/chunkaligned.go b/content/2013/oscon-dl/chunkaligned.go
similarity index 100%
rename from 2013/oscon-dl/chunkaligned.go
rename to content/2013/oscon-dl/chunkaligned.go
diff --git a/2013/oscon-dl/copy.go b/content/2013/oscon-dl/copy.go
similarity index 100%
rename from 2013/oscon-dl/copy.go
rename to content/2013/oscon-dl/copy.go
diff --git a/2013/oscon-dl/cpp-toggle.png b/content/2013/oscon-dl/cpp-toggle.png
similarity index 100%
rename from 2013/oscon-dl/cpp-toggle.png
rename to content/2013/oscon-dl/cpp-toggle.png
Binary files differ
diff --git a/2013/oscon-dl/cpp-write.png b/content/2013/oscon-dl/cpp-write.png
similarity index 100%
rename from 2013/oscon-dl/cpp-write.png
rename to content/2013/oscon-dl/cpp-write.png
Binary files differ
diff --git a/2013/oscon-dl/cpp-writeerr.png b/content/2013/oscon-dl/cpp-writeerr.png
similarity index 100%
rename from 2013/oscon-dl/cpp-writeerr.png
rename to content/2013/oscon-dl/cpp-writeerr.png
Binary files differ
diff --git a/2013/oscon-dl/crbug.png b/content/2013/oscon-dl/crbug.png
similarity index 100%
rename from 2013/oscon-dl/crbug.png
rename to content/2013/oscon-dl/crbug.png
Binary files differ
diff --git a/2013/oscon-dl/groupcache.go b/content/2013/oscon-dl/groupcache.go
similarity index 100%
rename from 2013/oscon-dl/groupcache.go
rename to content/2013/oscon-dl/groupcache.go
diff --git a/2013/oscon-dl/reader.png b/content/2013/oscon-dl/reader.png
similarity index 100%
rename from 2013/oscon-dl/reader.png
rename to content/2013/oscon-dl/reader.png
Binary files differ
diff --git a/2013/oscon-dl/readseeker.png b/content/2013/oscon-dl/readseeker.png
similarity index 100%
rename from 2013/oscon-dl/readseeker.png
rename to content/2013/oscon-dl/readseeker.png
Binary files differ
diff --git a/2013/oscon-dl/sectionreader.png b/content/2013/oscon-dl/sectionreader.png
similarity index 100%
rename from 2013/oscon-dl/sectionreader.png
rename to content/2013/oscon-dl/sectionreader.png
Binary files differ
diff --git a/2013/oscon-dl/seeker.png b/content/2013/oscon-dl/seeker.png
similarity index 100%
rename from 2013/oscon-dl/seeker.png
rename to content/2013/oscon-dl/seeker.png
Binary files differ
diff --git a/2013/oscon-dl/servecontent.png b/content/2013/oscon-dl/servecontent.png
similarity index 100%
rename from 2013/oscon-dl/servecontent.png
rename to content/2013/oscon-dl/servecontent.png
Binary files differ
diff --git a/2013/oscon-dl/server-compose.go b/content/2013/oscon-dl/server-compose.go
similarity index 100%
rename from 2013/oscon-dl/server-compose.go
rename to content/2013/oscon-dl/server-compose.go
diff --git a/2013/oscon-dl/server-content.go b/content/2013/oscon-dl/server-content.go
similarity index 100%
rename from 2013/oscon-dl/server-content.go
rename to content/2013/oscon-dl/server-content.go
diff --git a/2013/oscon-dl/server-fs.go b/content/2013/oscon-dl/server-fs.go
similarity index 100%
rename from 2013/oscon-dl/server-fs.go
rename to content/2013/oscon-dl/server-fs.go
diff --git a/2013/oscon-dl/server-hello.go b/content/2013/oscon-dl/server-hello.go
similarity index 100%
rename from 2013/oscon-dl/server-hello.go
rename to content/2013/oscon-dl/server-hello.go
diff --git a/2013/oscon-dl/server.go b/content/2013/oscon-dl/server.go
similarity index 100%
rename from 2013/oscon-dl/server.go
rename to content/2013/oscon-dl/server.go
diff --git a/2013/oscon-dl/sizereaderat.go b/content/2013/oscon-dl/sizereaderat.go
similarity index 100%
rename from 2013/oscon-dl/sizereaderat.go
rename to content/2013/oscon-dl/sizereaderat.go
diff --git a/2013/oscon-dl/slow.png b/content/2013/oscon-dl/slow.png
similarity index 100%
rename from 2013/oscon-dl/slow.png
rename to content/2013/oscon-dl/slow.png
Binary files differ
diff --git a/2014/c2go.slide b/content/2014/c2go.slide
similarity index 100%
rename from 2014/c2go.slide
rename to content/2014/c2go.slide
diff --git a/2014/camlistore.slide b/content/2014/camlistore.slide
similarity index 100%
rename from 2014/camlistore.slide
rename to content/2014/camlistore.slide
diff --git a/2014/camlistore/cam-android.png b/content/2014/camlistore/cam-android.png
similarity index 100%
rename from 2014/camlistore/cam-android.png
rename to content/2014/camlistore/cam-android.png
Binary files differ
diff --git a/2014/camlistore/cam-boot.png b/content/2014/camlistore/cam-boot.png
similarity index 100%
rename from 2014/camlistore/cam-boot.png
rename to content/2014/camlistore/cam-boot.png
Binary files differ
diff --git a/2014/camlistore/cam-checkins.png b/content/2014/camlistore/cam-checkins.png
similarity index 100%
rename from 2014/camlistore/cam-checkins.png
rename to content/2014/camlistore/cam-checkins.png
Binary files differ
diff --git a/2014/camlistore/cam-fuse.png b/content/2014/camlistore/cam-fuse.png
similarity index 100%
rename from 2014/camlistore/cam-fuse.png
rename to content/2014/camlistore/cam-fuse.png
Binary files differ
diff --git a/2014/camlistore/cam-mix-types.png b/content/2014/camlistore/cam-mix-types.png
similarity index 100%
rename from 2014/camlistore/cam-mix-types.png
rename to content/2014/camlistore/cam-mix-types.png
Binary files differ
diff --git a/2014/camlistore/cam-moscow.png b/content/2014/camlistore/cam-moscow.png
similarity index 100%
rename from 2014/camlistore/cam-moscow.png
rename to content/2014/camlistore/cam-moscow.png
Binary files differ
diff --git a/2014/camlistore/cam-other.png b/content/2014/camlistore/cam-other.png
similarity index 100%
rename from 2014/camlistore/cam-other.png
rename to content/2014/camlistore/cam-other.png
Binary files differ
diff --git a/2014/camlistore/cam-pano.png b/content/2014/camlistore/cam-pano.png
similarity index 100%
rename from 2014/camlistore/cam-pano.png
rename to content/2014/camlistore/cam-pano.png
Binary files differ
diff --git a/2014/camlistore/cam-paris-portrait.png b/content/2014/camlistore/cam-paris-portrait.png
similarity index 100%
rename from 2014/camlistore/cam-paris-portrait.png
rename to content/2014/camlistore/cam-paris-portrait.png
Binary files differ
diff --git a/2014/compiling.slide b/content/2014/compiling.slide
similarity index 100%
rename from 2014/compiling.slide
rename to content/2014/compiling.slide
diff --git a/2014/compiling/const1.go b/content/2014/compiling/const1.go
similarity index 100%
rename from 2014/compiling/const1.go
rename to content/2014/compiling/const1.go
diff --git a/2014/compiling/const2.go b/content/2014/compiling/const2.go
similarity index 100%
rename from 2014/compiling/const2.go
rename to content/2014/compiling/const2.go
diff --git a/2014/compiling/const3.go b/content/2014/compiling/const3.go
similarity index 100%
rename from 2014/compiling/const3.go
rename to content/2014/compiling/const3.go
diff --git a/2014/compiling/name1.go b/content/2014/compiling/name1.go
similarity index 100%
rename from 2014/compiling/name1.go
rename to content/2014/compiling/name1.go
diff --git a/2014/compiling/name2.go b/content/2014/compiling/name2.go
similarity index 100%
rename from 2014/compiling/name2.go
rename to content/2014/compiling/name2.go
diff --git a/2014/compiling/rtype1.go b/content/2014/compiling/rtype1.go
similarity index 100%
rename from 2014/compiling/rtype1.go
rename to content/2014/compiling/rtype1.go
diff --git a/2014/compiling/rtype2.go b/content/2014/compiling/rtype2.go
similarity index 100%
rename from 2014/compiling/rtype2.go
rename to content/2014/compiling/rtype2.go
diff --git a/2014/compiling/var1.go b/content/2014/compiling/var1.go
similarity index 100%
rename from 2014/compiling/var1.go
rename to content/2014/compiling/var1.go
diff --git a/2014/droidcon.slide b/content/2014/droidcon.slide
similarity index 100%
rename from 2014/droidcon.slide
rename to content/2014/droidcon.slide
diff --git a/2014/droidcon/gopherswim.jpg b/content/2014/droidcon/gopherswim.jpg
similarity index 100%
rename from 2014/droidcon/gopherswim.jpg
rename to content/2014/droidcon/gopherswim.jpg
Binary files differ
diff --git a/2014/droidcon/gopherswrench.jpg b/content/2014/droidcon/gopherswrench.jpg
similarity index 100%
rename from 2014/droidcon/gopherswrench.jpg
rename to content/2014/droidcon/gopherswrench.jpg
Binary files differ
diff --git a/2014/go1.3.slide b/content/2014/go1.3.slide
similarity index 100%
rename from 2014/go1.3.slide
rename to content/2014/go1.3.slide
diff --git a/2014/go1.3/json.png b/content/2014/go1.3/json.png
similarity index 100%
rename from 2014/go1.3/json.png
rename to content/2014/go1.3/json.png
Binary files differ
diff --git a/2014/go1.3/liblink.graffle b/content/2014/go1.3/liblink.graffle
similarity index 100%
rename from 2014/go1.3/liblink.graffle
rename to content/2014/go1.3/liblink.graffle
diff --git a/2014/go1.3/liblink1.png b/content/2014/go1.3/liblink1.png
similarity index 100%
rename from 2014/go1.3/liblink1.png
rename to content/2014/go1.3/liblink1.png
Binary files differ
diff --git a/2014/go1.3/liblink2.png b/content/2014/go1.3/liblink2.png
similarity index 100%
rename from 2014/go1.3/liblink2.png
rename to content/2014/go1.3/liblink2.png
Binary files differ
diff --git a/2014/go4gophers.slide b/content/2014/go4gophers.slide
similarity index 100%
rename from 2014/go4gophers.slide
rename to content/2014/go4gophers.slide
diff --git a/2014/go4gophers/chain.go b/content/2014/go4gophers/chain.go
similarity index 100%
rename from 2014/go4gophers/chain.go
rename to content/2014/go4gophers/chain.go
diff --git a/2014/go4gophers/godoc.png b/content/2014/go4gophers/godoc.png
similarity index 100%
rename from 2014/go4gophers/godoc.png
rename to content/2014/go4gophers/godoc.png
Binary files differ
diff --git a/2014/go4gophers/gopherflag.png b/content/2014/go4gophers/gopherflag.png
similarity index 100%
rename from 2014/go4gophers/gopherflag.png
rename to content/2014/go4gophers/gopherflag.png
Binary files differ
diff --git a/2014/go4gophers/gopherhat.jpg b/content/2014/go4gophers/gopherhat.jpg
similarity index 100%
rename from 2014/go4gophers/gopherhat.jpg
rename to content/2014/go4gophers/gopherhat.jpg
Binary files differ
diff --git a/2014/go4gophers/gopherswim.jpg b/content/2014/go4gophers/gopherswim.jpg
similarity index 100%
rename from 2014/go4gophers/gopherswim.jpg
rename to content/2014/go4gophers/gopherswim.jpg
Binary files differ
diff --git a/2014/go4gophers/gopherswrench.jpg b/content/2014/go4gophers/gopherswrench.jpg
similarity index 100%
rename from 2014/go4gophers/gopherswrench.jpg
rename to content/2014/go4gophers/gopherswrench.jpg
Binary files differ
diff --git a/2014/go4gophers/gophertraining.html b/content/2014/go4gophers/gophertraining.html
similarity index 100%
rename from 2014/go4gophers/gophertraining.html
rename to content/2014/go4gophers/gophertraining.html
diff --git a/2014/go4gophers/gophertraining.png b/content/2014/go4gophers/gophertraining.png
similarity index 100%
rename from 2014/go4gophers/gophertraining.png
rename to content/2014/go4gophers/gophertraining.png
Binary files differ
diff --git a/2014/go4gophers/organs.go b/content/2014/go4gophers/organs.go
similarity index 100%
rename from 2014/go4gophers/organs.go
rename to content/2014/go4gophers/organs.go
diff --git a/2014/go4gophers/organs2.go b/content/2014/go4gophers/organs2.go
similarity index 100%
rename from 2014/go4gophers/organs2.go
rename to content/2014/go4gophers/organs2.go
diff --git a/2014/go4gophers/organs3.go b/content/2014/go4gophers/organs3.go
similarity index 100%
rename from 2014/go4gophers/organs3.go
rename to content/2014/go4gophers/organs3.go
diff --git a/2014/go4gophers/reader.go b/content/2014/go4gophers/reader.go
similarity index 100%
rename from 2014/go4gophers/reader.go
rename to content/2014/go4gophers/reader.go
diff --git a/2014/go4gophers/roshi.png b/content/2014/go4gophers/roshi.png
similarity index 100%
rename from 2014/go4gophers/roshi.png
rename to content/2014/go4gophers/roshi.png
Binary files differ
diff --git a/2014/go4gophers/sigourney.png b/content/2014/go4gophers/sigourney.png
similarity index 100%
rename from 2014/go4gophers/sigourney.png
rename to content/2014/go4gophers/sigourney.png
Binary files differ
diff --git a/2014/go4gophers/sort.go b/content/2014/go4gophers/sort.go
similarity index 100%
rename from 2014/go4gophers/sort.go
rename to content/2014/go4gophers/sort.go
diff --git a/2014/go4gophers/tree-nothread.go b/content/2014/go4gophers/tree-nothread.go
similarity index 100%
rename from 2014/go4gophers/tree-nothread.go
rename to content/2014/go4gophers/tree-nothread.go
diff --git a/2014/go4gophers/tree-select.go b/content/2014/go4gophers/tree-select.go
similarity index 100%
rename from 2014/go4gophers/tree-select.go
rename to content/2014/go4gophers/tree-select.go
diff --git a/2014/go4gophers/tree-thread.go b/content/2014/go4gophers/tree-thread.go
similarity index 100%
rename from 2014/go4gophers/tree-thread.go
rename to content/2014/go4gophers/tree-thread.go
diff --git a/2014/go4gophers/tree-walk.go b/content/2014/go4gophers/tree-walk.go
similarity index 100%
rename from 2014/go4gophers/tree-walk.go
rename to content/2014/go4gophers/tree-walk.go
diff --git a/2014/go4gophers/tree.png b/content/2014/go4gophers/tree.png
similarity index 100%
rename from 2014/go4gophers/tree.png
rename to content/2014/go4gophers/tree.png
Binary files differ
diff --git a/2014/go4java.slide b/content/2014/go4java.slide
similarity index 100%
rename from 2014/go4java.slide
rename to content/2014/go4java.slide
diff --git a/2014/go4java/BadInheritance.java b/content/2014/go4java/BadInheritance.java
similarity index 100%
rename from 2014/go4java/BadInheritance.java
rename to content/2014/go4java/BadInheritance.java
diff --git a/2014/go4java/Composition.java b/content/2014/go4java/Composition.java
similarity index 100%
rename from 2014/go4java/Composition.java
rename to content/2014/go4java/Composition.java
diff --git a/2014/go4java/battle.go b/content/2014/go4java/battle.go
similarity index 100%
rename from 2014/go4java/battle.go
rename to content/2014/go4java/battle.go
diff --git a/2014/go4java/chan.go b/content/2014/go4java/chan.go
similarity index 100%
rename from 2014/go4java/chan.go
rename to content/2014/go4java/chan.go
diff --git a/2014/go4java/conc1.go b/content/2014/go4java/conc1.go
similarity index 100%
rename from 2014/go4java/conc1.go
rename to content/2014/go4java/conc1.go
diff --git a/2014/go4java/conc2.go b/content/2014/go4java/conc2.go
similarity index 100%
rename from 2014/go4java/conc2.go
rename to content/2014/go4java/conc2.go
diff --git a/2014/go4java/conc3.go b/content/2014/go4java/conc3.go
similarity index 100%
rename from 2014/go4java/conc3.go
rename to content/2014/go4java/conc3.go
diff --git a/2014/go4java/embedsample.go b/content/2014/go4java/embedsample.go
similarity index 100%
rename from 2014/go4java/embedsample.go
rename to content/2014/go4java/embedsample.go
diff --git a/2014/go4java/goodcounter.go b/content/2014/go4java/goodcounter.go
similarity index 100%
rename from 2014/go4java/goodcounter.go
rename to content/2014/go4java/goodcounter.go
diff --git a/2014/go4java/goroutines.go b/content/2014/go4java/goroutines.go
similarity index 100%
rename from 2014/go4java/goroutines.go
rename to content/2014/go4java/goroutines.go
diff --git a/2014/go4java/img/baby.jpg b/content/2014/go4java/img/baby.jpg
similarity index 100%
rename from 2014/go4java/img/baby.jpg
rename to content/2014/go4java/img/baby.jpg
Binary files differ
diff --git a/2014/go4java/img/badinheritance.png b/content/2014/go4java/img/badinheritance.png
similarity index 100%
rename from 2014/go4java/img/badinheritance.png
rename to content/2014/go4java/img/badinheritance.png
Binary files differ
diff --git a/2014/go4java/img/busy.jpg b/content/2014/go4java/img/busy.jpg
similarity index 100%
rename from 2014/go4java/img/busy.jpg
rename to content/2014/go4java/img/busy.jpg
Binary files differ
diff --git a/2014/go4java/img/chain.jpg b/content/2014/go4java/img/chain.jpg
similarity index 100%
rename from 2014/go4java/img/chain.jpg
rename to content/2014/go4java/img/chain.jpg
Binary files differ
diff --git a/2014/go4java/img/conc.jpg b/content/2014/go4java/img/conc.jpg
similarity index 100%
rename from 2014/go4java/img/conc.jpg
rename to content/2014/go4java/img/conc.jpg
Binary files differ
diff --git a/2014/go4java/img/duck.jpg b/content/2014/go4java/img/duck.jpg
similarity index 100%
rename from 2014/go4java/img/duck.jpg
rename to content/2014/go4java/img/duck.jpg
Binary files differ
diff --git a/2014/go4java/img/fast.jpg b/content/2014/go4java/img/fast.jpg
similarity index 100%
rename from 2014/go4java/img/fast.jpg
rename to content/2014/go4java/img/fast.jpg
Binary files differ
diff --git a/2014/go4java/img/funcdraw.png b/content/2014/go4java/img/funcdraw.png
similarity index 100%
rename from 2014/go4java/img/funcdraw.png
rename to content/2014/go4java/img/funcdraw.png
Binary files differ
diff --git a/2014/go4java/img/funnelin.jpg b/content/2014/go4java/img/funnelin.jpg
similarity index 100%
rename from 2014/go4java/img/funnelin.jpg
rename to content/2014/go4java/img/funnelin.jpg
Binary files differ
diff --git a/2014/go4java/img/gopher.jpg b/content/2014/go4java/img/gopher.jpg
similarity index 100%
rename from 2014/go4java/img/gopher.jpg
rename to content/2014/go4java/img/gopher.jpg
Binary files differ
diff --git a/2014/go4java/img/lego.jpg b/content/2014/go4java/img/lego.jpg
similarity index 100%
rename from 2014/go4java/img/lego.jpg
rename to content/2014/go4java/img/lego.jpg
Binary files differ
diff --git a/2014/go4java/img/perfection.jpg b/content/2014/go4java/img/perfection.jpg
similarity index 100%
rename from 2014/go4java/img/perfection.jpg
rename to content/2014/go4java/img/perfection.jpg
Binary files differ
diff --git a/2014/go4java/img/piet.png b/content/2014/go4java/img/piet.png
similarity index 100%
rename from 2014/go4java/img/piet.png
rename to content/2014/go4java/img/piet.png
Binary files differ
diff --git a/2014/go4java/img/trends.png b/content/2014/go4java/img/trends.png
similarity index 100%
rename from 2014/go4java/img/trends.png
rename to content/2014/go4java/img/trends.png
Binary files differ
diff --git a/2014/go4java/loopback.go b/content/2014/go4java/loopback.go
similarity index 100%
rename from 2014/go4java/loopback.go
rename to content/2014/go4java/loopback.go
diff --git a/2014/go4java/runner/embed.go b/content/2014/go4java/runner/embed.go
similarity index 100%
rename from 2014/go4java/runner/embed.go
rename to content/2014/go4java/runner/embed.go
diff --git a/2014/go4java/runner/runner.go b/content/2014/go4java/runner/runner.go
similarity index 100%
rename from 2014/go4java/runner/runner.go
rename to content/2014/go4java/runner/runner.go
diff --git a/2014/go4java/writecounter.go b/content/2014/go4java/writecounter.go
similarity index 100%
rename from 2014/go4java/writecounter.go
rename to content/2014/go4java/writecounter.go
diff --git a/2014/gocon-tokyo.slide b/content/2014/gocon-tokyo.slide
similarity index 100%
rename from 2014/gocon-tokyo.slide
rename to content/2014/gocon-tokyo.slide
diff --git a/2014/gocon-tokyo/60p.jpg b/content/2014/gocon-tokyo/60p.jpg
similarity index 100%
rename from 2014/gocon-tokyo/60p.jpg
rename to content/2014/gocon-tokyo/60p.jpg
Binary files differ
diff --git a/2014/gocon-tokyo/changestats.png b/content/2014/gocon-tokyo/changestats.png
similarity index 100%
rename from 2014/gocon-tokyo/changestats.png
rename to content/2014/gocon-tokyo/changestats.png
Binary files differ
diff --git a/2014/gocon-tokyo/concurrency.svg b/content/2014/gocon-tokyo/concurrency.svg
similarity index 100%
rename from 2014/gocon-tokyo/concurrency.svg
rename to content/2014/gocon-tokyo/concurrency.svg
diff --git a/2014/gocon-tokyo/concurrency0.svg b/content/2014/gocon-tokyo/concurrency0.svg
similarity index 100%
rename from 2014/gocon-tokyo/concurrency0.svg
rename to content/2014/gocon-tokyo/concurrency0.svg
diff --git a/2014/gocon-tokyo/concurrent.jpg b/content/2014/gocon-tokyo/concurrent.jpg
similarity index 100%
rename from 2014/gocon-tokyo/concurrent.jpg
rename to content/2014/gocon-tokyo/concurrent.jpg
Binary files differ
diff --git a/2014/gocon-tokyo/contig-stack.png b/content/2014/gocon-tokyo/contig-stack.png
similarity index 100%
rename from 2014/gocon-tokyo/contig-stack.png
rename to content/2014/gocon-tokyo/contig-stack.png
Binary files differ
diff --git a/2014/gocon-tokyo/docker.png b/content/2014/gocon-tokyo/docker.png
similarity index 100%
rename from 2014/gocon-tokyo/docker.png
rename to content/2014/gocon-tokyo/docker.png
Binary files differ
diff --git a/2014/gocon-tokyo/drone.png b/content/2014/gocon-tokyo/drone.png
similarity index 100%
rename from 2014/gocon-tokyo/drone.png
rename to content/2014/gocon-tokyo/drone.png
Binary files differ
diff --git a/2014/gocon-tokyo/funfast-nogo.svg b/content/2014/gocon-tokyo/funfast-nogo.svg
similarity index 100%
rename from 2014/gocon-tokyo/funfast-nogo.svg
rename to content/2014/gocon-tokyo/funfast-nogo.svg
diff --git a/2014/gocon-tokyo/funfast.svg b/content/2014/gocon-tokyo/funfast.svg
similarity index 100%
rename from 2014/gocon-tokyo/funfast.svg
rename to content/2014/gocon-tokyo/funfast.svg
diff --git a/2014/gocon-tokyo/generics.svg b/content/2014/gocon-tokyo/generics.svg
similarity index 100%
rename from 2014/gocon-tokyo/generics.svg
rename to content/2014/gocon-tokyo/generics.svg
diff --git a/2014/gocon-tokyo/goandroid.png b/content/2014/gocon-tokyo/goandroid.png
similarity index 100%
rename from 2014/gocon-tokyo/goandroid.png
rename to content/2014/gocon-tokyo/goandroid.png
Binary files differ
diff --git a/2014/gocon-tokyo/gpio.gif b/content/2014/gocon-tokyo/gpio.gif
similarity index 100%
rename from 2014/gocon-tokyo/gpio.gif
rename to content/2014/gocon-tokyo/gpio.gif
Binary files differ
diff --git a/2014/gocon-tokyo/sigourney.png b/content/2014/gocon-tokyo/sigourney.png
similarity index 100%
rename from 2014/gocon-tokyo/sigourney.png
rename to content/2014/gocon-tokyo/sigourney.png
Binary files differ
diff --git a/2014/gocon-tokyo/spaghetti.jpg b/content/2014/gocon-tokyo/spaghetti.jpg
similarity index 100%
rename from 2014/gocon-tokyo/spaghetti.jpg
rename to content/2014/gocon-tokyo/spaghetti.jpg
Binary files differ
diff --git a/2014/gocon-tokyo/tardis.png b/content/2014/gocon-tokyo/tardis.png
similarity index 100%
rename from 2014/gocon-tokyo/tardis.png
rename to content/2014/gocon-tokyo/tardis.png
Binary files differ
diff --git a/2014/gocon-tokyo/trs.png b/content/2014/gocon-tokyo/trs.png
similarity index 100%
rename from 2014/gocon-tokyo/trs.png
rename to content/2014/gocon-tokyo/trs.png
Binary files differ
diff --git a/2014/gotham-context.slide b/content/2014/gotham-context.slide
similarity index 100%
rename from 2014/gotham-context.slide
rename to content/2014/gotham-context.slide
diff --git a/2014/gotham-context/after.go b/content/2014/gotham-context/after.go
similarity index 100%
rename from 2014/gotham-context/after.go
rename to content/2014/gotham-context/after.go
diff --git a/2014/gotham-context/before.go b/content/2014/gotham-context/before.go
similarity index 100%
rename from 2014/gotham-context/before.go
rename to content/2014/gotham-context/before.go
diff --git a/2014/gotham-context/eg.go b/content/2014/gotham-context/eg.go
similarity index 100%
rename from 2014/gotham-context/eg.go
rename to content/2014/gotham-context/eg.go
diff --git a/2014/gotham-context/first-context.go b/content/2014/gotham-context/first-context.go
similarity index 100%
rename from 2014/gotham-context/first-context.go
rename to content/2014/gotham-context/first-context.go
diff --git a/2014/gotham-context/first.go b/content/2014/gotham-context/first.go
similarity index 100%
rename from 2014/gotham-context/first.go
rename to content/2014/gotham-context/first.go
diff --git a/2014/gotham-context/interface.go b/content/2014/gotham-context/interface.go
similarity index 100%
rename from 2014/gotham-context/interface.go
rename to content/2014/gotham-context/interface.go
diff --git a/2014/gotham-context/transitive.svg b/content/2014/gotham-context/transitive.svg
similarity index 100%
rename from 2014/gotham-context/transitive.svg
rename to content/2014/gotham-context/transitive.svg
diff --git a/2014/gothamgo-android.slide b/content/2014/gothamgo-android.slide
similarity index 100%
rename from 2014/gothamgo-android.slide
rename to content/2014/gothamgo-android.slide
diff --git a/2014/gothamgo-android/red.go b/content/2014/gothamgo-android/red.go
similarity index 100%
rename from 2014/gothamgo-android/red.go
rename to content/2014/gothamgo-android/red.go
diff --git a/2014/gothamgo-android/sprite_affine.svg b/content/2014/gothamgo-android/sprite_affine.svg
similarity index 100%
rename from 2014/gothamgo-android/sprite_affine.svg
rename to content/2014/gothamgo-android/sprite_affine.svg
diff --git a/2014/gothamgo-android/sprite_subtex.svg b/content/2014/gothamgo-android/sprite_subtex.svg
similarity index 100%
rename from 2014/gothamgo-android/sprite_subtex.svg
rename to content/2014/gothamgo-android/sprite_subtex.svg
diff --git a/2014/gothamgo-android/touch.go b/content/2014/gothamgo-android/touch.go
similarity index 100%
rename from 2014/gothamgo-android/touch.go
rename to content/2014/gothamgo-android/touch.go
diff --git a/2014/hammers.slide b/content/2014/hammers.slide
similarity index 100%
rename from 2014/hammers.slide
rename to content/2014/hammers.slide
diff --git a/2014/hammers/codegen.go b/content/2014/hammers/codegen.go
similarity index 100%
rename from 2014/hammers/codegen.go
rename to content/2014/hammers/codegen.go
diff --git a/2014/hammers/extractiface.go b/content/2014/hammers/extractiface.go
similarity index 100%
rename from 2014/hammers/extractiface.go
rename to content/2014/hammers/extractiface.go
diff --git a/2014/hammers/extractpath.go b/content/2014/hammers/extractpath.go
similarity index 100%
rename from 2014/hammers/extractpath.go
rename to content/2014/hammers/extractpath.go
diff --git a/2014/hammers/findthecode.go b/content/2014/hammers/findthecode.go
similarity index 100%
rename from 2014/hammers/findthecode.go
rename to content/2014/hammers/findthecode.go
diff --git a/2014/hammers/findtheifacedecl.go b/content/2014/hammers/findtheifacedecl.go
similarity index 100%
rename from 2014/hammers/findtheifacedecl.go
rename to content/2014/hammers/findtheifacedecl.go
diff --git a/2014/hammers/format.go b/content/2014/hammers/format.go
similarity index 100%
rename from 2014/hammers/format.go
rename to content/2014/hammers/format.go
diff --git a/2014/hammers/fulltype.go b/content/2014/hammers/fulltype.go
similarity index 100%
rename from 2014/hammers/fulltype.go
rename to content/2014/hammers/fulltype.go
diff --git a/2014/hammers/importpath.go b/content/2014/hammers/importpath.go
similarity index 100%
rename from 2014/hammers/importpath.go
rename to content/2014/hammers/importpath.go
diff --git a/2014/hammers/types.go b/content/2014/hammers/types.go
similarity index 100%
rename from 2014/hammers/types.go
rename to content/2014/hammers/types.go
diff --git a/2014/hellogophers.slide b/content/2014/hellogophers.slide
similarity index 100%
rename from 2014/hellogophers.slide
rename to content/2014/hellogophers.slide
diff --git a/2014/hellogophers/emerging.png b/content/2014/hellogophers/emerging.png
similarity index 100%
rename from 2014/hellogophers/emerging.png
rename to content/2014/hellogophers/emerging.png
Binary files differ
diff --git a/2014/hellogophers/gophers.jpg b/content/2014/hellogophers/gophers.jpg
similarity index 100%
rename from 2014/hellogophers/gophers.jpg
rename to content/2014/hellogophers/gophers.jpg
Binary files differ
diff --git a/2014/hellogophers/hello.b b/content/2014/hellogophers/hello.b
similarity index 100%
rename from 2014/hellogophers/hello.b
rename to content/2014/hellogophers/hello.b
diff --git a/2014/hellogophers/hello.c b/content/2014/hellogophers/hello.c
similarity index 100%
rename from 2014/hellogophers/hello.c
rename to content/2014/hellogophers/hello.c
diff --git a/2014/hellogophers/hello.go b/content/2014/hellogophers/hello.go
similarity index 100%
rename from 2014/hellogophers/hello.go
rename to content/2014/hellogophers/hello.go
diff --git a/2014/hellogophers/helloAnsi.c b/content/2014/hellogophers/helloAnsi.c
similarity index 100%
rename from 2014/hellogophers/helloAnsi.c
rename to content/2014/hellogophers/helloAnsi.c
diff --git a/2014/hellogophers/helloDraftAnsi.c b/content/2014/hellogophers/helloDraftAnsi.c
similarity index 100%
rename from 2014/hellogophers/helloDraftAnsi.c
rename to content/2014/hellogophers/helloDraftAnsi.c
diff --git a/2014/hellogophers/helloKnR.c b/content/2014/hellogophers/helloKnR.c
similarity index 100%
rename from 2014/hellogophers/helloKnR.c
rename to content/2014/hellogophers/helloKnR.c
diff --git a/2014/hellogophers/hello_20080606.go b/content/2014/hellogophers/hello_20080606.go
similarity index 100%
rename from 2014/hellogophers/hello_20080606.go
rename to content/2014/hellogophers/hello_20080606.go
diff --git a/2014/hellogophers/hello_20080627.go b/content/2014/hellogophers/hello_20080627.go
similarity index 100%
rename from 2014/hellogophers/hello_20080627.go
rename to content/2014/hellogophers/hello_20080627.go
diff --git a/2014/hellogophers/hello_20080811.go b/content/2014/hellogophers/hello_20080811.go
similarity index 100%
rename from 2014/hellogophers/hello_20080811.go
rename to content/2014/hellogophers/hello_20080811.go
diff --git a/2014/hellogophers/hello_20081024.go b/content/2014/hellogophers/hello_20081024.go
similarity index 100%
rename from 2014/hellogophers/hello_20081024.go
rename to content/2014/hellogophers/hello_20081024.go
diff --git a/2014/hellogophers/hello_20090115.go b/content/2014/hellogophers/hello_20090115.go
similarity index 100%
rename from 2014/hellogophers/hello_20090115.go
rename to content/2014/hellogophers/hello_20090115.go
diff --git a/2014/hellogophers/hello_20091211.go b/content/2014/hellogophers/hello_20091211.go
similarity index 100%
rename from 2014/hellogophers/hello_20091211.go
rename to content/2014/hellogophers/hello_20091211.go
diff --git a/2014/hellogophers/hellogophers.go b/content/2014/hellogophers/hellogophers.go
similarity index 100%
rename from 2014/hellogophers/hellogophers.go
rename to content/2014/hellogophers/hellogophers.go
diff --git a/2014/hellogophers/sieve.csp b/content/2014/hellogophers/sieve.csp
similarity index 100%
rename from 2014/hellogophers/sieve.csp
rename to content/2014/hellogophers/sieve.csp
diff --git a/2014/hellogophers/sieve.go b/content/2014/hellogophers/sieve.go
similarity index 100%
rename from 2014/hellogophers/sieve.go
rename to content/2014/hellogophers/sieve.go
diff --git a/2014/hellogophers/sieve.newsqueak b/content/2014/hellogophers/sieve.newsqueak
similarity index 100%
rename from 2014/hellogophers/sieve.newsqueak
rename to content/2014/hellogophers/sieve.newsqueak
diff --git a/2014/hellogophers/sieve_20080305.go b/content/2014/hellogophers/sieve_20080305.go
similarity index 100%
rename from 2014/hellogophers/sieve_20080305.go
rename to content/2014/hellogophers/sieve_20080305.go
diff --git a/2014/hellogophers/sieve_20080722.go b/content/2014/hellogophers/sieve_20080722.go
similarity index 100%
rename from 2014/hellogophers/sieve_20080722.go
rename to content/2014/hellogophers/sieve_20080722.go
diff --git a/2014/hellogophers/sieve_20080917.go b/content/2014/hellogophers/sieve_20080917.go
similarity index 100%
rename from 2014/hellogophers/sieve_20080917.go
rename to content/2014/hellogophers/sieve_20080917.go
diff --git a/2014/hellogophers/sieve_20090106.go b/content/2014/hellogophers/sieve_20090106.go
similarity index 100%
rename from 2014/hellogophers/sieve_20090106.go
rename to content/2014/hellogophers/sieve_20090106.go
diff --git a/2014/hellogophers/sieve_20090925.go b/content/2014/hellogophers/sieve_20090925.go
similarity index 100%
rename from 2014/hellogophers/sieve_20090925.go
rename to content/2014/hellogophers/sieve_20090925.go
diff --git a/2014/hellogophers/trends.png b/content/2014/hellogophers/trends.png
similarity index 100%
rename from 2014/hellogophers/trends.png
rename to content/2014/hellogophers/trends.png
Binary files differ
diff --git a/2014/names.slide b/content/2014/names.slide
similarity index 100%
rename from 2014/names.slide
rename to content/2014/names.slide
diff --git a/2014/organizeio.slide b/content/2014/organizeio.slide
similarity index 100%
rename from 2014/organizeio.slide
rename to content/2014/organizeio.slide
diff --git a/2014/organizeio/godoc.png b/content/2014/organizeio/godoc.png
similarity index 100%
rename from 2014/organizeio/godoc.png
rename to content/2014/organizeio/godoc.png
Binary files differ
diff --git a/2014/organizeio/gogetversion.png b/content/2014/organizeio/gogetversion.png
similarity index 100%
rename from 2014/organizeio/gogetversion.png
rename to content/2014/organizeio/gogetversion.png
Binary files differ
diff --git a/2014/organizeio/hello.go b/content/2014/organizeio/hello.go
similarity index 100%
rename from 2014/organizeio/hello.go
rename to content/2014/organizeio/hello.go
diff --git a/2014/organizeio/home.png b/content/2014/organizeio/home.png
similarity index 100%
rename from 2014/organizeio/home.png
rename to content/2014/organizeio/home.png
Binary files differ
diff --git a/2014/playground.slide b/content/2014/playground.slide
similarity index 100%
rename from 2014/playground.slide
rename to content/2014/playground.slide
diff --git a/2014/playground/deadlock.go b/content/2014/playground/deadlock.go
similarity index 100%
rename from 2014/playground/deadlock.go
rename to content/2014/playground/deadlock.go
diff --git a/2014/playground/file.go b/content/2014/playground/file.go
similarity index 100%
rename from 2014/playground/file.go
rename to content/2014/playground/file.go
diff --git a/2014/playground/heap.go b/content/2014/playground/heap.go
similarity index 100%
rename from 2014/playground/heap.go
rename to content/2014/playground/heap.go
diff --git a/2014/playground/hello.go b/content/2014/playground/hello.go
similarity index 100%
rename from 2014/playground/hello.go
rename to content/2014/playground/hello.go
diff --git a/2014/playground/http.go b/content/2014/playground/http.go
similarity index 100%
rename from 2014/playground/http.go
rename to content/2014/playground/http.go
diff --git a/2014/playground/img/andrew.png b/content/2014/playground/img/andrew.png
similarity index 100%
rename from 2014/playground/img/andrew.png
rename to content/2014/playground/img/andrew.png
Binary files differ
diff --git a/2014/playground/img/arch.png b/content/2014/playground/img/arch.png
similarity index 100%
rename from 2014/playground/img/arch.png
rename to content/2014/playground/img/arch.png
Binary files differ
diff --git a/2014/playground/img/areyousure.png b/content/2014/playground/img/areyousure.png
similarity index 100%
rename from 2014/playground/img/areyousure.png
rename to content/2014/playground/img/areyousure.png
Binary files differ
diff --git a/2014/playground/img/blog.png b/content/2014/playground/img/blog.png
similarity index 100%
rename from 2014/playground/img/blog.png
rename to content/2014/playground/img/blog.png
Binary files differ
diff --git a/2014/playground/img/brad.png b/content/2014/playground/img/brad.png
similarity index 100%
rename from 2014/playground/img/brad.png
rename to content/2014/playground/img/brad.png
Binary files differ
diff --git a/2014/playground/img/bug.png b/content/2014/playground/img/bug.png
similarity index 100%
rename from 2014/playground/img/bug.png
rename to content/2014/playground/img/bug.png
Binary files differ
diff --git a/2014/playground/img/cat.jpg b/content/2014/playground/img/cat.jpg
similarity index 100%
rename from 2014/playground/img/cat.jpg
rename to content/2014/playground/img/cat.jpg
Binary files differ
diff --git a/2014/playground/img/examples.png b/content/2014/playground/img/examples.png
similarity index 100%
rename from 2014/playground/img/examples.png
rename to content/2014/playground/img/examples.png
Binary files differ
diff --git a/2014/playground/img/gopherbw.png b/content/2014/playground/img/gopherbw.png
similarity index 100%
rename from 2014/playground/img/gopherbw.png
rename to content/2014/playground/img/gopherbw.png
Binary files differ
diff --git a/2014/playground/img/jan.png b/content/2014/playground/img/jan.png
similarity index 100%
rename from 2014/playground/img/jan.png
rename to content/2014/playground/img/jan.png
Binary files differ
diff --git a/2014/playground/img/mattn.png b/content/2014/playground/img/mattn.png
similarity index 100%
rename from 2014/playground/img/mattn.png
rename to content/2014/playground/img/mattn.png
Binary files differ
diff --git a/2014/playground/img/nacl.png b/content/2014/playground/img/nacl.png
similarity index 100%
rename from 2014/playground/img/nacl.png
rename to content/2014/playground/img/nacl.png
Binary files differ
diff --git a/2014/playground/img/play.png b/content/2014/playground/img/play.png
similarity index 100%
rename from 2014/playground/img/play.png
rename to content/2014/playground/img/play.png
Binary files differ
diff --git a/2014/playground/img/share.png b/content/2014/playground/img/share.png
similarity index 100%
rename from 2014/playground/img/share.png
rename to content/2014/playground/img/share.png
Binary files differ
diff --git a/2014/playground/img/sleepbug.png b/content/2014/playground/img/sleepbug.png
similarity index 100%
rename from 2014/playground/img/sleepbug.png
rename to content/2014/playground/img/sleepbug.png
Binary files differ
diff --git a/2014/playground/img/tour.png b/content/2014/playground/img/tour.png
similarity index 100%
rename from 2014/playground/img/tour.png
rename to content/2014/playground/img/tour.png
Binary files differ
diff --git a/2014/playground/loop.go b/content/2014/playground/loop.go
similarity index 100%
rename from 2014/playground/loop.go
rename to content/2014/playground/loop.go
diff --git a/2014/playground/net.go b/content/2014/playground/net.go
similarity index 100%
rename from 2014/playground/net.go
rename to content/2014/playground/net.go
diff --git a/2014/playground/removeall.go b/content/2014/playground/removeall.go
similarity index 100%
rename from 2014/playground/removeall.go
rename to content/2014/playground/removeall.go
diff --git a/2014/playground/rm.go b/content/2014/playground/rm.go
similarity index 100%
rename from 2014/playground/rm.go
rename to content/2014/playground/rm.go
diff --git a/2014/playground/sleep.go b/content/2014/playground/sleep.go
similarity index 100%
rename from 2014/playground/sleep.go
rename to content/2014/playground/sleep.go
diff --git a/2014/playground/sleepfast.go b/content/2014/playground/sleepfast.go
similarity index 100%
rename from 2014/playground/sleepfast.go
rename to content/2014/playground/sleepfast.go
diff --git a/2014/playground/stack.go b/content/2014/playground/stack.go
similarity index 100%
rename from 2014/playground/stack.go
rename to content/2014/playground/stack.go
diff --git a/2014/readability.slide b/content/2014/readability.slide
similarity index 100%
rename from 2014/readability.slide
rename to content/2014/readability.slide
diff --git a/2014/readability/close-cond-bad.go b/content/2014/readability/close-cond-bad.go
similarity index 100%
rename from 2014/readability/close-cond-bad.go
rename to content/2014/readability/close-cond-bad.go
diff --git a/2014/readability/close-cond-good.go b/content/2014/readability/close-cond-good.go
similarity index 100%
rename from 2014/readability/close-cond-good.go
rename to content/2014/readability/close-cond-good.go
diff --git a/2014/readability/err_close_write_bad.go b/content/2014/readability/err_close_write_bad.go
similarity index 100%
rename from 2014/readability/err_close_write_bad.go
rename to content/2014/readability/err_close_write_bad.go
diff --git a/2014/readability/err_close_write_good.go b/content/2014/readability/err_close_write_good.go
similarity index 100%
rename from 2014/readability/err_close_write_good.go
rename to content/2014/readability/err_close_write_good.go
diff --git a/2014/readability/err_regexp_bad.go b/content/2014/readability/err_regexp_bad.go
similarity index 100%
rename from 2014/readability/err_regexp_bad.go
rename to content/2014/readability/err_regexp_bad.go
diff --git a/2014/readability/err_regexp_good.go b/content/2014/readability/err_regexp_good.go
similarity index 100%
rename from 2014/readability/err_regexp_good.go
rename to content/2014/readability/err_regexp_good.go
diff --git a/2014/readability/example_test.go b/content/2014/readability/example_test.go
similarity index 100%
rename from 2014/readability/example_test.go
rename to content/2014/readability/example_test.go
diff --git a/2014/readability/gopher-ok-no.png b/content/2014/readability/gopher-ok-no.png
similarity index 100%
rename from 2014/readability/gopher-ok-no.png
rename to content/2014/readability/gopher-ok-no.png
Binary files differ
diff --git a/2014/readability/gophers5th.jpg b/content/2014/readability/gophers5th.jpg
similarity index 100%
rename from 2014/readability/gophers5th.jpg
rename to content/2014/readability/gophers5th.jpg
Binary files differ
diff --git a/2014/readability/if-else-bad.go b/content/2014/readability/if-else-bad.go
similarity index 100%
rename from 2014/readability/if-else-bad.go
rename to content/2014/readability/if-else-bad.go
diff --git a/2014/readability/if-else-good.go b/content/2014/readability/if-else-good.go
similarity index 100%
rename from 2014/readability/if-else-good.go
rename to content/2014/readability/if-else-good.go
diff --git a/2014/readability/if-switch-bad.go b/content/2014/readability/if-switch-bad.go
similarity index 100%
rename from 2014/readability/if-switch-bad.go
rename to content/2014/readability/if-switch-bad.go
diff --git a/2014/readability/if-switch-good.go b/content/2014/readability/if-switch-good.go
similarity index 100%
rename from 2014/readability/if-switch-good.go
rename to content/2014/readability/if-switch-good.go
diff --git a/2014/readability/implement-interface-bad.go b/content/2014/readability/implement-interface-bad.go
similarity index 100%
rename from 2014/readability/implement-interface-bad.go
rename to content/2014/readability/implement-interface-bad.go
diff --git a/2014/readability/implement-interface-good.go b/content/2014/readability/implement-interface-good.go
similarity index 100%
rename from 2014/readability/implement-interface-good.go
rename to content/2014/readability/implement-interface-good.go
diff --git a/2014/readability/in-band-error-client.go b/content/2014/readability/in-band-error-client.go
similarity index 100%
rename from 2014/readability/in-band-error-client.go
rename to content/2014/readability/in-band-error-client.go
diff --git a/2014/readability/in-band-error.go b/content/2014/readability/in-band-error.go
similarity index 100%
rename from 2014/readability/in-band-error.go
rename to content/2014/readability/in-band-error.go
diff --git a/2014/readability/long-line-fold.go b/content/2014/readability/long-line-fold.go
similarity index 100%
rename from 2014/readability/long-line-fold.go
rename to content/2014/readability/long-line-fold.go
diff --git a/2014/readability/long-line-nofold.go b/content/2014/readability/long-line-nofold.go
similarity index 100%
rename from 2014/readability/long-line-nofold.go
rename to content/2014/readability/long-line-nofold.go
diff --git a/2014/readability/long-line-short.go b/content/2014/readability/long-line-short.go
similarity index 100%
rename from 2014/readability/long-line-short.go
rename to content/2014/readability/long-line-short.go
diff --git a/2014/readability/nil_error.go b/content/2014/readability/nil_error.go
similarity index 100%
rename from 2014/readability/nil_error.go
rename to content/2014/readability/nil_error.go
diff --git a/2014/readability/nil_interface_en.go b/content/2014/readability/nil_interface_en.go
similarity index 100%
rename from 2014/readability/nil_interface_en.go
rename to content/2014/readability/nil_interface_en.go
diff --git a/2014/readability/pkg.png b/content/2014/readability/pkg.png
similarity index 100%
rename from 2014/readability/pkg.png
rename to content/2014/readability/pkg.png
Binary files differ
diff --git a/2014/readability/project.png b/content/2014/readability/project.png
similarity index 100%
rename from 2014/readability/project.png
rename to content/2014/readability/project.png
Binary files differ
diff --git a/2014/readability/ref.png b/content/2014/readability/ref.png
similarity index 100%
rename from 2014/readability/ref.png
rename to content/2014/readability/ref.png
Binary files differ
diff --git a/2014/readability/reflect-bad.go b/content/2014/readability/reflect-bad.go
similarity index 100%
rename from 2014/readability/reflect-bad.go
rename to content/2014/readability/reflect-bad.go
diff --git a/2014/readability/reflect-good.go b/content/2014/readability/reflect-good.go
similarity index 100%
rename from 2014/readability/reflect-good.go
rename to content/2014/readability/reflect-good.go
diff --git a/2014/readability/resthandler-fix2.go b/content/2014/readability/resthandler-fix2.go
similarity index 100%
rename from 2014/readability/resthandler-fix2.go
rename to content/2014/readability/resthandler-fix2.go
diff --git a/2014/readability/resthandler.go b/content/2014/readability/resthandler.go
similarity index 100%
rename from 2014/readability/resthandler.go
rename to content/2014/readability/resthandler.go
diff --git a/2014/readability/struct-field-bad.go b/content/2014/readability/struct-field-bad.go
similarity index 100%
rename from 2014/readability/struct-field-bad.go
rename to content/2014/readability/struct-field-bad.go
diff --git a/2014/readability/struct-field-good.go b/content/2014/readability/struct-field-good.go
similarity index 100%
rename from 2014/readability/struct-field-good.go
rename to content/2014/readability/struct-field-good.go
diff --git a/2014/readability/talks.png b/content/2014/readability/talks.png
similarity index 100%
rename from 2014/readability/talks.png
rename to content/2014/readability/talks.png
Binary files differ
diff --git a/2014/readability/test-pattern_en.go b/content/2014/readability/test-pattern_en.go
similarity index 100%
rename from 2014/readability/test-pattern_en.go
rename to content/2014/readability/test-pattern_en.go
diff --git a/2014/readability/time_duration_bad.go b/content/2014/readability/time_duration_bad.go
similarity index 100%
rename from 2014/readability/time_duration_bad.go
rename to content/2014/readability/time_duration_bad.go
diff --git a/2014/readability/time_duration_bad1.go b/content/2014/readability/time_duration_bad1.go
similarity index 100%
rename from 2014/readability/time_duration_bad1.go
rename to content/2014/readability/time_duration_bad1.go
diff --git a/2014/readability/time_duration_bad2.go b/content/2014/readability/time_duration_bad2.go
similarity index 100%
rename from 2014/readability/time_duration_bad2.go
rename to content/2014/readability/time_duration_bad2.go
diff --git a/2014/readability/time_duration_good.go b/content/2014/readability/time_duration_good.go
similarity index 100%
rename from 2014/readability/time_duration_good.go
rename to content/2014/readability/time_duration_good.go
diff --git a/2014/readability/val-and-error.go b/content/2014/readability/val-and-error.go
similarity index 100%
rename from 2014/readability/val-and-error.go
rename to content/2014/readability/val-and-error.go
diff --git a/2014/research.slide b/content/2014/research.slide
similarity index 100%
rename from 2014/research.slide
rename to content/2014/research.slide
diff --git a/2014/research2.slide b/content/2014/research2.slide
similarity index 100%
rename from 2014/research2.slide
rename to content/2014/research2.slide
diff --git a/2014/research2/addr1.go b/content/2014/research2/addr1.go
similarity index 100%
rename from 2014/research2/addr1.go
rename to content/2014/research2/addr1.go
diff --git a/2014/research2/addr2.go b/content/2014/research2/addr2.go
similarity index 100%
rename from 2014/research2/addr2.go
rename to content/2014/research2/addr2.go
diff --git a/2014/research2/busy.jpg b/content/2014/research2/busy.jpg
similarity index 100%
rename from 2014/research2/busy.jpg
rename to content/2014/research2/busy.jpg
Binary files differ
diff --git a/2014/research2/csmith.png b/content/2014/research2/csmith.png
similarity index 100%
rename from 2014/research2/csmith.png
rename to content/2014/research2/csmith.png
Binary files differ
diff --git a/2014/research2/datacenter.jpg b/content/2014/research2/datacenter.jpg
similarity index 100%
rename from 2014/research2/datacenter.jpg
rename to content/2014/research2/datacenter.jpg
Binary files differ
diff --git a/2014/research2/emoji.png b/content/2014/research2/emoji.png
similarity index 100%
rename from 2014/research2/emoji.png
rename to content/2014/research2/emoji.png
Binary files differ
diff --git a/2014/research2/gophercomplex6.jpg b/content/2014/research2/gophercomplex6.jpg
similarity index 100%
rename from 2014/research2/gophercomplex6.jpg
rename to content/2014/research2/gophercomplex6.jpg
Binary files differ
diff --git a/2014/research2/gopherswrench.jpg b/content/2014/research2/gopherswrench.jpg
similarity index 100%
rename from 2014/research2/gopherswrench.jpg
rename to content/2014/research2/gopherswrench.jpg
Binary files differ
diff --git a/2014/research2/hello.go b/content/2014/research2/hello.go
similarity index 100%
rename from 2014/research2/hello.go
rename to content/2014/research2/hello.go
diff --git a/2014/research2/race.png b/content/2014/research2/race.png
similarity index 100%
rename from 2014/research2/race.png
rename to content/2014/research2/race.png
Binary files differ
diff --git a/2014/research2/select.go b/content/2014/research2/select.go
similarity index 100%
rename from 2014/research2/select.go
rename to content/2014/research2/select.go
diff --git a/2014/state-of-go.slide b/content/2014/state-of-go.slide
similarity index 100%
rename from 2014/state-of-go.slide
rename to content/2014/state-of-go.slide
diff --git a/2014/state-of-go/bus.jpg b/content/2014/state-of-go/bus.jpg
similarity index 100%
rename from 2014/state-of-go/bus.jpg
rename to content/2014/state-of-go/bus.jpg
Binary files differ
diff --git a/2014/state-of-go/dotgo.png b/content/2014/state-of-go/dotgo.png
similarity index 100%
rename from 2014/state-of-go/dotgo.png
rename to content/2014/state-of-go/dotgo.png
Binary files differ
diff --git a/2014/state-of-go/gophercon.png b/content/2014/state-of-go/gophercon.png
similarity index 100%
rename from 2014/state-of-go/gophercon.png
rename to content/2014/state-of-go/gophercon.png
Binary files differ
diff --git a/2014/state-of-go/gophers.jpg b/content/2014/state-of-go/gophers.jpg
similarity index 100%
rename from 2014/state-of-go/gophers.jpg
rename to content/2014/state-of-go/gophers.jpg
Binary files differ
diff --git a/2014/state-of-go/indent.png b/content/2014/state-of-go/indent.png
similarity index 100%
rename from 2014/state-of-go/indent.png
rename to content/2014/state-of-go/indent.png
Binary files differ
diff --git a/2014/state-of-go/india.png b/content/2014/state-of-go/india.png
similarity index 100%
rename from 2014/state-of-go/india.png
rename to content/2014/state-of-go/india.png
Binary files differ
diff --git a/2014/state-of-go/msg-exceptions1b.png b/content/2014/state-of-go/msg-exceptions1b.png
similarity index 100%
rename from 2014/state-of-go/msg-exceptions1b.png
rename to content/2014/state-of-go/msg-exceptions1b.png
Binary files differ
diff --git a/2014/state-of-go/msg-exceptions2.png b/content/2014/state-of-go/msg-exceptions2.png
similarity index 100%
rename from 2014/state-of-go/msg-exceptions2.png
rename to content/2014/state-of-go/msg-exceptions2.png
Binary files differ
diff --git a/2014/state-of-go/msg-generics.png b/content/2014/state-of-go/msg-generics.png
similarity index 100%
rename from 2014/state-of-go/msg-generics.png
rename to content/2014/state-of-go/msg-generics.png
Binary files differ
diff --git a/2014/state-of-go/msg-lacks.png b/content/2014/state-of-go/msg-lacks.png
similarity index 100%
rename from 2014/state-of-go/msg-lacks.png
rename to content/2014/state-of-go/msg-lacks.png
Binary files differ
diff --git a/2014/state-of-go/msg-logo1.png b/content/2014/state-of-go/msg-logo1.png
similarity index 100%
rename from 2014/state-of-go/msg-logo1.png
rename to content/2014/state-of-go/msg-logo1.png
Binary files differ
diff --git a/2014/state-of-go/msg-logo2.png b/content/2014/state-of-go/msg-logo2.png
similarity index 100%
rename from 2014/state-of-go/msg-logo2.png
rename to content/2014/state-of-go/msg-logo2.png
Binary files differ
diff --git a/2014/state-of-go/msg-logo3.jpg b/content/2014/state-of-go/msg-logo3.jpg
similarity index 100%
rename from 2014/state-of-go/msg-logo3.jpg
rename to content/2014/state-of-go/msg-logo3.jpg
Binary files differ
diff --git a/2014/state-of-go/msg-nogenerics.png b/content/2014/state-of-go/msg-nogenerics.png
similarity index 100%
rename from 2014/state-of-go/msg-nogenerics.png
rename to content/2014/state-of-go/msg-nogenerics.png
Binary files differ
diff --git a/2014/state-of-go/msg-semi.png b/content/2014/state-of-go/msg-semi.png
similarity index 100%
rename from 2014/state-of-go/msg-semi.png
rename to content/2014/state-of-go/msg-semi.png
Binary files differ
diff --git a/2014/state-of-go/msg-type.png b/content/2014/state-of-go/msg-type.png
similarity index 100%
rename from 2014/state-of-go/msg-type.png
rename to content/2014/state-of-go/msg-type.png
Binary files differ
diff --git a/2014/state-of-go/msg-wrong.png b/content/2014/state-of-go/msg-wrong.png
similarity index 100%
rename from 2014/state-of-go/msg-wrong.png
rename to content/2014/state-of-go/msg-wrong.png
Binary files differ
diff --git a/2014/state-of-go/oloh.png b/content/2014/state-of-go/oloh.png
similarity index 100%
rename from 2014/state-of-go/oloh.png
rename to content/2014/state-of-go/oloh.png
Binary files differ
diff --git a/2014/state-of-go/redmonk.png b/content/2014/state-of-go/redmonk.png
similarity index 100%
rename from 2014/state-of-go/redmonk.png
rename to content/2014/state-of-go/redmonk.png
Binary files differ
diff --git a/2014/state-of-go/sadgopher.png b/content/2014/state-of-go/sadgopher.png
similarity index 100%
rename from 2014/state-of-go/sadgopher.png
rename to content/2014/state-of-go/sadgopher.png
Binary files differ
diff --git a/2014/state-of-go/tattoo.jpg b/content/2014/state-of-go/tattoo.jpg
similarity index 100%
rename from 2014/state-of-go/tattoo.jpg
rename to content/2014/state-of-go/tattoo.jpg
Binary files differ
diff --git a/2014/state-of-the-gopher.slide b/content/2014/state-of-the-gopher.slide
similarity index 100%
rename from 2014/state-of-the-gopher.slide
rename to content/2014/state-of-the-gopher.slide
diff --git a/2014/state-of-the-gopher/build.png b/content/2014/state-of-the-gopher/build.png
similarity index 100%
rename from 2014/state-of-the-gopher/build.png
rename to content/2014/state-of-the-gopher/build.png
Binary files differ
diff --git a/2014/state-of-the-gopher/bus.jpg b/content/2014/state-of-the-gopher/bus.jpg
similarity index 100%
rename from 2014/state-of-the-gopher/bus.jpg
rename to content/2014/state-of-the-gopher/bus.jpg
Binary files differ
diff --git a/2014/state-of-the-gopher/contig-stack.png b/content/2014/state-of-the-gopher/contig-stack.png
similarity index 100%
rename from 2014/state-of-the-gopher/contig-stack.png
rename to content/2014/state-of-the-gopher/contig-stack.png
Binary files differ
diff --git a/2014/state-of-the-gopher/dotgo.png b/content/2014/state-of-the-gopher/dotgo.png
similarity index 100%
rename from 2014/state-of-the-gopher/dotgo.png
rename to content/2014/state-of-the-gopher/dotgo.png
Binary files differ
diff --git a/2014/state-of-the-gopher/gopher.jpg b/content/2014/state-of-the-gopher/gopher.jpg
similarity index 100%
rename from 2014/state-of-the-gopher/gopher.jpg
rename to content/2014/state-of-the-gopher/gopher.jpg
Binary files differ
diff --git a/2014/state-of-the-gopher/gophercon.png b/content/2014/state-of-the-gopher/gophercon.png
similarity index 100%
rename from 2014/state-of-the-gopher/gophercon.png
rename to content/2014/state-of-the-gopher/gophercon.png
Binary files differ
diff --git a/2014/state-of-the-gopher/india.png b/content/2014/state-of-the-gopher/india.png
similarity index 100%
rename from 2014/state-of-the-gopher/india.png
rename to content/2014/state-of-the-gopher/india.png
Binary files differ
diff --git a/2014/state-of-the-gopher/oloh.png b/content/2014/state-of-the-gopher/oloh.png
similarity index 100%
rename from 2014/state-of-the-gopher/oloh.png
rename to content/2014/state-of-the-gopher/oloh.png
Binary files differ
diff --git a/2014/state-of-the-gopher/opensource.png b/content/2014/state-of-the-gopher/opensource.png
similarity index 100%
rename from 2014/state-of-the-gopher/opensource.png
rename to content/2014/state-of-the-gopher/opensource.png
Binary files differ
diff --git a/2014/state-of-the-gopher/trace.png b/content/2014/state-of-the-gopher/trace.png
similarity index 100%
rename from 2014/state-of-the-gopher/trace.png
rename to content/2014/state-of-the-gopher/trace.png
Binary files differ
diff --git a/2014/state-of-the-gopher/website1.png b/content/2014/state-of-the-gopher/website1.png
similarity index 100%
rename from 2014/state-of-the-gopher/website1.png
rename to content/2014/state-of-the-gopher/website1.png
Binary files differ
diff --git a/2014/state-of-the-gopher/website2.png b/content/2014/state-of-the-gopher/website2.png
similarity index 100%
rename from 2014/state-of-the-gopher/website2.png
rename to content/2014/state-of-the-gopher/website2.png
Binary files differ
diff --git a/2014/static-analysis.slide b/content/2014/static-analysis.slide
similarity index 100%
rename from 2014/static-analysis.slide
rename to content/2014/static-analysis.slide
diff --git a/2014/static-analysis/demo.go b/content/2014/static-analysis/demo.go
similarity index 100%
rename from 2014/static-analysis/demo.go
rename to content/2014/static-analysis/demo.go
diff --git a/2014/static-analysis/demoscript b/content/2014/static-analysis/demoscript
similarity index 100%
rename from 2014/static-analysis/demoscript
rename to content/2014/static-analysis/demoscript
diff --git a/2014/static-analysis/egtest/test.go b/content/2014/static-analysis/egtest/test.go
similarity index 100%
rename from 2014/static-analysis/egtest/test.go
rename to content/2014/static-analysis/egtest/test.go
diff --git a/2014/static-analysis/fib.go b/content/2014/static-analysis/fib.go
similarity index 100%
rename from 2014/static-analysis/fib.go
rename to content/2014/static-analysis/fib.go
diff --git a/2014/static-analysis/hello.go b/content/2014/static-analysis/hello.go
similarity index 100%
rename from 2014/static-analysis/hello.go
rename to content/2014/static-analysis/hello.go
diff --git a/2014/static-analysis/hvn.svg b/content/2014/static-analysis/hvn.svg
similarity index 100%
rename from 2014/static-analysis/hvn.svg
rename to content/2014/static-analysis/hvn.svg
diff --git a/2014/static-analysis/template.go b/content/2014/static-analysis/template.go
similarity index 100%
rename from 2014/static-analysis/template.go
rename to content/2014/static-analysis/template.go
diff --git a/2014/static-analysis/tools.svg b/content/2014/static-analysis/tools.svg
similarity index 100%
rename from 2014/static-analysis/tools.svg
rename to content/2014/static-analysis/tools.svg
diff --git a/2014/taste.slide b/content/2014/taste.slide
similarity index 100%
rename from 2014/taste.slide
rename to content/2014/taste.slide
diff --git a/2014/taste/concurrency1.go b/content/2014/taste/concurrency1.go
similarity index 100%
rename from 2014/taste/concurrency1.go
rename to content/2014/taste/concurrency1.go
diff --git a/2014/taste/concurrency2.go b/content/2014/taste/concurrency2.go
similarity index 100%
rename from 2014/taste/concurrency2.go
rename to content/2014/taste/concurrency2.go
diff --git a/2014/taste/examples.go b/content/2014/taste/examples.go
similarity index 100%
rename from 2014/taste/examples.go
rename to content/2014/taste/examples.go
diff --git a/2014/taste/hello.go b/content/2014/taste/hello.go
similarity index 100%
rename from 2014/taste/hello.go
rename to content/2014/taste/hello.go
diff --git a/2014/taste/hellohttp.go b/content/2014/taste/hellohttp.go
similarity index 100%
rename from 2014/taste/hellohttp.go
rename to content/2014/taste/hellohttp.go
diff --git a/2014/taste/histo.go b/content/2014/taste/histo.go
similarity index 100%
rename from 2014/taste/histo.go
rename to content/2014/taste/histo.go
diff --git a/2014/taste/histo0.go b/content/2014/taste/histo0.go
similarity index 100%
rename from 2014/taste/histo0.go
rename to content/2014/taste/histo0.go
diff --git a/2014/taste/histop.go b/content/2014/taste/histop.go
similarity index 100%
rename from 2014/taste/histop.go
rename to content/2014/taste/histop.go
diff --git a/2014/taste/idents.go b/content/2014/taste/idents.go
similarity index 100%
rename from 2014/taste/idents.go
rename to content/2014/taste/idents.go
diff --git a/2014/taste/point.go b/content/2014/taste/point.go
similarity index 100%
rename from 2014/taste/point.go
rename to content/2014/taste/point.go
diff --git a/2014/taste/sort.go b/content/2014/taste/sort.go
similarity index 100%
rename from 2014/taste/sort.go
rename to content/2014/taste/sort.go
diff --git a/2014/taste/stringer.go b/content/2014/taste/stringer.go
similarity index 100%
rename from 2014/taste/stringer.go
rename to content/2014/taste/stringer.go
diff --git a/2014/taste/walk.go b/content/2014/taste/walk.go
similarity index 100%
rename from 2014/taste/walk.go
rename to content/2014/taste/walk.go
diff --git a/2014/taste/weekday.go b/content/2014/taste/weekday.go
similarity index 100%
rename from 2014/taste/weekday.go
rename to content/2014/taste/weekday.go
diff --git a/2014/testing.slide b/content/2014/testing.slide
similarity index 100%
rename from 2014/testing.slide
rename to content/2014/testing.slide
diff --git a/2014/testing/cover.png b/content/2014/testing/cover.png
similarity index 100%
rename from 2014/testing/cover.png
rename to content/2014/testing/cover.png
Binary files differ
diff --git a/2014/testing/go1.1.png b/content/2014/testing/go1.1.png
similarity index 100%
rename from 2014/testing/go1.1.png
rename to content/2014/testing/go1.1.png
Binary files differ
diff --git a/2014/testing/httprecorder.go b/content/2014/testing/httprecorder.go
similarity index 100%
rename from 2014/testing/httprecorder.go
rename to content/2014/testing/httprecorder.go
diff --git a/2014/testing/httpserver.go b/content/2014/testing/httpserver.go
similarity index 100%
rename from 2014/testing/httpserver.go
rename to content/2014/testing/httpserver.go
diff --git a/2014/testing/subprocess/subprocess.go b/content/2014/testing/subprocess/subprocess.go
similarity index 100%
rename from 2014/testing/subprocess/subprocess.go
rename to content/2014/testing/subprocess/subprocess.go
diff --git a/2014/testing/subprocess/subprocess_test.go b/content/2014/testing/subprocess/subprocess_test.go
similarity index 100%
rename from 2014/testing/subprocess/subprocess_test.go
rename to content/2014/testing/subprocess/subprocess_test.go
diff --git a/2014/testing/test1/string_test.go b/content/2014/testing/test1/string_test.go
similarity index 100%
rename from 2014/testing/test1/string_test.go
rename to content/2014/testing/test1/string_test.go
diff --git a/2014/testing/test2/string_test.go b/content/2014/testing/test2/string_test.go
similarity index 100%
rename from 2014/testing/test2/string_test.go
rename to content/2014/testing/test2/string_test.go
diff --git a/2015/dynamic-tools.slide b/content/2015/dynamic-tools.slide
similarity index 100%
rename from 2015/dynamic-tools.slide
rename to content/2015/dynamic-tools.slide
diff --git a/2015/dynamic-tools/algo.png b/content/2015/dynamic-tools/algo.png
similarity index 100%
rename from 2015/dynamic-tools/algo.png
rename to content/2015/dynamic-tools/algo.png
Binary files differ
diff --git a/2015/dynamic-tools/go-fuzz.png b/content/2015/dynamic-tools/go-fuzz.png
similarity index 100%
rename from 2015/dynamic-tools/go-fuzz.png
rename to content/2015/dynamic-tools/go-fuzz.png
Binary files differ
diff --git a/2015/dynamic-tools/philosoraptor.png b/content/2015/dynamic-tools/philosoraptor.png
similarity index 100%
rename from 2015/dynamic-tools/philosoraptor.png
rename to content/2015/dynamic-tools/philosoraptor.png
Binary files differ
diff --git a/2015/dynamic-tools/trace.png b/content/2015/dynamic-tools/trace.png
similarity index 100%
rename from 2015/dynamic-tools/trace.png
rename to content/2015/dynamic-tools/trace.png
Binary files differ
diff --git a/2015/dynamic-tools/tracer.png b/content/2015/dynamic-tools/tracer.png
similarity index 100%
rename from 2015/dynamic-tools/tracer.png
rename to content/2015/dynamic-tools/tracer.png
Binary files differ
diff --git a/2015/go-for-java-programmers.slide b/content/2015/go-for-java-programmers.slide
similarity index 100%
rename from 2015/go-for-java-programmers.slide
rename to content/2015/go-for-java-programmers.slide
diff --git a/2015/go-for-java-programmers/builtin.go b/content/2015/go-for-java-programmers/builtin.go
similarity index 100%
rename from 2015/go-for-java-programmers/builtin.go
rename to content/2015/go-for-java-programmers/builtin.go
diff --git a/2015/go-for-java-programmers/channel.go b/content/2015/go-for-java-programmers/channel.go
similarity index 100%
rename from 2015/go-for-java-programmers/channel.go
rename to content/2015/go-for-java-programmers/channel.go
diff --git a/2015/go-for-java-programmers/closure.go b/content/2015/go-for-java-programmers/closure.go
similarity index 100%
rename from 2015/go-for-java-programmers/closure.go
rename to content/2015/go-for-java-programmers/closure.go
diff --git a/2015/go-for-java-programmers/error.go b/content/2015/go-for-java-programmers/error.go
similarity index 100%
rename from 2015/go-for-java-programmers/error.go
rename to content/2015/go-for-java-programmers/error.go
diff --git a/2015/go-for-java-programmers/first.go b/content/2015/go-for-java-programmers/first.go
similarity index 100%
rename from 2015/go-for-java-programmers/first.go
rename to content/2015/go-for-java-programmers/first.go
diff --git a/2015/go-for-java-programmers/frontend-screenshot.png b/content/2015/go-for-java-programmers/frontend-screenshot.png
similarity index 100%
rename from 2015/go-for-java-programmers/frontend-screenshot.png
rename to content/2015/go-for-java-programmers/frontend-screenshot.png
Binary files differ
diff --git a/2015/go-for-java-programmers/frontend.go b/content/2015/go-for-java-programmers/frontend.go
similarity index 100%
rename from 2015/go-for-java-programmers/frontend.go
rename to content/2015/go-for-java-programmers/frontend.go
diff --git a/2015/go-for-java-programmers/func.go b/content/2015/go-for-java-programmers/func.go
similarity index 100%
rename from 2015/go-for-java-programmers/func.go
rename to content/2015/go-for-java-programmers/func.go
diff --git a/2015/go-for-java-programmers/gofmt-after.go b/content/2015/go-for-java-programmers/gofmt-after.go
similarity index 100%
rename from 2015/go-for-java-programmers/gofmt-after.go
rename to content/2015/go-for-java-programmers/gofmt-after.go
diff --git a/2015/go-for-java-programmers/goimports-after.go b/content/2015/go-for-java-programmers/goimports-after.go
similarity index 100%
rename from 2015/go-for-java-programmers/goimports-after.go
rename to content/2015/go-for-java-programmers/goimports-after.go
diff --git a/2015/go-for-java-programmers/goimports-before.go b/content/2015/go-for-java-programmers/goimports-before.go
similarity index 100%
rename from 2015/go-for-java-programmers/goimports-before.go
rename to content/2015/go-for-java-programmers/goimports-before.go
diff --git a/2015/go-for-java-programmers/google-first.go b/content/2015/go-for-java-programmers/google-first.go
similarity index 100%
rename from 2015/go-for-java-programmers/google-first.go
rename to content/2015/go-for-java-programmers/google-first.go
diff --git a/2015/go-for-java-programmers/google-parallel.go b/content/2015/go-for-java-programmers/google-parallel.go
similarity index 100%
rename from 2015/go-for-java-programmers/google-parallel.go
rename to content/2015/go-for-java-programmers/google-parallel.go
diff --git a/2015/go-for-java-programmers/google-serial.go b/content/2015/go-for-java-programmers/google-serial.go
similarity index 100%
rename from 2015/go-for-java-programmers/google-serial.go
rename to content/2015/go-for-java-programmers/google-serial.go
diff --git a/2015/go-for-java-programmers/google-timeout.go b/content/2015/go-for-java-programmers/google-timeout.go
similarity index 100%
rename from 2015/go-for-java-programmers/google-timeout.go
rename to content/2015/go-for-java-programmers/google-timeout.go
diff --git a/2015/go-for-java-programmers/google1.jpg b/content/2015/go-for-java-programmers/google1.jpg
similarity index 100%
rename from 2015/go-for-java-programmers/google1.jpg
rename to content/2015/go-for-java-programmers/google1.jpg
Binary files differ
diff --git a/2015/go-for-java-programmers/google14.jpg b/content/2015/go-for-java-programmers/google14.jpg
similarity index 100%
rename from 2015/go-for-java-programmers/google14.jpg
rename to content/2015/go-for-java-programmers/google14.jpg
Binary files differ
diff --git a/2015/go-for-java-programmers/google17.jpg b/content/2015/go-for-java-programmers/google17.jpg
similarity index 100%
rename from 2015/go-for-java-programmers/google17.jpg
rename to content/2015/go-for-java-programmers/google17.jpg
Binary files differ
diff --git a/2015/go-for-java-programmers/google20.jpg b/content/2015/go-for-java-programmers/google20.jpg
similarity index 100%
rename from 2015/go-for-java-programmers/google20.jpg
rename to content/2015/go-for-java-programmers/google20.jpg
Binary files differ
diff --git a/2015/go-for-java-programmers/goroutine.go b/content/2015/go-for-java-programmers/goroutine.go
similarity index 100%
rename from 2015/go-for-java-programmers/goroutine.go
rename to content/2015/go-for-java-programmers/goroutine.go
diff --git a/2015/go-for-java-programmers/hello/Main.class b/content/2015/go-for-java-programmers/hello/Main.class
similarity index 100%
rename from 2015/go-for-java-programmers/hello/Main.class
rename to content/2015/go-for-java-programmers/hello/Main.class
Binary files differ
diff --git a/2015/go-for-java-programmers/hello/Main.java b/content/2015/go-for-java-programmers/hello/Main.java
similarity index 100%
rename from 2015/go-for-java-programmers/hello/Main.java
rename to content/2015/go-for-java-programmers/hello/Main.java
diff --git a/2015/go-for-java-programmers/hello/hello.go b/content/2015/go-for-java-programmers/hello/hello.go
similarity index 100%
rename from 2015/go-for-java-programmers/hello/hello.go
rename to content/2015/go-for-java-programmers/hello/hello.go
diff --git a/2015/go-for-java-programmers/hello/server.go b/content/2015/go-for-java-programmers/hello/server.go
similarity index 100%
rename from 2015/go-for-java-programmers/hello/server.go
rename to content/2015/go-for-java-programmers/hello/server.go
diff --git a/2015/go-for-java-programmers/interface.go b/content/2015/go-for-java-programmers/interface.go
similarity index 100%
rename from 2015/go-for-java-programmers/interface.go
rename to content/2015/go-for-java-programmers/interface.go
diff --git a/2015/go-for-java-programmers/method.go b/content/2015/go-for-java-programmers/method.go
similarity index 100%
rename from 2015/go-for-java-programmers/method.go
rename to content/2015/go-for-java-programmers/method.go
diff --git a/2015/go-for-java-programmers/panic.go b/content/2015/go-for-java-programmers/panic.go
similarity index 100%
rename from 2015/go-for-java-programmers/panic.go
rename to content/2015/go-for-java-programmers/panic.go
diff --git a/2015/go-for-java-programmers/pingpipe.go b/content/2015/go-for-java-programmers/pingpipe.go
similarity index 100%
rename from 2015/go-for-java-programmers/pingpipe.go
rename to content/2015/go-for-java-programmers/pingpipe.go
diff --git a/2015/go-for-java-programmers/pingpong.go b/content/2015/go-for-java-programmers/pingpong.go
similarity index 100%
rename from 2015/go-for-java-programmers/pingpong.go
rename to content/2015/go-for-java-programmers/pingpong.go
diff --git a/2015/go-for-java-programmers/pingselect.go b/content/2015/go-for-java-programmers/pingselect.go
similarity index 100%
rename from 2015/go-for-java-programmers/pingselect.go
rename to content/2015/go-for-java-programmers/pingselect.go
diff --git a/2015/go-for-java-programmers/player.go b/content/2015/go-for-java-programmers/player.go
similarity index 100%
rename from 2015/go-for-java-programmers/player.go
rename to content/2015/go-for-java-programmers/player.go
diff --git a/2015/go-for-java-programmers/pointer.go b/content/2015/go-for-java-programmers/pointer.go
similarity index 100%
rename from 2015/go-for-java-programmers/pointer.go
rename to content/2015/go-for-java-programmers/pointer.go
diff --git a/2015/go-for-java-programmers/safe.go b/content/2015/go-for-java-programmers/safe.go
similarity index 100%
rename from 2015/go-for-java-programmers/safe.go
rename to content/2015/go-for-java-programmers/safe.go
diff --git a/2015/go-for-java-programmers/spdy.png b/content/2015/go-for-java-programmers/spdy.png
similarity index 100%
rename from 2015/go-for-java-programmers/spdy.png
rename to content/2015/go-for-java-programmers/spdy.png
Binary files differ
diff --git a/2015/go-for-java-programmers/struct.go b/content/2015/go-for-java-programmers/struct.go
similarity index 100%
rename from 2015/go-for-java-programmers/struct.go
rename to content/2015/go-for-java-programmers/struct.go
diff --git a/2015/go-gc.pdf b/content/2015/go-gc.pdf
similarity index 100%
rename from 2015/go-gc.pdf
rename to content/2015/go-gc.pdf
Binary files differ
diff --git a/2015/go4cpp.slide b/content/2015/go4cpp.slide
similarity index 100%
rename from 2015/go4cpp.slide
rename to content/2015/go4cpp.slide
diff --git a/2015/go4cpp/badcounter.go b/content/2015/go4cpp/badcounter.go
similarity index 100%
rename from 2015/go4cpp/badcounter.go
rename to content/2015/go4cpp/badcounter.go
diff --git a/2015/go4cpp/battle.go b/content/2015/go4cpp/battle.go
similarity index 100%
rename from 2015/go4cpp/battle.go
rename to content/2015/go4cpp/battle.go
diff --git a/2015/go4cpp/busy.jpg b/content/2015/go4cpp/busy.jpg
similarity index 100%
rename from 2015/go4cpp/busy.jpg
rename to content/2015/go4cpp/busy.jpg
Binary files differ
diff --git a/2015/go4cpp/chain.jpg b/content/2015/go4cpp/chain.jpg
similarity index 100%
rename from 2015/go4cpp/chain.jpg
rename to content/2015/go4cpp/chain.jpg
Binary files differ
diff --git a/2015/go4cpp/chan.go b/content/2015/go4cpp/chan.go
similarity index 100%
rename from 2015/go4cpp/chan.go
rename to content/2015/go4cpp/chan.go
diff --git a/2015/go4cpp/conc.jpg b/content/2015/go4cpp/conc.jpg
similarity index 100%
rename from 2015/go4cpp/conc.jpg
rename to content/2015/go4cpp/conc.jpg
Binary files differ
diff --git a/2015/go4cpp/conc1.go b/content/2015/go4cpp/conc1.go
similarity index 100%
rename from 2015/go4cpp/conc1.go
rename to content/2015/go4cpp/conc1.go
diff --git a/2015/go4cpp/conc2.go b/content/2015/go4cpp/conc2.go
similarity index 100%
rename from 2015/go4cpp/conc2.go
rename to content/2015/go4cpp/conc2.go
diff --git a/2015/go4cpp/conc3.go b/content/2015/go4cpp/conc3.go
similarity index 100%
rename from 2015/go4cpp/conc3.go
rename to content/2015/go4cpp/conc3.go
diff --git a/2015/go4cpp/defer.go b/content/2015/go4cpp/defer.go
similarity index 100%
rename from 2015/go4cpp/defer.go
rename to content/2015/go4cpp/defer.go
diff --git a/2015/go4cpp/diamond.go b/content/2015/go4cpp/diamond.go
similarity index 100%
rename from 2015/go4cpp/diamond.go
rename to content/2015/go4cpp/diamond.go
diff --git a/2015/go4cpp/duck.jpg b/content/2015/go4cpp/duck.jpg
similarity index 100%
rename from 2015/go4cpp/duck.jpg
rename to content/2015/go4cpp/duck.jpg
Binary files differ
diff --git a/2015/go4cpp/embedding.go b/content/2015/go4cpp/embedding.go
similarity index 100%
rename from 2015/go4cpp/embedding.go
rename to content/2015/go4cpp/embedding.go
diff --git a/2015/go4cpp/funcdraw.png b/content/2015/go4cpp/funcdraw.png
similarity index 100%
rename from 2015/go4cpp/funcdraw.png
rename to content/2015/go4cpp/funcdraw.png
Binary files differ
diff --git a/2015/go4cpp/funnelin.jpg b/content/2015/go4cpp/funnelin.jpg
similarity index 100%
rename from 2015/go4cpp/funnelin.jpg
rename to content/2015/go4cpp/funnelin.jpg
Binary files differ
diff --git a/2015/go4cpp/goodcounter.go b/content/2015/go4cpp/goodcounter.go
similarity index 100%
rename from 2015/go4cpp/goodcounter.go
rename to content/2015/go4cpp/goodcounter.go
diff --git a/2015/go4cpp/goroutines.go b/content/2015/go4cpp/goroutines.go
similarity index 100%
rename from 2015/go4cpp/goroutines.go
rename to content/2015/go4cpp/goroutines.go
diff --git a/2015/go4cpp/mock.go b/content/2015/go4cpp/mock.go
similarity index 100%
rename from 2015/go4cpp/mock.go
rename to content/2015/go4cpp/mock.go
diff --git a/2015/go4cpp/sizes.go b/content/2015/go4cpp/sizes.go
similarity index 100%
rename from 2015/go4cpp/sizes.go
rename to content/2015/go4cpp/sizes.go
diff --git a/2015/go4cpp/trends.png b/content/2015/go4cpp/trends.png
similarity index 100%
rename from 2015/go4cpp/trends.png
rename to content/2015/go4cpp/trends.png
Binary files differ
diff --git a/2015/go4cpp/webserver.go b/content/2015/go4cpp/webserver.go
similarity index 100%
rename from 2015/go4cpp/webserver.go
rename to content/2015/go4cpp/webserver.go
diff --git a/2015/gofmt-cn.slide b/content/2015/gofmt-cn.slide
similarity index 100%
rename from 2015/gofmt-cn.slide
rename to content/2015/gofmt-cn.slide
diff --git a/2015/gofmt-en.slide b/content/2015/gofmt-en.slide
similarity index 100%
rename from 2015/gofmt-en.slide
rename to content/2015/gofmt-en.slide
diff --git a/2015/gofmt/biggerpic.jpg b/content/2015/gofmt/biggerpic.jpg
similarity index 100%
rename from 2015/gofmt/biggerpic.jpg
rename to content/2015/gofmt/biggerpic.jpg
Binary files differ
diff --git a/2015/gofmt/bigpic.jpg b/content/2015/gofmt/bigpic.jpg
similarity index 100%
rename from 2015/gofmt/bigpic.jpg
rename to content/2015/gofmt/bigpic.jpg
Binary files differ
diff --git a/2015/gofmt/comments.jpg b/content/2015/gofmt/comments.jpg
similarity index 100%
rename from 2015/gofmt/comments.jpg
rename to content/2015/gofmt/comments.jpg
Binary files differ
diff --git a/2015/gofmt/merge.jpg b/content/2015/gofmt/merge.jpg
similarity index 100%
rename from 2015/gofmt/merge.jpg
rename to content/2015/gofmt/merge.jpg
Binary files differ
diff --git a/2015/gofmt/tabstops.jpg b/content/2015/gofmt/tabstops.jpg
similarity index 100%
rename from 2015/gofmt/tabstops.jpg
rename to content/2015/gofmt/tabstops.jpg
Binary files differ
diff --git a/2015/gogo.slide b/content/2015/gogo.slide
similarity index 100%
rename from 2015/gogo.slide
rename to content/2015/gogo.slide
diff --git a/2015/gophercon-go-on-mobile.slide b/content/2015/gophercon-go-on-mobile.slide
similarity index 100%
rename from 2015/gophercon-go-on-mobile.slide
rename to content/2015/gophercon-go-on-mobile.slide
diff --git a/2015/gophercon-go-on-mobile/README b/content/2015/gophercon-go-on-mobile/README
similarity index 100%
rename from 2015/gophercon-go-on-mobile/README
rename to content/2015/gophercon-go-on-mobile/README
diff --git a/2015/gophercon-go-on-mobile/androidstudio2.png b/content/2015/gophercon-go-on-mobile/androidstudio2.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/androidstudio2.png
rename to content/2015/gophercon-go-on-mobile/androidstudio2.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/canihas.jpg b/content/2015/gophercon-go-on-mobile/canihas.jpg
similarity index 100%
rename from 2015/gophercon-go-on-mobile/canihas.jpg
rename to content/2015/gophercon-go-on-mobile/canihas.jpg
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/caution.png b/content/2015/gophercon-go-on-mobile/caution.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/caution.png
rename to content/2015/gophercon-go-on-mobile/caution.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/contributors.png b/content/2015/gophercon-go-on-mobile/contributors.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/contributors.png
rename to content/2015/gophercon-go-on-mobile/contributors.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/gobind.png b/content/2015/gophercon-go-on-mobile/gobind.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/gobind.png
rename to content/2015/gophercon-go-on-mobile/gobind.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/gophercloud.png b/content/2015/gophercon-go-on-mobile/gophercloud.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/gophercloud.png
rename to content/2015/gophercon-go-on-mobile/gophercloud.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/ivyabout.png b/content/2015/gophercon-go-on-mobile/ivyabout.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/ivyabout.png
rename to content/2015/gophercon-go-on-mobile/ivyabout.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/ivymobile.png b/content/2015/gophercon-go-on-mobile/ivymobile.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/ivymobile.png
rename to content/2015/gophercon-go-on-mobile/ivymobile.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/ivyscreenshot2.png b/content/2015/gophercon-go-on-mobile/ivyscreenshot2.png
similarity index 100%
rename from 2015/gophercon-go-on-mobile/ivyscreenshot2.png
rename to content/2015/gophercon-go-on-mobile/ivyscreenshot2.png
Binary files differ
diff --git a/2015/gophercon-go-on-mobile/memegobind.jpg b/content/2015/gophercon-go-on-mobile/memegobind.jpg
similarity index 100%
rename from 2015/gophercon-go-on-mobile/memegobind.jpg
rename to content/2015/gophercon-go-on-mobile/memegobind.jpg
Binary files differ
diff --git a/2015/gophercon-goevolution.slide b/content/2015/gophercon-goevolution.slide
similarity index 100%
rename from 2015/gophercon-goevolution.slide
rename to content/2015/gophercon-goevolution.slide
diff --git a/2015/gophercon-goevolution/GopherEvolution.svg b/content/2015/gophercon-goevolution/GopherEvolution.svg
similarity index 100%
rename from 2015/gophercon-goevolution/GopherEvolution.svg
rename to content/2015/gophercon-goevolution/GopherEvolution.svg
diff --git a/2015/gophercon-goevolution/HoaresPLHints.JPG b/content/2015/gophercon-goevolution/HoaresPLHints.JPG
similarity index 100%
rename from 2015/gophercon-goevolution/HoaresPLHints.JPG
rename to content/2015/gophercon-goevolution/HoaresPLHints.JPG
Binary files differ
diff --git a/2015/gotham-grpc.slide b/content/2015/gotham-grpc.slide
similarity index 100%
rename from 2015/gotham-grpc.slide
rename to content/2015/gotham-grpc.slide
diff --git a/2015/gotham-grpc/backend.svg b/content/2015/gotham-grpc/backend.svg
similarity index 100%
rename from 2015/gotham-grpc/backend.svg
rename to content/2015/gotham-grpc/backend.svg
diff --git a/2015/gotham-grpc/backend/backend.go b/content/2015/gotham-grpc/backend/backend.go
similarity index 100%
rename from 2015/gotham-grpc/backend/backend.go
rename to content/2015/gotham-grpc/backend/backend.go
diff --git a/2015/gotham-grpc/client.svg b/content/2015/gotham-grpc/client.svg
similarity index 100%
rename from 2015/gotham-grpc/client.svg
rename to content/2015/gotham-grpc/client.svg
diff --git a/2015/gotham-grpc/client/client.go b/content/2015/gotham-grpc/client/client.go
similarity index 100%
rename from 2015/gotham-grpc/client/client.go
rename to content/2015/gotham-grpc/client/client.go
diff --git a/2015/gotham-grpc/frontend.svg b/content/2015/gotham-grpc/frontend.svg
similarity index 100%
rename from 2015/gotham-grpc/frontend.svg
rename to content/2015/gotham-grpc/frontend.svg
diff --git a/2015/gotham-grpc/frontend/frontend.go b/content/2015/gotham-grpc/frontend/frontend.go
similarity index 100%
rename from 2015/gotham-grpc/frontend/frontend.go
rename to content/2015/gotham-grpc/frontend/frontend.go
diff --git a/2015/gotham-grpc/search-only/README.md b/content/2015/gotham-grpc/search-only/README.md
similarity index 100%
rename from 2015/gotham-grpc/search-only/README.md
rename to content/2015/gotham-grpc/search-only/README.md
diff --git a/2015/gotham-grpc/search-only/search-only.pb.go b/content/2015/gotham-grpc/search-only/search-only.pb.go
similarity index 100%
rename from 2015/gotham-grpc/search-only/search-only.pb.go
rename to content/2015/gotham-grpc/search-only/search-only.pb.go
diff --git a/2015/gotham-grpc/search-only/search-only.proto b/content/2015/gotham-grpc/search-only/search-only.proto
similarity index 100%
rename from 2015/gotham-grpc/search-only/search-only.proto
rename to content/2015/gotham-grpc/search-only/search-only.proto
diff --git a/2015/gotham-grpc/search.svg b/content/2015/gotham-grpc/search.svg
similarity index 100%
rename from 2015/gotham-grpc/search.svg
rename to content/2015/gotham-grpc/search.svg
diff --git a/2015/gotham-grpc/search/README.md b/content/2015/gotham-grpc/search/README.md
similarity index 100%
rename from 2015/gotham-grpc/search/README.md
rename to content/2015/gotham-grpc/search/README.md
diff --git a/2015/gotham-grpc/search/search.pb.go b/content/2015/gotham-grpc/search/search.pb.go
similarity index 100%
rename from 2015/gotham-grpc/search/search.pb.go
rename to content/2015/gotham-grpc/search/search.pb.go
diff --git a/2015/gotham-grpc/search/search.proto b/content/2015/gotham-grpc/search/search.proto
similarity index 100%
rename from 2015/gotham-grpc/search/search.proto
rename to content/2015/gotham-grpc/search/search.proto
diff --git a/2015/gotham-grpc/system.svg b/content/2015/gotham-grpc/system.svg
similarity index 100%
rename from 2015/gotham-grpc/system.svg
rename to content/2015/gotham-grpc/system.svg
diff --git a/2015/gotham-grpc/watch.svg b/content/2015/gotham-grpc/watch.svg
similarity index 100%
rename from 2015/gotham-grpc/watch.svg
rename to content/2015/gotham-grpc/watch.svg
diff --git a/2015/how-go-was-made.slide b/content/2015/how-go-was-made.slide
similarity index 100%
rename from 2015/how-go-was-made.slide
rename to content/2015/how-go-was-made.slide
diff --git a/2015/how-go-was-made/5years.png b/content/2015/how-go-was-made/5years.png
similarity index 100%
rename from 2015/how-go-was-made/5years.png
rename to content/2015/how-go-was-made/5years.png
Binary files differ
diff --git a/2015/how-go-was-made/errors-discussion.png b/content/2015/how-go-was-made/errors-discussion.png
similarity index 100%
rename from 2015/how-go-was-made/errors-discussion.png
rename to content/2015/how-go-was-made/errors-discussion.png
Binary files differ
diff --git a/2015/how-go-was-made/errors-final.png b/content/2015/how-go-was-made/errors-final.png
similarity index 100%
rename from 2015/how-go-was-made/errors-final.png
rename to content/2015/how-go-was-made/errors-final.png
Binary files differ
diff --git a/2015/how-go-was-made/errors-issue.png b/content/2015/how-go-was-made/errors-issue.png
similarity index 100%
rename from 2015/how-go-was-made/errors-issue.png
rename to content/2015/how-go-was-made/errors-issue.png
Binary files differ
diff --git a/2015/how-go-was-made/errors-rog.png b/content/2015/how-go-was-made/errors-rog.png
similarity index 100%
rename from 2015/how-go-was-made/errors-rog.png
rename to content/2015/how-go-was-made/errors-rog.png
Binary files differ
diff --git a/2015/how-go-was-made/gopherswrench.jpg b/content/2015/how-go-was-made/gopherswrench.jpg
similarity index 100%
rename from 2015/how-go-was-made/gopherswrench.jpg
rename to content/2015/how-go-was-made/gopherswrench.jpg
Binary files differ
diff --git a/2015/how-go-was-made/mapchan.diff b/content/2015/how-go-was-made/mapchan.diff
similarity index 100%
rename from 2015/how-go-was-made/mapchan.diff
rename to content/2015/how-go-was-made/mapchan.diff
diff --git a/2015/how-go-was-made/reflect1.png b/content/2015/how-go-was-made/reflect1.png
similarity index 100%
rename from 2015/how-go-was-made/reflect1.png
rename to content/2015/how-go-was-made/reflect1.png
Binary files differ
diff --git a/2015/how-go-was-made/reflect2.png b/content/2015/how-go-was-made/reflect2.png
similarity index 100%
rename from 2015/how-go-was-made/reflect2.png
rename to content/2015/how-go-was-made/reflect2.png
Binary files differ
diff --git a/2015/how-go-was-made/reflect3.png b/content/2015/how-go-was-made/reflect3.png
similarity index 100%
rename from 2015/how-go-was-made/reflect3.png
rename to content/2015/how-go-was-made/reflect3.png
Binary files differ
diff --git a/2015/how-go-was-made/trends.png b/content/2015/how-go-was-made/trends.png
similarity index 100%
rename from 2015/how-go-was-made/trends.png
rename to content/2015/how-go-was-made/trends.png
Binary files differ
diff --git a/2015/how-go-was-made/website.png b/content/2015/how-go-was-made/website.png
similarity index 100%
rename from 2015/how-go-was-made/website.png
rename to content/2015/how-go-was-made/website.png
Binary files differ
diff --git a/2015/json.slide b/content/2015/json.slide
similarity index 100%
rename from 2015/json.slide
rename to content/2015/json.slide
diff --git a/2015/json/dates.go b/content/2015/json/dates.go
similarity index 100%
rename from 2015/json/dates.go
rename to content/2015/json/dates.go
diff --git a/2015/json/img/mindblown.gif b/content/2015/json/img/mindblown.gif
similarity index 100%
rename from 2015/json/img/mindblown.gif
rename to content/2015/json/img/mindblown.gif
Binary files differ
diff --git a/2015/json/roman_numerals.go b/content/2015/json/roman_numerals.go
similarity index 100%
rename from 2015/json/roman_numerals.go
rename to content/2015/json/roman_numerals.go
diff --git a/2015/json/secret.go b/content/2015/json/secret.go
similarity index 100%
rename from 2015/json/secret.go
rename to content/2015/json/secret.go
diff --git a/2015/json/unmarshaler0.go b/content/2015/json/unmarshaler0.go
similarity index 100%
rename from 2015/json/unmarshaler0.go
rename to content/2015/json/unmarshaler0.go
diff --git a/2015/json/unmarshaler0bad.go b/content/2015/json/unmarshaler0bad.go
similarity index 100%
rename from 2015/json/unmarshaler0bad.go
rename to content/2015/json/unmarshaler0bad.go
diff --git a/2015/json/unmarshaler0map.go b/content/2015/json/unmarshaler0map.go
similarity index 100%
rename from 2015/json/unmarshaler0map.go
rename to content/2015/json/unmarshaler0map.go
diff --git a/2015/json/unmarshaler1.go b/content/2015/json/unmarshaler1.go
similarity index 100%
rename from 2015/json/unmarshaler1.go
rename to content/2015/json/unmarshaler1.go
diff --git a/2015/json/unmarshaler2.go b/content/2015/json/unmarshaler2.go
similarity index 100%
rename from 2015/json/unmarshaler2.go
rename to content/2015/json/unmarshaler2.go
diff --git a/2015/json/unmarshaler3.go b/content/2015/json/unmarshaler3.go
similarity index 100%
rename from 2015/json/unmarshaler3.go
rename to content/2015/json/unmarshaler3.go
diff --git a/2015/json/unmarshaler4.go b/content/2015/json/unmarshaler4.go
similarity index 100%
rename from 2015/json/unmarshaler4.go
rename to content/2015/json/unmarshaler4.go
diff --git a/2015/keeping-up.slide b/content/2015/keeping-up.slide
similarity index 100%
rename from 2015/keeping-up.slide
rename to content/2015/keeping-up.slide
diff --git a/2015/keeping-up/backend_interface.diff b/content/2015/keeping-up/backend_interface.diff
similarity index 100%
rename from 2015/keeping-up/backend_interface.diff
rename to content/2015/keeping-up/backend_interface.diff
diff --git a/2015/keeping-up/cst.gcc b/content/2015/keeping-up/cst.gcc
similarity index 100%
rename from 2015/keeping-up/cst.gcc
rename to content/2015/keeping-up/cst.gcc
diff --git a/2015/keeping-up/escape.go b/content/2015/keeping-up/escape.go
similarity index 100%
rename from 2015/keeping-up/escape.go
rename to content/2015/keeping-up/escape.go
diff --git a/2015/keeping-up/escape.png b/content/2015/keeping-up/escape.png
similarity index 100%
rename from 2015/keeping-up/escape.png
rename to content/2015/keeping-up/escape.png
Binary files differ
diff --git a/2015/keeping-up/gccgo_structure.png b/content/2015/keeping-up/gccgo_structure.png
similarity index 100%
rename from 2015/keeping-up/gccgo_structure.png
rename to content/2015/keeping-up/gccgo_structure.png
Binary files differ
diff --git a/2015/keeping-up/go_build.log b/content/2015/keeping-up/go_build.log
similarity index 100%
rename from 2015/keeping-up/go_build.log
rename to content/2015/keeping-up/go_build.log
diff --git a/2015/keeping-up/gource_explosion.html b/content/2015/keeping-up/gource_explosion.html
similarity index 100%
rename from 2015/keeping-up/gource_explosion.html
rename to content/2015/keeping-up/gource_explosion.html
diff --git a/2015/simplicity-is-complicated.slide b/content/2015/simplicity-is-complicated.slide
similarity index 100%
rename from 2015/simplicity-is-complicated.slide
rename to content/2015/simplicity-is-complicated.slide
diff --git a/2015/simplicity-is-complicated/gophers.jpg b/content/2015/simplicity-is-complicated/gophers.jpg
similarity index 100%
rename from 2015/simplicity-is-complicated/gophers.jpg
rename to content/2015/simplicity-is-complicated/gophers.jpg
Binary files differ
diff --git a/2015/simplicity-is-complicated/gopherslide2sm.jpg b/content/2015/simplicity-is-complicated/gopherslide2sm.jpg
similarity index 100%
rename from 2015/simplicity-is-complicated/gopherslide2sm.jpg
rename to content/2015/simplicity-is-complicated/gopherslide2sm.jpg
Binary files differ
diff --git a/2015/simplicity-is-complicated/gopherslide2smblue.jpg b/content/2015/simplicity-is-complicated/gopherslide2smblue.jpg
similarity index 100%
rename from 2015/simplicity-is-complicated/gopherslide2smblue.jpg
rename to content/2015/simplicity-is-complicated/gopherslide2smblue.jpg
Binary files differ
diff --git a/2015/simplicity-is-complicated/gopherslide2smbrown.jpg b/content/2015/simplicity-is-complicated/gopherslide2smbrown.jpg
similarity index 100%
rename from 2015/simplicity-is-complicated/gopherslide2smbrown.jpg
rename to content/2015/simplicity-is-complicated/gopherslide2smbrown.jpg
Binary files differ
diff --git a/2015/simplicity-is-complicated/hello.go b/content/2015/simplicity-is-complicated/hello.go
similarity index 100%
rename from 2015/simplicity-is-complicated/hello.go
rename to content/2015/simplicity-is-complicated/hello.go
diff --git a/2015/simplicity-is-complicated/shift.go b/content/2015/simplicity-is-complicated/shift.go
similarity index 100%
rename from 2015/simplicity-is-complicated/shift.go
rename to content/2015/simplicity-is-complicated/shift.go
diff --git a/2015/state-of-go-may.slide b/content/2015/state-of-go-may.slide
similarity index 100%
rename from 2015/state-of-go-may.slide
rename to content/2015/state-of-go-may.slide
diff --git a/2015/state-of-go-may/conc-bench.png b/content/2015/state-of-go-may/conc-bench.png
similarity index 100%
rename from 2015/state-of-go-may/conc-bench.png
rename to content/2015/state-of-go-may/conc-bench.png
Binary files differ
diff --git a/2015/state-of-go-may/conc-chain.png b/content/2015/state-of-go-may/conc-chain.png
similarity index 100%
rename from 2015/state-of-go-may/conc-chain.png
rename to content/2015/state-of-go-may/conc-chain.png
Binary files differ
diff --git a/2015/state-of-go-may/conc-powser.png b/content/2015/state-of-go-may/conc-powser.png
similarity index 100%
rename from 2015/state-of-go-may/conc-powser.png
rename to content/2015/state-of-go-may/conc-powser.png
Binary files differ
diff --git a/2015/state-of-go-may/conc-practical.png b/content/2015/state-of-go-may/conc-practical.png
similarity index 100%
rename from 2015/state-of-go-may/conc-practical.png
rename to content/2015/state-of-go-may/conc-practical.png
Binary files differ
diff --git a/2015/state-of-go-may/conc-sieve.png b/content/2015/state-of-go-may/conc-sieve.png
similarity index 100%
rename from 2015/state-of-go-may/conc-sieve.png
rename to content/2015/state-of-go-may/conc-sieve.png
Binary files differ
diff --git a/2015/state-of-go-may/gc.png b/content/2015/state-of-go-may/gc.png
similarity index 100%
rename from 2015/state-of-go-may/gc.png
rename to content/2015/state-of-go-may/gc.png
Binary files differ
diff --git a/2015/state-of-go-may/gc2.png b/content/2015/state-of-go-may/gc2.png
similarity index 100%
rename from 2015/state-of-go-may/gc2.png
rename to content/2015/state-of-go-may/gc2.png
Binary files differ
diff --git a/2015/state-of-go-may/gcperf.png b/content/2015/state-of-go-may/gcperf.png
similarity index 100%
rename from 2015/state-of-go-may/gcperf.png
rename to content/2015/state-of-go-may/gcperf.png
Binary files differ
diff --git a/2015/state-of-go-may/go1bench.svg b/content/2015/state-of-go-may/go1bench.svg
similarity index 100%
rename from 2015/state-of-go-may/go1bench.svg
rename to content/2015/state-of-go-may/go1bench.svg
diff --git a/2015/state-of-go-may/gophercon.png b/content/2015/state-of-go-may/gophercon.png
similarity index 100%
rename from 2015/state-of-go-may/gophercon.png
rename to content/2015/state-of-go-may/gophercon.png
Binary files differ
diff --git a/2015/state-of-go-may/iphone.jpg b/content/2015/state-of-go-may/iphone.jpg
similarity index 100%
rename from 2015/state-of-go-may/iphone.jpg
rename to content/2015/state-of-go-may/iphone.jpg
Binary files differ
diff --git a/2015/state-of-go-may/perfchart.png b/content/2015/state-of-go-may/perfchart.png
similarity index 100%
rename from 2015/state-of-go-may/perfchart.png
rename to content/2015/state-of-go-may/perfchart.png
Binary files differ
diff --git a/2015/state-of-go.slide b/content/2015/state-of-go.slide
similarity index 100%
rename from 2015/state-of-go.slide
rename to content/2015/state-of-go.slide
diff --git a/2015/state-of-go/gala.jpg b/content/2015/state-of-go/gala.jpg
similarity index 100%
rename from 2015/state-of-go/gala.jpg
rename to content/2015/state-of-go/gala.jpg
Binary files differ
diff --git a/2015/state-of-go/trace.png b/content/2015/state-of-go/trace.png
similarity index 100%
rename from 2015/state-of-go/trace.png
rename to content/2015/state-of-go/trace.png
Binary files differ
diff --git a/2015/tricks.slide b/content/2015/tricks.slide
similarity index 100%
rename from 2015/tricks.slide
rename to content/2015/tricks.slide
diff --git a/2015/tricks/anon-interface.go b/content/2015/tricks/anon-interface.go
similarity index 100%
rename from 2015/tricks/anon-interface.go
rename to content/2015/tricks/anon-interface.go
diff --git a/2015/tricks/broadcastwriter/broadcastwriter.go b/content/2015/tricks/broadcastwriter/broadcastwriter.go
similarity index 100%
rename from 2015/tricks/broadcastwriter/broadcastwriter.go
rename to content/2015/tricks/broadcastwriter/broadcastwriter.go
diff --git a/2015/tricks/compare-map.go b/content/2015/tricks/compare-map.go
similarity index 100%
rename from 2015/tricks/compare-map.go
rename to content/2015/tricks/compare-map.go
diff --git a/2015/tricks/compare.go b/content/2015/tricks/compare.go
similarity index 100%
rename from 2015/tricks/compare.go
rename to content/2015/tricks/compare.go
diff --git a/2015/tricks/compare2.go b/content/2015/tricks/compare2.go
similarity index 100%
rename from 2015/tricks/compare2.go
rename to content/2015/tricks/compare2.go
diff --git a/2015/tricks/cons.go b/content/2015/tricks/cons.go
similarity index 100%
rename from 2015/tricks/cons.go
rename to content/2015/tricks/cons.go
diff --git a/2015/tricks/embed.go b/content/2015/tricks/embed.go
similarity index 100%
rename from 2015/tricks/embed.go
rename to content/2015/tricks/embed.go
diff --git a/2015/tricks/json-decode.go b/content/2015/tricks/json-decode.go
similarity index 100%
rename from 2015/tricks/json-decode.go
rename to content/2015/tricks/json-decode.go
diff --git a/2015/tricks/json-encode.go b/content/2015/tricks/json-encode.go
similarity index 100%
rename from 2015/tricks/json-encode.go
rename to content/2015/tricks/json-encode.go
diff --git a/2015/tricks/json-nest.go b/content/2015/tricks/json-nest.go
similarity index 100%
rename from 2015/tricks/json-nest.go
rename to content/2015/tricks/json-nest.go
diff --git a/2015/tricks/method-http.go b/content/2015/tricks/method-http.go
similarity index 100%
rename from 2015/tricks/method-http.go
rename to content/2015/tricks/method-http.go
diff --git a/2015/tricks/method-once.go b/content/2015/tricks/method-once.go
similarity index 100%
rename from 2015/tricks/method-once.go
rename to content/2015/tricks/method-once.go
diff --git a/2015/tricks/method-values-1.go b/content/2015/tricks/method-values-1.go
similarity index 100%
rename from 2015/tricks/method-values-1.go
rename to content/2015/tricks/method-values-1.go
diff --git a/2015/tricks/method-values-2.go b/content/2015/tricks/method-values-2.go
similarity index 100%
rename from 2015/tricks/method-values-2.go
rename to content/2015/tricks/method-values-2.go
diff --git a/2015/tricks/repeated.go b/content/2015/tricks/repeated.go
similarity index 100%
rename from 2015/tricks/repeated.go
rename to content/2015/tricks/repeated.go
diff --git a/2015/tricks/repeated2.go b/content/2015/tricks/repeated2.go
similarity index 100%
rename from 2015/tricks/repeated2.go
rename to content/2015/tricks/repeated2.go
diff --git a/2015/tricks/string_test.go b/content/2015/tricks/string_test.go
similarity index 100%
rename from 2015/tricks/string_test.go
rename to content/2015/tricks/string_test.go
diff --git a/2015/tricks/string_test2.go b/content/2015/tricks/string_test2.go
similarity index 100%
rename from 2015/tricks/string_test2.go
rename to content/2015/tricks/string_test2.go
diff --git a/2015/tricks/subprocess/subprocess.go b/content/2015/tricks/subprocess/subprocess.go
similarity index 100%
rename from 2015/tricks/subprocess/subprocess.go
rename to content/2015/tricks/subprocess/subprocess.go
diff --git a/2015/tricks/subprocess/subprocess_test.go b/content/2015/tricks/subprocess/subprocess_test.go
similarity index 100%
rename from 2015/tricks/subprocess/subprocess_test.go
rename to content/2015/tricks/subprocess/subprocess_test.go
diff --git a/2015/tricks/template.go b/content/2015/tricks/template.go
similarity index 100%
rename from 2015/tricks/template.go
rename to content/2015/tricks/template.go
diff --git a/2015/tricks/time-deps.png b/content/2015/tricks/time-deps.png
similarity index 100%
rename from 2015/tricks/time-deps.png
rename to content/2015/tricks/time-deps.png
Binary files differ
diff --git a/2015/using-go-types-for-tools.html b/content/2015/using-go-types-for-tools.html
similarity index 100%
rename from 2015/using-go-types-for-tools.html
rename to content/2015/using-go-types-for-tools.html
diff --git a/2016/applicative.slide b/content/2016/applicative.slide
similarity index 100%
rename from 2016/applicative.slide
rename to content/2016/applicative.slide
diff --git a/2016/applicative/builtin.go b/content/2016/applicative/builtin.go
similarity index 100%
rename from 2016/applicative/builtin.go
rename to content/2016/applicative/builtin.go
diff --git a/2016/applicative/channel.go b/content/2016/applicative/channel.go
similarity index 100%
rename from 2016/applicative/channel.go
rename to content/2016/applicative/channel.go
diff --git a/2016/applicative/closure.go b/content/2016/applicative/closure.go
similarity index 100%
rename from 2016/applicative/closure.go
rename to content/2016/applicative/closure.go
diff --git a/2016/applicative/error.go b/content/2016/applicative/error.go
similarity index 100%
rename from 2016/applicative/error.go
rename to content/2016/applicative/error.go
diff --git a/2016/applicative/first.go b/content/2016/applicative/first.go
similarity index 100%
rename from 2016/applicative/first.go
rename to content/2016/applicative/first.go
diff --git a/2016/applicative/frontend-screenshot.png b/content/2016/applicative/frontend-screenshot.png
similarity index 100%
rename from 2016/applicative/frontend-screenshot.png
rename to content/2016/applicative/frontend-screenshot.png
Binary files differ
diff --git a/2016/applicative/frontend.go b/content/2016/applicative/frontend.go
similarity index 100%
rename from 2016/applicative/frontend.go
rename to content/2016/applicative/frontend.go
diff --git a/2016/applicative/func.go b/content/2016/applicative/func.go
similarity index 100%
rename from 2016/applicative/func.go
rename to content/2016/applicative/func.go
diff --git a/2016/applicative/gofmt-after.go b/content/2016/applicative/gofmt-after.go
similarity index 100%
rename from 2016/applicative/gofmt-after.go
rename to content/2016/applicative/gofmt-after.go
diff --git a/2016/applicative/goimports-after.go b/content/2016/applicative/goimports-after.go
similarity index 100%
rename from 2016/applicative/goimports-after.go
rename to content/2016/applicative/goimports-after.go
diff --git a/2016/applicative/goimports-before.go b/content/2016/applicative/goimports-before.go
similarity index 100%
rename from 2016/applicative/goimports-before.go
rename to content/2016/applicative/goimports-before.go
diff --git a/2016/applicative/google-parallel.go b/content/2016/applicative/google-parallel.go
similarity index 100%
rename from 2016/applicative/google-parallel.go
rename to content/2016/applicative/google-parallel.go
diff --git a/2016/applicative/google-replicated.go b/content/2016/applicative/google-replicated.go
similarity index 100%
rename from 2016/applicative/google-replicated.go
rename to content/2016/applicative/google-replicated.go
diff --git a/2016/applicative/google-serial.go b/content/2016/applicative/google-serial.go
similarity index 100%
rename from 2016/applicative/google-serial.go
rename to content/2016/applicative/google-serial.go
diff --git a/2016/applicative/google-timeout.go b/content/2016/applicative/google-timeout.go
similarity index 100%
rename from 2016/applicative/google-timeout.go
rename to content/2016/applicative/google-timeout.go
diff --git a/2016/applicative/google/fake.go b/content/2016/applicative/google/fake.go
similarity index 100%
rename from 2016/applicative/google/fake.go
rename to content/2016/applicative/google/fake.go
diff --git a/2016/applicative/google/first.go b/content/2016/applicative/google/first.go
similarity index 100%
rename from 2016/applicative/google/first.go
rename to content/2016/applicative/google/first.go
diff --git a/2016/applicative/google/parallel.go b/content/2016/applicative/google/parallel.go
similarity index 100%
rename from 2016/applicative/google/parallel.go
rename to content/2016/applicative/google/parallel.go
diff --git a/2016/applicative/google/serial.go b/content/2016/applicative/google/serial.go
similarity index 100%
rename from 2016/applicative/google/serial.go
rename to content/2016/applicative/google/serial.go
diff --git a/2016/applicative/google/timeout.go b/content/2016/applicative/google/timeout.go
similarity index 100%
rename from 2016/applicative/google/timeout.go
rename to content/2016/applicative/google/timeout.go
diff --git a/2016/applicative/google1.jpg b/content/2016/applicative/google1.jpg
similarity index 100%
rename from 2016/applicative/google1.jpg
rename to content/2016/applicative/google1.jpg
Binary files differ
diff --git a/2016/applicative/google14.jpg b/content/2016/applicative/google14.jpg
similarity index 100%
rename from 2016/applicative/google14.jpg
rename to content/2016/applicative/google14.jpg
Binary files differ
diff --git a/2016/applicative/google17.jpg b/content/2016/applicative/google17.jpg
similarity index 100%
rename from 2016/applicative/google17.jpg
rename to content/2016/applicative/google17.jpg
Binary files differ
diff --git a/2016/applicative/google20.jpg b/content/2016/applicative/google20.jpg
similarity index 100%
rename from 2016/applicative/google20.jpg
rename to content/2016/applicative/google20.jpg
Binary files differ
diff --git a/2016/applicative/goroutine.go b/content/2016/applicative/goroutine.go
similarity index 100%
rename from 2016/applicative/goroutine.go
rename to content/2016/applicative/goroutine.go
diff --git a/2016/applicative/hello/Main.class b/content/2016/applicative/hello/Main.class
similarity index 100%
rename from 2016/applicative/hello/Main.class
rename to content/2016/applicative/hello/Main.class
Binary files differ
diff --git a/2016/applicative/hello/Main.java b/content/2016/applicative/hello/Main.java
similarity index 100%
rename from 2016/applicative/hello/Main.java
rename to content/2016/applicative/hello/Main.java
diff --git a/2016/applicative/hello/hello.go b/content/2016/applicative/hello/hello.go
similarity index 100%
rename from 2016/applicative/hello/hello.go
rename to content/2016/applicative/hello/hello.go
diff --git a/2016/applicative/hello/server.go b/content/2016/applicative/hello/server.go
similarity index 100%
rename from 2016/applicative/hello/server.go
rename to content/2016/applicative/hello/server.go
diff --git a/2016/applicative/interface.go b/content/2016/applicative/interface.go
similarity index 100%
rename from 2016/applicative/interface.go
rename to content/2016/applicative/interface.go
diff --git a/2016/applicative/method.go b/content/2016/applicative/method.go
similarity index 100%
rename from 2016/applicative/method.go
rename to content/2016/applicative/method.go
diff --git a/2016/applicative/panic.go b/content/2016/applicative/panic.go
similarity index 100%
rename from 2016/applicative/panic.go
rename to content/2016/applicative/panic.go
diff --git a/2016/applicative/pingpipe.go b/content/2016/applicative/pingpipe.go
similarity index 100%
rename from 2016/applicative/pingpipe.go
rename to content/2016/applicative/pingpipe.go
diff --git a/2016/applicative/pingpong.go b/content/2016/applicative/pingpong.go
similarity index 100%
rename from 2016/applicative/pingpong.go
rename to content/2016/applicative/pingpong.go
diff --git a/2016/applicative/pingselect.go b/content/2016/applicative/pingselect.go
similarity index 100%
rename from 2016/applicative/pingselect.go
rename to content/2016/applicative/pingselect.go
diff --git a/2016/applicative/player.go b/content/2016/applicative/player.go
similarity index 100%
rename from 2016/applicative/player.go
rename to content/2016/applicative/player.go
diff --git a/2016/applicative/pointer.go b/content/2016/applicative/pointer.go
similarity index 100%
rename from 2016/applicative/pointer.go
rename to content/2016/applicative/pointer.go
diff --git a/2016/applicative/safe.go b/content/2016/applicative/safe.go
similarity index 100%
rename from 2016/applicative/safe.go
rename to content/2016/applicative/safe.go
diff --git a/2016/applicative/spdy.png b/content/2016/applicative/spdy.png
similarity index 100%
rename from 2016/applicative/spdy.png
rename to content/2016/applicative/spdy.png
Binary files differ
diff --git a/2016/applicative/struct.go b/content/2016/applicative/struct.go
similarity index 100%
rename from 2016/applicative/struct.go
rename to content/2016/applicative/struct.go
diff --git a/2016/asm.slide b/content/2016/asm.slide
similarity index 100%
rename from 2016/asm.slide
rename to content/2016/asm.slide
diff --git a/2016/asm/360.s.txt b/content/2016/asm/360.s.txt
similarity index 100%
rename from 2016/asm/360.s.txt
rename to content/2016/asm/360.s.txt
diff --git a/2016/asm/386.s.txt b/content/2016/asm/386.s.txt
similarity index 100%
rename from 2016/asm/386.s.txt
rename to content/2016/asm/386.s.txt
diff --git a/2016/asm/68000.s.txt b/content/2016/asm/68000.s.txt
similarity index 100%
rename from 2016/asm/68000.s.txt
rename to content/2016/asm/68000.s.txt
diff --git a/2016/asm/add.go b/content/2016/asm/add.go
similarity index 100%
rename from 2016/asm/add.go
rename to content/2016/asm/add.go
diff --git a/2016/asm/amd64.s.txt b/content/2016/asm/amd64.s.txt
similarity index 100%
rename from 2016/asm/amd64.s.txt
rename to content/2016/asm/amd64.s.txt
diff --git a/2016/asm/apollo.s.txt b/content/2016/asm/apollo.s.txt
similarity index 100%
rename from 2016/asm/apollo.s.txt
rename to content/2016/asm/apollo.s.txt
diff --git a/2016/asm/arch1.png b/content/2016/asm/arch1.png
similarity index 100%
rename from 2016/asm/arch1.png
rename to content/2016/asm/arch1.png
Binary files differ
diff --git a/2016/asm/arch2.png b/content/2016/asm/arch2.png
similarity index 100%
rename from 2016/asm/arch2.png
rename to content/2016/asm/arch2.png
Binary files differ
diff --git a/2016/asm/arch386._go b/content/2016/asm/arch386._go
similarity index 100%
rename from 2016/asm/arch386._go
rename to content/2016/asm/arch386._go
diff --git a/2016/asm/arm.s.txt b/content/2016/asm/arm.s.txt
similarity index 100%
rename from 2016/asm/arm.s.txt
rename to content/2016/asm/arm.s.txt
diff --git a/2016/asm/arm64.s.txt b/content/2016/asm/arm64.s.txt
similarity index 100%
rename from 2016/asm/arm64.s.txt
rename to content/2016/asm/arm64.s.txt
diff --git a/2016/asm/cray1.s.txt b/content/2016/asm/cray1.s.txt
similarity index 100%
rename from 2016/asm/cray1.s.txt
rename to content/2016/asm/cray1.s.txt
diff --git a/2016/asm/mips64.s.txt b/content/2016/asm/mips64.s.txt
similarity index 100%
rename from 2016/asm/mips64.s.txt
rename to content/2016/asm/mips64.s.txt
diff --git a/2016/asm/pdp10.s.txt b/content/2016/asm/pdp10.s.txt
similarity index 100%
rename from 2016/asm/pdp10.s.txt
rename to content/2016/asm/pdp10.s.txt
diff --git a/2016/asm/pdp11.s.txt b/content/2016/asm/pdp11.s.txt
similarity index 100%
rename from 2016/asm/pdp11.s.txt
rename to content/2016/asm/pdp11.s.txt
diff --git a/2016/asm/ppc64le.s.txt b/content/2016/asm/ppc64le.s.txt
similarity index 100%
rename from 2016/asm/ppc64le.s.txt
rename to content/2016/asm/ppc64le.s.txt
diff --git a/2016/asm/s390x.s.txt b/content/2016/asm/s390x.s.txt
similarity index 100%
rename from 2016/asm/s390x.s.txt
rename to content/2016/asm/s390x.s.txt
diff --git a/2016/prototype-your-design.pdf b/content/2016/prototype-your-design.pdf
similarity index 100%
rename from 2016/prototype-your-design.pdf
rename to content/2016/prototype-your-design.pdf
Binary files differ
diff --git a/2016/prototype-your-design.txt b/content/2016/prototype-your-design.txt
similarity index 100%
rename from 2016/prototype-your-design.txt
rename to content/2016/prototype-your-design.txt
diff --git a/2016/refactor.article b/content/2016/refactor.article
similarity index 100%
rename from 2016/refactor.article
rename to content/2016/refactor.article
diff --git a/2016/refactor/atomic.graffle b/content/2016/refactor/atomic.graffle
similarity index 100%
rename from 2016/refactor/atomic.graffle
rename to content/2016/refactor/atomic.graffle
Binary files differ
diff --git a/2016/refactor/atomic.html b/content/2016/refactor/atomic.html
similarity index 100%
rename from 2016/refactor/atomic.html
rename to content/2016/refactor/atomic.html
diff --git a/2016/refactor/atomic.svg b/content/2016/refactor/atomic.svg
similarity index 100%
rename from 2016/refactor/atomic.svg
rename to content/2016/refactor/atomic.svg
diff --git a/2016/refactor/gradual.graffle b/content/2016/refactor/gradual.graffle
similarity index 100%
rename from 2016/refactor/gradual.graffle
rename to content/2016/refactor/gradual.graffle
Binary files differ
diff --git a/2016/refactor/gradual.html b/content/2016/refactor/gradual.html
similarity index 100%
rename from 2016/refactor/gradual.html
rename to content/2016/refactor/gradual.html
diff --git a/2016/refactor/gradual.svg b/content/2016/refactor/gradual.svg
similarity index 100%
rename from 2016/refactor/gradual.svg
rename to content/2016/refactor/gradual.svg
diff --git a/2016/refactor/import1.graffle b/content/2016/refactor/import1.graffle
similarity index 100%
rename from 2016/refactor/import1.graffle
rename to content/2016/refactor/import1.graffle
Binary files differ
diff --git a/2016/refactor/import1.html b/content/2016/refactor/import1.html
similarity index 100%
rename from 2016/refactor/import1.html
rename to content/2016/refactor/import1.html
diff --git a/2016/refactor/import1.svg b/content/2016/refactor/import1.svg
similarity index 100%
rename from 2016/refactor/import1.svg
rename to content/2016/refactor/import1.svg
diff --git a/2016/refactor/import2.graffle b/content/2016/refactor/import2.graffle
similarity index 100%
rename from 2016/refactor/import2.graffle
rename to content/2016/refactor/import2.graffle
Binary files differ
diff --git a/2016/refactor/import2.html b/content/2016/refactor/import2.html
similarity index 100%
rename from 2016/refactor/import2.html
rename to content/2016/refactor/import2.html
diff --git a/2016/refactor/import2.svg b/content/2016/refactor/import2.svg
similarity index 100%
rename from 2016/refactor/import2.svg
rename to content/2016/refactor/import2.svg
diff --git a/2016/refactor/template.html b/content/2016/refactor/template.html
similarity index 100%
rename from 2016/refactor/template.html
rename to content/2016/refactor/template.html
diff --git a/2016/refactor/version1.graffle b/content/2016/refactor/version1.graffle
similarity index 100%
rename from 2016/refactor/version1.graffle
rename to content/2016/refactor/version1.graffle
Binary files differ
diff --git a/2016/refactor/version1.html b/content/2016/refactor/version1.html
similarity index 100%
rename from 2016/refactor/version1.html
rename to content/2016/refactor/version1.html
diff --git a/2016/refactor/version1.svg b/content/2016/refactor/version1.svg
similarity index 100%
rename from 2016/refactor/version1.svg
rename to content/2016/refactor/version1.svg
diff --git a/2016/refactor/version2.graffle b/content/2016/refactor/version2.graffle
similarity index 100%
rename from 2016/refactor/version2.graffle
rename to content/2016/refactor/version2.graffle
Binary files differ
diff --git a/2016/refactor/version2.html b/content/2016/refactor/version2.html
similarity index 100%
rename from 2016/refactor/version2.html
rename to content/2016/refactor/version2.html
diff --git a/2016/refactor/version2.svg b/content/2016/refactor/version2.svg
similarity index 100%
rename from 2016/refactor/version2.svg
rename to content/2016/refactor/version2.svg
diff --git a/2016/state-of-go.slide b/content/2016/state-of-go.slide
similarity index 100%
rename from 2016/state-of-go.slide
rename to content/2016/state-of-go.slide
diff --git a/2016/state-of-go/cgo/main.go b/content/2016/state-of-go/cgo/main.go
similarity index 100%
rename from 2016/state-of-go/cgo/main.go
rename to content/2016/state-of-go/cgo/main.go
diff --git a/2016/state-of-go/govet/main.go b/content/2016/state-of-go/govet/main.go
similarity index 100%
rename from 2016/state-of-go/govet/main.go
rename to content/2016/state-of-go/govet/main.go
diff --git a/2016/state-of-go/img/bench-sort.png b/content/2016/state-of-go/img/bench-sort.png
similarity index 100%
rename from 2016/state-of-go/img/bench-sort.png
rename to content/2016/state-of-go/img/bench-sort.png
Binary files differ
diff --git a/2016/state-of-go/img/bench1.png b/content/2016/state-of-go/img/bench1.png
similarity index 100%
rename from 2016/state-of-go/img/bench1.png
rename to content/2016/state-of-go/img/bench1.png
Binary files differ
diff --git a/2016/state-of-go/img/bench4.png b/content/2016/state-of-go/img/bench4.png
similarity index 100%
rename from 2016/state-of-go/img/bench4.png
rename to content/2016/state-of-go/img/bench4.png
Binary files differ
diff --git a/2016/state-of-go/img/gc345.png b/content/2016/state-of-go/img/gc345.png
similarity index 100%
rename from 2016/state-of-go/img/gc345.png
rename to content/2016/state-of-go/img/gc345.png
Binary files differ
diff --git a/2016/state-of-go/img/gc56.png b/content/2016/state-of-go/img/gc56.png
similarity index 100%
rename from 2016/state-of-go/img/gc56.png
rename to content/2016/state-of-go/img/gc56.png
Binary files differ
diff --git a/2016/state-of-go/img/gcgotip.png b/content/2016/state-of-go/img/gcgotip.png
similarity index 100%
rename from 2016/state-of-go/img/gcgotip.png
rename to content/2016/state-of-go/img/gcgotip.png
Binary files differ
diff --git a/2016/state-of-go/img/minorchanges.png b/content/2016/state-of-go/img/minorchanges.png
similarity index 100%
rename from 2016/state-of-go/img/minorchanges.png
rename to content/2016/state-of-go/img/minorchanges.png
Binary files differ
diff --git a/2016/state-of-go/img/party-gopher.png b/content/2016/state-of-go/img/party-gopher.png
similarity index 100%
rename from 2016/state-of-go/img/party-gopher.png
rename to content/2016/state-of-go/img/party-gopher.png
Binary files differ
diff --git a/2016/state-of-go/img/twitter1.png b/content/2016/state-of-go/img/twitter1.png
similarity index 100%
rename from 2016/state-of-go/img/twitter1.png
rename to content/2016/state-of-go/img/twitter1.png
Binary files differ
diff --git a/2016/state-of-go/img/twitter2.png b/content/2016/state-of-go/img/twitter2.png
similarity index 100%
rename from 2016/state-of-go/img/twitter2.png
rename to content/2016/state-of-go/img/twitter2.png
Binary files differ
diff --git a/2016/state-of-go/img/twitter3.png b/content/2016/state-of-go/img/twitter3.png
similarity index 100%
rename from 2016/state-of-go/img/twitter3.png
rename to content/2016/state-of-go/img/twitter3.png
Binary files differ
diff --git a/2016/state-of-go/runtime/crash.go b/content/2016/state-of-go/runtime/crash.go
similarity index 100%
rename from 2016/state-of-go/runtime/crash.go
rename to content/2016/state-of-go/runtime/crash.go
diff --git a/2016/state-of-go/runtime/good/good.go b/content/2016/state-of-go/runtime/good/good.go
similarity index 100%
rename from 2016/state-of-go/runtime/good/good.go
rename to content/2016/state-of-go/runtime/good/good.go
diff --git a/2016/state-of-go/sort/stable.go b/content/2016/state-of-go/sort/stable.go
similarity index 100%
rename from 2016/state-of-go/sort/stable.go
rename to content/2016/state-of-go/sort/stable.go
diff --git a/2016/state-of-go/sort/unstable.go b/content/2016/state-of-go/sort/unstable.go
similarity index 100%
rename from 2016/state-of-go/sort/unstable.go
rename to content/2016/state-of-go/sort/unstable.go
diff --git a/2016/state-of-go/template/blocks.go b/content/2016/state-of-go/template/blocks.go
similarity index 100%
rename from 2016/state-of-go/template/blocks.go
rename to content/2016/state-of-go/template/blocks.go
diff --git a/2016/state-of-go/template/define.go b/content/2016/state-of-go/template/define.go
similarity index 100%
rename from 2016/state-of-go/template/define.go
rename to content/2016/state-of-go/template/define.go
diff --git a/2016/state-of-go/template/fixed.go b/content/2016/state-of-go/template/fixed.go
similarity index 100%
rename from 2016/state-of-go/template/fixed.go
rename to content/2016/state-of-go/template/fixed.go
diff --git a/2016/state-of-go/template/new.go b/content/2016/state-of-go/template/new.go
similarity index 100%
rename from 2016/state-of-go/template/new.go
rename to content/2016/state-of-go/template/new.go
diff --git a/2016/state-of-go/template/old.go b/content/2016/state-of-go/template/old.go
similarity index 100%
rename from 2016/state-of-go/template/old.go
rename to content/2016/state-of-go/template/old.go
diff --git a/2016/state-of-go/template/redefine.go b/content/2016/state-of-go/template/redefine.go
similarity index 100%
rename from 2016/state-of-go/template/redefine.go
rename to content/2016/state-of-go/template/redefine.go
diff --git a/2016/state-of-go/time/time.go b/content/2016/state-of-go/time/time.go
similarity index 100%
rename from 2016/state-of-go/time/time.go
rename to content/2016/state-of-go/time/time.go
diff --git a/2016/token.slide b/content/2016/token.slide
similarity index 100%
rename from 2016/token.slide
rename to content/2016/token.slide
diff --git a/2017/exporting-go.pdf b/content/2017/exporting-go.pdf
similarity index 100%
rename from 2017/exporting-go.pdf
rename to content/2017/exporting-go.pdf
Binary files differ
diff --git a/2017/state-of-go-aug.pdf b/content/2017/state-of-go-aug.pdf
similarity index 100%
rename from 2017/state-of-go-aug.pdf
rename to content/2017/state-of-go-aug.pdf
Binary files differ
diff --git a/2017/state-of-go-may.slide b/content/2017/state-of-go-may.slide
similarity index 100%
rename from 2017/state-of-go-may.slide
rename to content/2017/state-of-go-may.slide
diff --git a/2017/state-of-go-may/alias/main.go b/content/2017/state-of-go-may/alias/main.go
similarity index 100%
rename from 2017/state-of-go-may/alias/main.go
rename to content/2017/state-of-go-may/alias/main.go
diff --git a/2017/state-of-go-may/bits/main.go b/content/2017/state-of-go-may/bits/main.go
similarity index 100%
rename from 2017/state-of-go-may/bits/main.go
rename to content/2017/state-of-go-may/bits/main.go
diff --git a/2017/state-of-go-may/exec/getenv/main.go b/content/2017/state-of-go-may/exec/getenv/main.go
similarity index 100%
rename from 2017/state-of-go-may/exec/getenv/main.go
rename to content/2017/state-of-go-may/exec/getenv/main.go
diff --git a/2017/state-of-go-may/exec/main.go b/content/2017/state-of-go-may/exec/main.go
similarity index 100%
rename from 2017/state-of-go-may/exec/main.go
rename to content/2017/state-of-go-may/exec/main.go
diff --git a/2017/state-of-go-may/html/main.go b/content/2017/state-of-go-may/html/main.go
similarity index 100%
rename from 2017/state-of-go-may/html/main.go
rename to content/2017/state-of-go-may/html/main.go
diff --git a/2017/state-of-go-may/img/atomic.svg b/content/2017/state-of-go-may/img/atomic.svg
similarity index 100%
rename from 2017/state-of-go-may/img/atomic.svg
rename to content/2017/state-of-go-may/img/atomic.svg
diff --git a/2017/state-of-go-may/img/benchmark.png b/content/2017/state-of-go-may/img/benchmark.png
similarity index 100%
rename from 2017/state-of-go-may/img/benchmark.png
rename to content/2017/state-of-go-may/img/benchmark.png
Binary files differ
diff --git a/2017/state-of-go-may/img/exec-poll.png b/content/2017/state-of-go-may/img/exec-poll.png
similarity index 100%
rename from 2017/state-of-go-may/img/exec-poll.png
rename to content/2017/state-of-go-may/img/exec-poll.png
Binary files differ
diff --git a/2017/state-of-go-may/img/flying.png b/content/2017/state-of-go-may/img/flying.png
similarity index 100%
rename from 2017/state-of-go-may/img/flying.png
rename to content/2017/state-of-go-may/img/flying.png
Binary files differ
diff --git a/2017/state-of-go-may/img/gradual.svg b/content/2017/state-of-go-may/img/gradual.svg
similarity index 100%
rename from 2017/state-of-go-may/img/gradual.svg
rename to content/2017/state-of-go-may/img/gradual.svg
diff --git a/2017/state-of-go-may/img/meetups.png b/content/2017/state-of-go-may/img/meetups.png
similarity index 100%
rename from 2017/state-of-go-may/img/meetups.png
rename to content/2017/state-of-go-may/img/meetups.png
Binary files differ
diff --git a/2017/state-of-go-may/img/quaternions.png b/content/2017/state-of-go-may/img/quaternions.png
similarity index 100%
rename from 2017/state-of-go-may/img/quaternions.png
rename to content/2017/state-of-go-may/img/quaternions.png
Binary files differ
diff --git a/2017/state-of-go-may/img/twitter-poll.png b/content/2017/state-of-go-may/img/twitter-poll.png
similarity index 100%
rename from 2017/state-of-go-may/img/twitter-poll.png
rename to content/2017/state-of-go-may/img/twitter-poll.png
Binary files differ
diff --git a/2017/state-of-go-may/img/wwg-logo.png b/content/2017/state-of-go-may/img/wwg-logo.png
similarity index 100%
rename from 2017/state-of-go-may/img/wwg-logo.png
rename to content/2017/state-of-go-may/img/wwg-logo.png
Binary files differ
diff --git a/2017/state-of-go-may/img/wwg.png b/content/2017/state-of-go-may/img/wwg.png
similarity index 100%
rename from 2017/state-of-go-may/img/wwg.png
rename to content/2017/state-of-go-may/img/wwg.png
Binary files differ
diff --git a/2017/state-of-go-may/syncmap/main.go b/content/2017/state-of-go-may/syncmap/main.go
similarity index 100%
rename from 2017/state-of-go-may/syncmap/main.go
rename to content/2017/state-of-go-may/syncmap/main.go
diff --git a/2017/state-of-go.slide b/content/2017/state-of-go.slide
similarity index 100%
rename from 2017/state-of-go.slide
rename to content/2017/state-of-go.slide
diff --git a/2017/state-of-go/img/bench.png b/content/2017/state-of-go/img/bench.png
similarity index 100%
rename from 2017/state-of-go/img/bench.png
rename to content/2017/state-of-go/img/bench.png
Binary files differ
diff --git a/2017/state-of-go/img/bench_log.png b/content/2017/state-of-go/img/bench_log.png
similarity index 100%
rename from 2017/state-of-go/img/bench_log.png
rename to content/2017/state-of-go/img/bench_log.png
Binary files differ
diff --git a/2017/state-of-go/img/benchmark.png b/content/2017/state-of-go/img/benchmark.png
similarity index 100%
rename from 2017/state-of-go/img/benchmark.png
rename to content/2017/state-of-go/img/benchmark.png
Binary files differ
diff --git a/2017/state-of-go/img/cgo.png b/content/2017/state-of-go/img/cgo.png
similarity index 100%
rename from 2017/state-of-go/img/cgo.png
rename to content/2017/state-of-go/img/cgo.png
Binary files differ
diff --git a/2017/state-of-go/img/defer.png b/content/2017/state-of-go/img/defer.png
similarity index 100%
rename from 2017/state-of-go/img/defer.png
rename to content/2017/state-of-go/img/defer.png
Binary files differ
diff --git a/2017/state-of-go/img/flying.png b/content/2017/state-of-go/img/flying.png
similarity index 100%
rename from 2017/state-of-go/img/flying.png
rename to content/2017/state-of-go/img/flying.png
Binary files differ
diff --git a/2017/state-of-go/img/gct1.png b/content/2017/state-of-go/img/gct1.png
similarity index 100%
rename from 2017/state-of-go/img/gct1.png
rename to content/2017/state-of-go/img/gct1.png
Binary files differ
diff --git a/2017/state-of-go/img/gct2.png b/content/2017/state-of-go/img/gct2.png
similarity index 100%
rename from 2017/state-of-go/img/gct2.png
rename to content/2017/state-of-go/img/gct2.png
Binary files differ
diff --git a/2017/state-of-go/img/gct3.png b/content/2017/state-of-go/img/gct3.png
similarity index 100%
rename from 2017/state-of-go/img/gct3.png
rename to content/2017/state-of-go/img/gct3.png
Binary files differ
diff --git a/2017/state-of-go/img/gct4.png b/content/2017/state-of-go/img/gct4.png
similarity index 100%
rename from 2017/state-of-go/img/gct4.png
rename to content/2017/state-of-go/img/gct4.png
Binary files differ
diff --git a/2017/state-of-go/img/gct5.png b/content/2017/state-of-go/img/gct5.png
similarity index 100%
rename from 2017/state-of-go/img/gct5.png
rename to content/2017/state-of-go/img/gct5.png
Binary files differ
diff --git a/2017/state-of-go/img/gctcpu.png b/content/2017/state-of-go/img/gctcpu.png
similarity index 100%
rename from 2017/state-of-go/img/gctcpu.png
rename to content/2017/state-of-go/img/gctcpu.png
Binary files differ
diff --git a/2017/state-of-go/img/http.png b/content/2017/state-of-go/img/http.png
similarity index 100%
rename from 2017/state-of-go/img/http.png
rename to content/2017/state-of-go/img/http.png
Binary files differ
diff --git a/2017/state-of-go/img/http2.png b/content/2017/state-of-go/img/http2.png
similarity index 100%
rename from 2017/state-of-go/img/http2.png
rename to content/2017/state-of-go/img/http2.png
Binary files differ
diff --git a/2017/state-of-go/img/meetups.png b/content/2017/state-of-go/img/meetups.png
similarity index 100%
rename from 2017/state-of-go/img/meetups.png
rename to content/2017/state-of-go/img/meetups.png
Binary files differ
diff --git a/2017/state-of-go/img/more.png b/content/2017/state-of-go/img/more.png
similarity index 100%
rename from 2017/state-of-go/img/more.png
rename to content/2017/state-of-go/img/more.png
Binary files differ
diff --git a/2017/state-of-go/img/mutex_all.png b/content/2017/state-of-go/img/mutex_all.png
similarity index 100%
rename from 2017/state-of-go/img/mutex_all.png
rename to content/2017/state-of-go/img/mutex_all.png
Binary files differ
diff --git a/2017/state-of-go/img/mutex_all_zoom.png b/content/2017/state-of-go/img/mutex_all_zoom.png
similarity index 100%
rename from 2017/state-of-go/img/mutex_all_zoom.png
rename to content/2017/state-of-go/img/mutex_all_zoom.png
Binary files differ
diff --git a/2017/state-of-go/img/mutex_noprofile.png b/content/2017/state-of-go/img/mutex_noprofile.png
similarity index 100%
rename from 2017/state-of-go/img/mutex_noprofile.png
rename to content/2017/state-of-go/img/mutex_noprofile.png
Binary files differ
diff --git a/2017/state-of-go/img/mutex_procs.png b/content/2017/state-of-go/img/mutex_procs.png
similarity index 100%
rename from 2017/state-of-go/img/mutex_procs.png
rename to content/2017/state-of-go/img/mutex_procs.png
Binary files differ
diff --git a/2017/state-of-go/img/mutex_profile.png b/content/2017/state-of-go/img/mutex_profile.png
similarity index 100%
rename from 2017/state-of-go/img/mutex_profile.png
rename to content/2017/state-of-go/img/mutex_profile.png
Binary files differ
diff --git a/2017/state-of-go/img/party-gopher.png b/content/2017/state-of-go/img/party-gopher.png
similarity index 100%
rename from 2017/state-of-go/img/party-gopher.png
rename to content/2017/state-of-go/img/party-gopher.png
Binary files differ
diff --git a/2017/state-of-go/img/wwg.png b/content/2017/state-of-go/img/wwg.png
similarity index 100%
rename from 2017/state-of-go/img/wwg.png
rename to content/2017/state-of-go/img/wwg.png
Binary files differ
diff --git a/2017/state-of-go/runtime/mapcrash.go b/content/2017/state-of-go/runtime/mapcrash.go
similarity index 100%
rename from 2017/state-of-go/runtime/mapcrash.go
rename to content/2017/state-of-go/runtime/mapcrash.go
diff --git a/2017/state-of-go/runtime/mutex/main.go b/content/2017/state-of-go/runtime/mutex/main.go
similarity index 100%
rename from 2017/state-of-go/runtime/mutex/main.go
rename to content/2017/state-of-go/runtime/mutex/main.go
diff --git a/2017/state-of-go/runtime/mutex/main_test.go b/content/2017/state-of-go/runtime/mutex/main_test.go
similarity index 100%
rename from 2017/state-of-go/runtime/mutex/main_test.go
rename to content/2017/state-of-go/runtime/mutex/main_test.go
diff --git a/2017/state-of-go/runtime/mutex/mutex.out b/content/2017/state-of-go/runtime/mutex/mutex.out
similarity index 100%
rename from 2017/state-of-go/runtime/mutex/mutex.out
rename to content/2017/state-of-go/runtime/mutex/mutex.out
diff --git a/2017/state-of-go/runtime/mutex/mutex.test b/content/2017/state-of-go/runtime/mutex/mutex.test
similarity index 100%
rename from 2017/state-of-go/runtime/mutex/mutex.test
rename to content/2017/state-of-go/runtime/mutex/mutex.test
Binary files differ
diff --git a/2017/state-of-go/stdlib/http2/cert.pem b/content/2017/state-of-go/stdlib/http2/cert.pem
similarity index 100%
rename from 2017/state-of-go/stdlib/http2/cert.pem
rename to content/2017/state-of-go/stdlib/http2/cert.pem
diff --git a/2017/state-of-go/stdlib/http2/http2.go b/content/2017/state-of-go/stdlib/http2/http2.go
similarity index 100%
rename from 2017/state-of-go/stdlib/http2/http2.go
rename to content/2017/state-of-go/stdlib/http2/http2.go
diff --git a/2017/state-of-go/stdlib/http2/key.pem b/content/2017/state-of-go/stdlib/http2/key.pem
similarity index 100%
rename from 2017/state-of-go/stdlib/http2/key.pem
rename to content/2017/state-of-go/stdlib/http2/key.pem
diff --git a/2017/state-of-go/stdlib/json_old.go b/content/2017/state-of-go/stdlib/json_old.go
similarity index 100%
rename from 2017/state-of-go/stdlib/json_old.go
rename to content/2017/state-of-go/stdlib/json_old.go
diff --git a/2017/state-of-go/stdlib/plugin/main.go b/content/2017/state-of-go/stdlib/plugin/main.go
similarity index 100%
rename from 2017/state-of-go/stdlib/plugin/main.go
rename to content/2017/state-of-go/stdlib/plugin/main.go
diff --git a/2017/state-of-go/stdlib/plugin/plugin.go b/content/2017/state-of-go/stdlib/plugin/plugin.go
similarity index 100%
rename from 2017/state-of-go/stdlib/plugin/plugin.go
rename to content/2017/state-of-go/stdlib/plugin/plugin.go
diff --git a/2017/state-of-go/stdlib/shutdown.go b/content/2017/state-of-go/stdlib/shutdown.go
similarity index 100%
rename from 2017/state-of-go/stdlib/shutdown.go
rename to content/2017/state-of-go/stdlib/shutdown.go
diff --git a/2017/state-of-go/stdlib/sort/sort_test.go b/content/2017/state-of-go/stdlib/sort/sort_test.go
similarity index 100%
rename from 2017/state-of-go/stdlib/sort/sort_test.go
rename to content/2017/state-of-go/stdlib/sort/sort_test.go
diff --git a/2017/state-of-go/tools/gobug.sh b/content/2017/state-of-go/tools/gobug.sh
similarity index 100%
rename from 2017/state-of-go/tools/gobug.sh
rename to content/2017/state-of-go/tools/gobug.sh
diff --git a/2017/state-of-go/tools/gofix.go b/content/2017/state-of-go/tools/gofix.go
similarity index 100%
rename from 2017/state-of-go/tools/gofix.go
rename to content/2017/state-of-go/tools/gofix.go
diff --git a/2017/state-of-go/tools/gofix.sh b/content/2017/state-of-go/tools/gofix.sh
similarity index 100%
rename from 2017/state-of-go/tools/gofix.sh
rename to content/2017/state-of-go/tools/gofix.sh
diff --git a/2017/state-of-go/tools/govet.go b/content/2017/state-of-go/tools/govet.go
similarity index 100%
rename from 2017/state-of-go/tools/govet.go
rename to content/2017/state-of-go/tools/govet.go
diff --git a/2017/state-of-go/tools/govet.sh b/content/2017/state-of-go/tools/govet.sh
similarity index 100%
rename from 2017/state-of-go/tools/govet.sh
rename to content/2017/state-of-go/tools/govet.sh
