diff --git a/HOWTO.md b/HOWTO.md
new file mode 100644
index 0000000..e4317b6
--- /dev/null
+++ b/HOWTO.md
@@ -0,0 +1,59 @@
+<!--
+{% comment %}
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+-->
+
+# How to deploy your project's web site
+
+(In the following instructions we assume that your project is called
+'Apache Foo'; search and replace with your actual project name.)
+
+## Setup
+
+1. `cd site`
+2. svn co https://svn.apache.org/repos/asf/foo/site target
+3. `sudo apt-get install rubygems ruby2.1-dev zlib1g-dev` (linux)
+4. `sudo gem install bundler github-pages jekyll`
+5. `bundle install`
+
+## Add javadoc
+
+If your project supports javadoc, you can copy the generated javadoc
+into svn each time you need to re-generate.
+
+1. `cd ..`
+2. `mvn -DskipTests site`
+3. `mv target/site/apidocs site/target`
+
+## Running locally
+
+Before opening a pull request, you can preview your contributions by
+running from within the directory:
+
+1. `bundle exec jekyll serve`
+2. Open [http://localhost:4000](http://localhost:4000)
+
+## Pushing to site
+
+1. `cd site/target`
+2. `svn status`
+3. You'll need to `svn add` any new files
+4. `svn ci`
+
+Within a few minutes, svnpubsub should kick in and you'll be able to
+see the results at
+[foo.apache.org](https://foo.apache.org/).
diff --git a/README b/README
new file mode 100644
index 0000000..bebf029
--- /dev/null
+++ b/README
@@ -0,0 +1,9 @@
+Apache Website Template release 0.0.1
+
+This is a source or binary distribution of Apache Website Template.
+
+The LICENSE and NOTICE files contain license information.
+
+README.md explains the purpose of this project, how to generate and
+deploy a simple web site based on this template, and how to create a
+web site for your project based on this template.
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..14b9f14
--- /dev/null
+++ b/README.md
@@ -0,0 +1,31 @@
+<!--
+{% comment %}
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to you under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+{% endcomment %}
+-->
+
+# Apache Website Template
+
+This project contains a template web site, generated using
+[Jekyll](https://jekyllrb.com/).
+
+To use it, copy the `site` directory into your project.  You must also
+include licensing information from the `LICENSE` and `NOTICE` files in
+your own project. And, we suggest that you include the
+[HOWTO](HOWTO.md) instructions to allow your committers to modify and deploy the site.
+
+You can see an example of the site at
+[apache-website-template.hydromatic.net](https://apache-website-template.hydromatic.net/).
diff --git a/_config.yml b/site/_config.yml
similarity index 100%
rename from _config.yml
rename to site/_config.yml
diff --git a/_data/members.yml b/site/_data/members.yml
similarity index 100%
rename from _data/members.yml
rename to site/_data/members.yml
diff --git a/_data/mentors.yml b/site/_data/mentors.yml
similarity index 100%
rename from _data/mentors.yml
rename to site/_data/mentors.yml
diff --git a/_data/project.yml b/site/_data/project.yml
similarity index 100%
rename from _data/project.yml
rename to site/_data/project.yml
diff --git a/_includes/JB/analytics b/site/_includes/JB/analytics
similarity index 100%
rename from _includes/JB/analytics
rename to site/_includes/JB/analytics
diff --git a/_includes/JB/analytics-providers/getclicky b/site/_includes/JB/analytics-providers/getclicky
similarity index 100%
rename from _includes/JB/analytics-providers/getclicky
rename to site/_includes/JB/analytics-providers/getclicky
diff --git a/_includes/JB/analytics-providers/google-classic b/site/_includes/JB/analytics-providers/google-classic
similarity index 100%
rename from _includes/JB/analytics-providers/google-classic
rename to site/_includes/JB/analytics-providers/google-classic
diff --git a/_includes/JB/analytics-providers/google-universal b/site/_includes/JB/analytics-providers/google-universal
similarity index 100%
rename from _includes/JB/analytics-providers/google-universal
rename to site/_includes/JB/analytics-providers/google-universal
diff --git a/_includes/JB/analytics-providers/mixpanel b/site/_includes/JB/analytics-providers/mixpanel
similarity index 100%
rename from _includes/JB/analytics-providers/mixpanel
rename to site/_includes/JB/analytics-providers/mixpanel
diff --git a/_includes/JB/analytics-providers/piwik b/site/_includes/JB/analytics-providers/piwik
similarity index 100%
rename from _includes/JB/analytics-providers/piwik
rename to site/_includes/JB/analytics-providers/piwik
diff --git a/_includes/JB/categories_list b/site/_includes/JB/categories_list
similarity index 100%
rename from _includes/JB/categories_list
rename to site/_includes/JB/categories_list
diff --git a/_includes/JB/comments b/site/_includes/JB/comments
similarity index 100%
rename from _includes/JB/comments
rename to site/_includes/JB/comments
diff --git a/_includes/JB/comments-providers/disqus b/site/_includes/JB/comments-providers/disqus
similarity index 100%
rename from _includes/JB/comments-providers/disqus
rename to site/_includes/JB/comments-providers/disqus
diff --git a/_includes/JB/comments-providers/facebook b/site/_includes/JB/comments-providers/facebook
similarity index 100%
rename from _includes/JB/comments-providers/facebook
rename to site/_includes/JB/comments-providers/facebook
diff --git a/_includes/JB/comments-providers/intensedebate b/site/_includes/JB/comments-providers/intensedebate
similarity index 100%
rename from _includes/JB/comments-providers/intensedebate
rename to site/_includes/JB/comments-providers/intensedebate
diff --git a/_includes/JB/comments-providers/livefyre b/site/_includes/JB/comments-providers/livefyre
similarity index 100%
rename from _includes/JB/comments-providers/livefyre
rename to site/_includes/JB/comments-providers/livefyre
diff --git a/_includes/JB/liquid_raw b/site/_includes/JB/liquid_raw
similarity index 100%
rename from _includes/JB/liquid_raw
rename to site/_includes/JB/liquid_raw
diff --git a/_includes/JB/pages_list b/site/_includes/JB/pages_list
similarity index 100%
rename from _includes/JB/pages_list
rename to site/_includes/JB/pages_list
diff --git a/_includes/JB/posts_collate b/site/_includes/JB/posts_collate
similarity index 100%
rename from _includes/JB/posts_collate
rename to site/_includes/JB/posts_collate
diff --git a/_includes/JB/setup b/site/_includes/JB/setup
similarity index 100%
rename from _includes/JB/setup
rename to site/_includes/JB/setup
diff --git a/_includes/JB/sharing b/site/_includes/JB/sharing
similarity index 100%
rename from _includes/JB/sharing
rename to site/_includes/JB/sharing
diff --git a/_includes/JB/tags_list b/site/_includes/JB/tags_list
similarity index 100%
rename from _includes/JB/tags_list
rename to site/_includes/JB/tags_list
diff --git a/_includes/themes/apache/_navigation.html b/site/_includes/themes/apache/_navigation.html
similarity index 100%
rename from _includes/themes/apache/_navigation.html
rename to site/_includes/themes/apache/_navigation.html
diff --git a/_includes/themes/apache/default.html b/site/_includes/themes/apache/default.html
similarity index 100%
rename from _includes/themes/apache/default.html
rename to site/_includes/themes/apache/default.html
diff --git a/_includes/themes/apache/footer.html b/site/_includes/themes/apache/footer.html
similarity index 100%
rename from _includes/themes/apache/footer.html
rename to site/_includes/themes/apache/footer.html
diff --git a/_includes/themes/apache/page.html b/site/_includes/themes/apache/page.html
similarity index 100%
rename from _includes/themes/apache/page.html
rename to site/_includes/themes/apache/page.html
diff --git a/_includes/themes/apache/post.html b/site/_includes/themes/apache/post.html
similarity index 100%
rename from _includes/themes/apache/post.html
rename to site/_includes/themes/apache/post.html
diff --git a/_includes/themes/apache/settings.yml b/site/_includes/themes/apache/settings.yml
similarity index 100%
rename from _includes/themes/apache/settings.yml
rename to site/_includes/themes/apache/settings.yml
diff --git a/_layouts/default.html b/site/_layouts/default.html
similarity index 100%
rename from _layouts/default.html
rename to site/_layouts/default.html
diff --git a/_layouts/page.html b/site/_layouts/page.html
similarity index 100%
rename from _layouts/page.html
rename to site/_layouts/page.html
diff --git a/_layouts/post.html b/site/_layouts/post.html
similarity index 100%
rename from _layouts/post.html
rename to site/_layouts/post.html
diff --git a/_posts/2015-11-08-welcome-to-jekyll.markdown b/site/_posts/2015-11-08-welcome-to-jekyll.markdown
similarity index 100%
rename from _posts/2015-11-08-welcome-to-jekyll.markdown
rename to site/_posts/2015-11-08-welcome-to-jekyll.markdown
diff --git a/_sass/_base.scss b/site/_sass/_base.scss
similarity index 100%
rename from _sass/_base.scss
rename to site/_sass/_base.scss
diff --git a/_sass/_layout.scss b/site/_sass/_layout.scss
similarity index 100%
rename from _sass/_layout.scss
rename to site/_sass/_layout.scss
diff --git a/_sass/_syntax-highlighting.scss b/site/_sass/_syntax-highlighting.scss
similarity index 100%
rename from _sass/_syntax-highlighting.scss
rename to site/_sass/_syntax-highlighting.scss
diff --git a/assets/themes/apache/bootstrap/css/bootstrap-theme.css b/site/assets/themes/apache/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from assets/themes/apache/bootstrap/css/bootstrap-theme.css
rename to site/assets/themes/apache/bootstrap/css/bootstrap-theme.css
diff --git a/assets/themes/apache/bootstrap/css/bootstrap-theme.min.css b/site/assets/themes/apache/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from assets/themes/apache/bootstrap/css/bootstrap-theme.min.css
rename to site/assets/themes/apache/bootstrap/css/bootstrap-theme.min.css
diff --git a/assets/themes/apache/bootstrap/css/bootstrap.css b/site/assets/themes/apache/bootstrap/css/bootstrap.css
similarity index 100%
rename from assets/themes/apache/bootstrap/css/bootstrap.css
rename to site/assets/themes/apache/bootstrap/css/bootstrap.css
diff --git a/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.eot b/site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.eot
Binary files differ
diff --git a/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.svg b/site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.ttf b/site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.ttf
Binary files differ
diff --git a/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.woff b/site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to site/assets/themes/apache/bootstrap/fonts/glyphicons-halflings-regular.woff
Binary files differ
diff --git a/assets/themes/apache/bootstrap/img/glyphicons-halflings-white.png b/site/assets/themes/apache/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from assets/themes/apache/bootstrap/img/glyphicons-halflings-white.png
rename to site/assets/themes/apache/bootstrap/img/glyphicons-halflings-white.png
Binary files differ
diff --git a/assets/themes/apache/bootstrap/img/glyphicons-halflings.png b/site/assets/themes/apache/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from assets/themes/apache/bootstrap/img/glyphicons-halflings.png
rename to site/assets/themes/apache/bootstrap/img/glyphicons-halflings.png
Binary files differ
diff --git a/assets/themes/apache/bootstrap/js/bootstrap.js b/site/assets/themes/apache/bootstrap/js/bootstrap.js
similarity index 100%
rename from assets/themes/apache/bootstrap/js/bootstrap.js
rename to site/assets/themes/apache/bootstrap/js/bootstrap.js
diff --git a/assets/themes/apache/bootstrap/js/bootstrap.min.js b/site/assets/themes/apache/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from assets/themes/apache/bootstrap/js/bootstrap.min.js
rename to site/assets/themes/apache/bootstrap/js/bootstrap.min.js
diff --git a/assets/themes/apache/css/style.css b/site/assets/themes/apache/css/style.css
similarity index 100%
rename from assets/themes/apache/css/style.css
rename to site/assets/themes/apache/css/style.css
diff --git a/assets/themes/apache/css/syntax.css b/site/assets/themes/apache/css/syntax.css
similarity index 100%
rename from assets/themes/apache/css/syntax.css
rename to site/assets/themes/apache/css/syntax.css
diff --git a/assets/themes/apache/img/body-bg.jpg b/site/assets/themes/apache/img/body-bg.jpg
similarity index 100%
rename from assets/themes/apache/img/body-bg.jpg
rename to site/assets/themes/apache/img/body-bg.jpg
Binary files differ
diff --git a/assets/themes/apache/img/docs-img/lens-interpreter-binding.png b/site/assets/themes/apache/img/docs-img/lens-interpreter-binding.png
similarity index 100%
rename from assets/themes/apache/img/docs-img/lens-interpreter-binding.png
rename to site/assets/themes/apache/img/docs-img/lens-interpreter-binding.png
Binary files differ
diff --git a/assets/themes/apache/img/docs-img/lens-interpreter-setting.png b/site/assets/themes/apache/img/docs-img/lens-interpreter-setting.png
similarity index 100%
rename from assets/themes/apache/img/docs-img/lens-interpreter-setting.png
rename to site/assets/themes/apache/img/docs-img/lens-interpreter-setting.png
Binary files differ
diff --git a/assets/themes/apache/img/docs-img/lens-logo.png b/site/assets/themes/apache/img/docs-img/lens-logo.png
similarity index 100%
rename from assets/themes/apache/img/docs-img/lens-logo.png
rename to site/assets/themes/apache/img/docs-img/lens-logo.png
Binary files differ
diff --git a/assets/themes/apache/img/docs-img/lens-result.png b/site/assets/themes/apache/img/docs-img/lens-result.png
similarity index 100%
rename from assets/themes/apache/img/docs-img/lens-result.png
rename to site/assets/themes/apache/img/docs-img/lens-result.png
Binary files differ
diff --git a/assets/themes/apache/img/docs-img/lens-ui-service.png b/site/assets/themes/apache/img/docs-img/lens-ui-service.png
similarity index 100%
rename from assets/themes/apache/img/docs-img/lens-ui-service.png
rename to site/assets/themes/apache/img/docs-img/lens-ui-service.png
Binary files differ
diff --git a/assets/themes/apache/img/header-bg.jpg b/site/assets/themes/apache/img/header-bg.jpg
similarity index 100%
rename from assets/themes/apache/img/header-bg.jpg
rename to site/assets/themes/apache/img/header-bg.jpg
Binary files differ
diff --git a/assets/themes/apache/img/highlight-bg.jpg b/site/assets/themes/apache/img/highlight-bg.jpg
similarity index 100%
rename from assets/themes/apache/img/highlight-bg.jpg
rename to site/assets/themes/apache/img/highlight-bg.jpg
Binary files differ
diff --git a/assets/themes/apache/img/logo.png b/site/assets/themes/apache/img/logo.png
similarity index 100%
rename from assets/themes/apache/img/logo.png
rename to site/assets/themes/apache/img/logo.png
Binary files differ
diff --git a/assets/themes/apache/img/sidebar-bg.jpg b/site/assets/themes/apache/img/sidebar-bg.jpg
similarity index 100%
rename from assets/themes/apache/img/sidebar-bg.jpg
rename to site/assets/themes/apache/img/sidebar-bg.jpg
Binary files differ
diff --git a/assets/themes/apache/jquery/jquery-2.1.1.js b/site/assets/themes/apache/jquery/jquery-2.1.1.js
similarity index 100%
rename from assets/themes/apache/jquery/jquery-2.1.1.js
rename to site/assets/themes/apache/jquery/jquery-2.1.1.js
diff --git a/assets/themes/apache/jquery/jquery-2.1.1.min.js b/site/assets/themes/apache/jquery/jquery-2.1.1.min.js
similarity index 100%
rename from assets/themes/apache/jquery/jquery-2.1.1.min.js
rename to site/assets/themes/apache/jquery/jquery-2.1.1.min.js
diff --git a/community-members.md b/site/community-members.md
similarity index 100%
rename from community-members.md
rename to site/community-members.md
diff --git a/community.md b/site/community.md
similarity index 100%
rename from community.md
rename to site/community.md
diff --git a/css/main.scss b/site/css/main.scss
similarity index 100%
rename from css/main.scss
rename to site/css/main.scss
diff --git a/feed.xml b/site/feed.xml
similarity index 100%
rename from feed.xml
rename to site/feed.xml
diff --git a/index.md b/site/index.md
similarity index 100%
rename from index.md
rename to site/index.md