diff --git a/.gitignore b/.gitignore
index 53752db25..de1dc5fd9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
output
+.DS_Store
diff --git a/atlas.json b/atlas.json
new file mode 100644
index 000000000..d40fabe64
--- /dev/null
+++ b/atlas.json
@@ -0,0 +1,41 @@
+{
+ "branch": "master",
+ "files": [
+ "book/cover.html",
+ "book/preface.asc",
+ "book/01-introduction/1-introduction.asc",
+ "book/02-git-basics/1-git-basics.asc",
+ "book/03-git-branching/1-git-branching.asc",
+ "book/04-git-server/1-git-server.asc",
+ "book/05-distributed-git/1-distributed-git.asc",
+ "book/06-github/1-github.asc",
+ "book/07-git-tools/1-git-tools.asc",
+ "book/08-customizing-git/1-customizing-git.asc",
+ "book/09-git-and-other-scms/1-git-and-other-scms.asc",
+ "book/10-git-in-other-environments/1-git-other-environments.asc",
+ "book/11-git-internals/1-git-internals.asc",
+ "book/index.asc"
+ ],
+ "formats": {
+ "pdf": {
+ "version": "web",
+ "index": true,
+ "toc": true
+ },
+ "epub": {
+ "index": true,
+ "toc": true,
+ "epubcheck": false
+ },
+ "mobi": {
+ "index": true,
+ "toc": true
+ },
+ "html": {
+ "index": true,
+ "toc": true
+ }
+ },
+ "theme": "oreillymedia/pro-git-theme",
+ "title": "Pro Git"
+}
\ No newline at end of file
diff --git a/en/book/01-introduction/chapter1.asc b/book/01-introduction/1-introduction.asc
similarity index 99%
rename from en/book/01-introduction/chapter1.asc
rename to book/01-introduction/1-introduction.asc
index 22babc406..c42644e65 100644
--- a/en/book/01-introduction/chapter1.asc
+++ b/book/01-introduction/1-introduction.asc
@@ -6,7 +6,7 @@ At the end of this chapter you should understand why Git is around, why you shou
=== About Version Control (((version control)))
-What is version control, and why should you care?
+What is ((("version control"))), and why should you care?
Version control is a system that records changes to a file or set of files over time so that you can recall specific versions later.
For the examples in this book you will use software source code as the files being version controlled, though in reality you can do this with nearly any type of file on a computer.
diff --git a/en/book/images/18333fig0101-tn.png b/book/01-introduction/images/18333fig0101-tn.png
similarity index 100%
rename from en/book/images/18333fig0101-tn.png
rename to book/01-introduction/images/18333fig0101-tn.png
diff --git a/en/book/images/18333fig0102-tn.png b/book/01-introduction/images/18333fig0102-tn.png
similarity index 100%
rename from en/book/images/18333fig0102-tn.png
rename to book/01-introduction/images/18333fig0102-tn.png
diff --git a/en/book/images/18333fig0103-tn.png b/book/01-introduction/images/18333fig0103-tn.png
similarity index 100%
rename from en/book/images/18333fig0103-tn.png
rename to book/01-introduction/images/18333fig0103-tn.png
diff --git a/en/book/images/18333fig0104-tn.png b/book/01-introduction/images/18333fig0104-tn.png
similarity index 100%
rename from en/book/images/18333fig0104-tn.png
rename to book/01-introduction/images/18333fig0104-tn.png
diff --git a/en/book/images/18333fig0105-tn.png b/book/01-introduction/images/18333fig0105-tn.png
similarity index 100%
rename from en/book/images/18333fig0105-tn.png
rename to book/01-introduction/images/18333fig0105-tn.png
diff --git a/en/book/images/18333fig0106-tn.png b/book/01-introduction/images/18333fig0106-tn.png
similarity index 100%
rename from en/book/images/18333fig0106-tn.png
rename to book/01-introduction/images/18333fig0106-tn.png
diff --git a/en/book/images/git-osx-installer.png b/book/01-introduction/images/git-osx-installer.png
similarity index 100%
rename from en/book/images/git-osx-installer.png
rename to book/01-introduction/images/git-osx-installer.png
diff --git a/en/book/02-git-basics/chapter2.asc b/book/02-git-basics/1-git-basics.asc
similarity index 100%
rename from en/book/02-git-basics/chapter2.asc
rename to book/02-git-basics/1-git-basics.asc
diff --git a/en/book/images/18333fig0201-tn.png b/book/02-git-basics/images/18333fig0201-tn.png
similarity index 100%
rename from en/book/images/18333fig0201-tn.png
rename to book/02-git-basics/images/18333fig0201-tn.png
diff --git a/en/book/images/18333fig0202-tn.png b/book/02-git-basics/images/18333fig0202-tn.png
similarity index 100%
rename from en/book/images/18333fig0202-tn.png
rename to book/02-git-basics/images/18333fig0202-tn.png
diff --git a/en/book/03-git-branching/chapter3.asc b/book/03-git-branching/1-git-branching.asc
similarity index 100%
rename from en/book/03-git-branching/chapter3.asc
rename to book/03-git-branching/1-git-branching.asc
diff --git a/en/book/images/18333fig0301-tn.png b/book/03-git-branching/images/18333fig0301-tn.png
similarity index 100%
rename from en/book/images/18333fig0301-tn.png
rename to book/03-git-branching/images/18333fig0301-tn.png
diff --git a/en/book/images/18333fig0302-tn.png b/book/03-git-branching/images/18333fig0302-tn.png
similarity index 100%
rename from en/book/images/18333fig0302-tn.png
rename to book/03-git-branching/images/18333fig0302-tn.png
diff --git a/en/book/images/18333fig0303-tn.png b/book/03-git-branching/images/18333fig0303-tn.png
similarity index 100%
rename from en/book/images/18333fig0303-tn.png
rename to book/03-git-branching/images/18333fig0303-tn.png
diff --git a/en/book/images/18333fig0304-tn.png b/book/03-git-branching/images/18333fig0304-tn.png
similarity index 100%
rename from en/book/images/18333fig0304-tn.png
rename to book/03-git-branching/images/18333fig0304-tn.png
diff --git a/en/book/images/18333fig0305-tn.png b/book/03-git-branching/images/18333fig0305-tn.png
similarity index 100%
rename from en/book/images/18333fig0305-tn.png
rename to book/03-git-branching/images/18333fig0305-tn.png
diff --git a/en/book/images/18333fig0306-tn.png b/book/03-git-branching/images/18333fig0306-tn.png
similarity index 100%
rename from en/book/images/18333fig0306-tn.png
rename to book/03-git-branching/images/18333fig0306-tn.png
diff --git a/en/book/images/18333fig0307-tn.png b/book/03-git-branching/images/18333fig0307-tn.png
similarity index 100%
rename from en/book/images/18333fig0307-tn.png
rename to book/03-git-branching/images/18333fig0307-tn.png
diff --git a/en/book/images/18333fig0308-tn.png b/book/03-git-branching/images/18333fig0308-tn.png
similarity index 100%
rename from en/book/images/18333fig0308-tn.png
rename to book/03-git-branching/images/18333fig0308-tn.png
diff --git a/en/book/images/18333fig0309-tn.png b/book/03-git-branching/images/18333fig0309-tn.png
similarity index 100%
rename from en/book/images/18333fig0309-tn.png
rename to book/03-git-branching/images/18333fig0309-tn.png
diff --git a/en/book/images/18333fig0310-tn.png b/book/03-git-branching/images/18333fig0310-tn.png
similarity index 100%
rename from en/book/images/18333fig0310-tn.png
rename to book/03-git-branching/images/18333fig0310-tn.png
diff --git a/en/book/images/18333fig0311-tn.png b/book/03-git-branching/images/18333fig0311-tn.png
similarity index 100%
rename from en/book/images/18333fig0311-tn.png
rename to book/03-git-branching/images/18333fig0311-tn.png
diff --git a/en/book/images/18333fig0312-tn.png b/book/03-git-branching/images/18333fig0312-tn.png
similarity index 100%
rename from en/book/images/18333fig0312-tn.png
rename to book/03-git-branching/images/18333fig0312-tn.png
diff --git a/en/book/images/18333fig0313-tn.png b/book/03-git-branching/images/18333fig0313-tn.png
similarity index 100%
rename from en/book/images/18333fig0313-tn.png
rename to book/03-git-branching/images/18333fig0313-tn.png
diff --git a/en/book/images/18333fig0314-tn.png b/book/03-git-branching/images/18333fig0314-tn.png
similarity index 100%
rename from en/book/images/18333fig0314-tn.png
rename to book/03-git-branching/images/18333fig0314-tn.png
diff --git a/en/book/images/18333fig0315-tn.png b/book/03-git-branching/images/18333fig0315-tn.png
similarity index 100%
rename from en/book/images/18333fig0315-tn.png
rename to book/03-git-branching/images/18333fig0315-tn.png
diff --git a/en/book/images/18333fig0316-tn.png b/book/03-git-branching/images/18333fig0316-tn.png
similarity index 100%
rename from en/book/images/18333fig0316-tn.png
rename to book/03-git-branching/images/18333fig0316-tn.png
diff --git a/en/book/images/18333fig0317-tn.png b/book/03-git-branching/images/18333fig0317-tn.png
similarity index 100%
rename from en/book/images/18333fig0317-tn.png
rename to book/03-git-branching/images/18333fig0317-tn.png
diff --git a/en/book/images/18333fig0318-tn.png b/book/03-git-branching/images/18333fig0318-tn.png
similarity index 100%
rename from en/book/images/18333fig0318-tn.png
rename to book/03-git-branching/images/18333fig0318-tn.png
diff --git a/en/book/images/18333fig0319-tn.png b/book/03-git-branching/images/18333fig0319-tn.png
similarity index 100%
rename from en/book/images/18333fig0319-tn.png
rename to book/03-git-branching/images/18333fig0319-tn.png
diff --git a/en/book/images/18333fig0320-tn.png b/book/03-git-branching/images/18333fig0320-tn.png
similarity index 100%
rename from en/book/images/18333fig0320-tn.png
rename to book/03-git-branching/images/18333fig0320-tn.png
diff --git a/en/book/images/18333fig0321-tn.png b/book/03-git-branching/images/18333fig0321-tn.png
similarity index 100%
rename from en/book/images/18333fig0321-tn.png
rename to book/03-git-branching/images/18333fig0321-tn.png
diff --git a/en/book/images/18333fig0322-tn.png b/book/03-git-branching/images/18333fig0322-tn.png
similarity index 100%
rename from en/book/images/18333fig0322-tn.png
rename to book/03-git-branching/images/18333fig0322-tn.png
diff --git a/en/book/images/18333fig0323-tn.png b/book/03-git-branching/images/18333fig0323-tn.png
similarity index 100%
rename from en/book/images/18333fig0323-tn.png
rename to book/03-git-branching/images/18333fig0323-tn.png
diff --git a/en/book/images/18333fig0324-tn.png b/book/03-git-branching/images/18333fig0324-tn.png
similarity index 100%
rename from en/book/images/18333fig0324-tn.png
rename to book/03-git-branching/images/18333fig0324-tn.png
diff --git a/en/book/images/18333fig0325-tn.png b/book/03-git-branching/images/18333fig0325-tn.png
similarity index 100%
rename from en/book/images/18333fig0325-tn.png
rename to book/03-git-branching/images/18333fig0325-tn.png
diff --git a/en/book/images/18333fig0326-tn.png b/book/03-git-branching/images/18333fig0326-tn.png
similarity index 100%
rename from en/book/images/18333fig0326-tn.png
rename to book/03-git-branching/images/18333fig0326-tn.png
diff --git a/en/book/images/18333fig0327-tn.png b/book/03-git-branching/images/18333fig0327-tn.png
similarity index 100%
rename from en/book/images/18333fig0327-tn.png
rename to book/03-git-branching/images/18333fig0327-tn.png
diff --git a/en/book/images/18333fig0328-tn.png b/book/03-git-branching/images/18333fig0328-tn.png
similarity index 100%
rename from en/book/images/18333fig0328-tn.png
rename to book/03-git-branching/images/18333fig0328-tn.png
diff --git a/en/book/images/18333fig0329-tn.png b/book/03-git-branching/images/18333fig0329-tn.png
similarity index 100%
rename from en/book/images/18333fig0329-tn.png
rename to book/03-git-branching/images/18333fig0329-tn.png
diff --git a/en/book/images/18333fig0330-tn.png b/book/03-git-branching/images/18333fig0330-tn.png
similarity index 100%
rename from en/book/images/18333fig0330-tn.png
rename to book/03-git-branching/images/18333fig0330-tn.png
diff --git a/en/book/images/18333fig0331-tn.png b/book/03-git-branching/images/18333fig0331-tn.png
similarity index 100%
rename from en/book/images/18333fig0331-tn.png
rename to book/03-git-branching/images/18333fig0331-tn.png
diff --git a/en/book/images/18333fig0332-tn.png b/book/03-git-branching/images/18333fig0332-tn.png
similarity index 100%
rename from en/book/images/18333fig0332-tn.png
rename to book/03-git-branching/images/18333fig0332-tn.png
diff --git a/en/book/images/18333fig0333-tn.png b/book/03-git-branching/images/18333fig0333-tn.png
similarity index 100%
rename from en/book/images/18333fig0333-tn.png
rename to book/03-git-branching/images/18333fig0333-tn.png
diff --git a/en/book/images/18333fig0334-tn.png b/book/03-git-branching/images/18333fig0334-tn.png
similarity index 100%
rename from en/book/images/18333fig0334-tn.png
rename to book/03-git-branching/images/18333fig0334-tn.png
diff --git a/en/book/images/18333fig0335-tn.png b/book/03-git-branching/images/18333fig0335-tn.png
similarity index 100%
rename from en/book/images/18333fig0335-tn.png
rename to book/03-git-branching/images/18333fig0335-tn.png
diff --git a/en/book/images/18333fig0336-tn.png b/book/03-git-branching/images/18333fig0336-tn.png
similarity index 100%
rename from en/book/images/18333fig0336-tn.png
rename to book/03-git-branching/images/18333fig0336-tn.png
diff --git a/en/book/images/18333fig0337-tn.png b/book/03-git-branching/images/18333fig0337-tn.png
similarity index 100%
rename from en/book/images/18333fig0337-tn.png
rename to book/03-git-branching/images/18333fig0337-tn.png
diff --git a/en/book/images/18333fig0338-tn.png b/book/03-git-branching/images/18333fig0338-tn.png
similarity index 100%
rename from en/book/images/18333fig0338-tn.png
rename to book/03-git-branching/images/18333fig0338-tn.png
diff --git a/en/book/images/18333fig0339-tn.png b/book/03-git-branching/images/18333fig0339-tn.png
similarity index 100%
rename from en/book/images/18333fig0339-tn.png
rename to book/03-git-branching/images/18333fig0339-tn.png
diff --git a/en/book/images/undomerge-reset.png b/book/03-git-branching/images/undomerge-reset.png
similarity index 100%
rename from en/book/images/undomerge-reset.png
rename to book/03-git-branching/images/undomerge-reset.png
diff --git a/en/book/images/undomerge-revert.png b/book/03-git-branching/images/undomerge-revert.png
similarity index 100%
rename from en/book/images/undomerge-revert.png
rename to book/03-git-branching/images/undomerge-revert.png
diff --git a/en/book/images/undomerge-revert2.png b/book/03-git-branching/images/undomerge-revert2.png
similarity index 100%
rename from en/book/images/undomerge-revert2.png
rename to book/03-git-branching/images/undomerge-revert2.png
diff --git a/en/book/images/undomerge-revert3.png b/book/03-git-branching/images/undomerge-revert3.png
similarity index 100%
rename from en/book/images/undomerge-revert3.png
rename to book/03-git-branching/images/undomerge-revert3.png
diff --git a/en/book/images/undomerge-start.png b/book/03-git-branching/images/undomerge-start.png
similarity index 100%
rename from en/book/images/undomerge-start.png
rename to book/03-git-branching/images/undomerge-start.png
diff --git a/en/book/04-git-server/chapter4.asc b/book/04-git-server/1-git-server.asc
similarity index 100%
rename from en/book/04-git-server/chapter4.asc
rename to book/04-git-server/1-git-server.asc
diff --git a/en/book/images/18333fig0401-tn.png b/book/04-git-server/images/18333fig0401-tn.png
similarity index 100%
rename from en/book/images/18333fig0401-tn.png
rename to book/04-git-server/images/18333fig0401-tn.png
diff --git a/en/book/images/18333fig0402-tn.png b/book/04-git-server/images/18333fig0402-tn.png
similarity index 100%
rename from en/book/images/18333fig0402-tn.png
rename to book/04-git-server/images/18333fig0402-tn.png
diff --git a/en/book/images/18333fig0403-tn.png b/book/04-git-server/images/18333fig0403-tn.png
similarity index 100%
rename from en/book/images/18333fig0403-tn.png
rename to book/04-git-server/images/18333fig0403-tn.png
diff --git a/en/book/images/18333fig0404-tn.png b/book/04-git-server/images/18333fig0404-tn.png
similarity index 100%
rename from en/book/images/18333fig0404-tn.png
rename to book/04-git-server/images/18333fig0404-tn.png
diff --git a/en/book/images/18333fig0405-tn.png b/book/04-git-server/images/18333fig0405-tn.png
similarity index 100%
rename from en/book/images/18333fig0405-tn.png
rename to book/04-git-server/images/18333fig0405-tn.png
diff --git a/en/book/images/18333fig0406-tn.png b/book/04-git-server/images/18333fig0406-tn.png
similarity index 100%
rename from en/book/images/18333fig0406-tn.png
rename to book/04-git-server/images/18333fig0406-tn.png
diff --git a/en/book/images/18333fig0407-tn.png b/book/04-git-server/images/18333fig0407-tn.png
similarity index 100%
rename from en/book/images/18333fig0407-tn.png
rename to book/04-git-server/images/18333fig0407-tn.png
diff --git a/en/book/images/18333fig0408-tn.png b/book/04-git-server/images/18333fig0408-tn.png
similarity index 100%
rename from en/book/images/18333fig0408-tn.png
rename to book/04-git-server/images/18333fig0408-tn.png
diff --git a/en/book/images/18333fig0409-tn.png b/book/04-git-server/images/18333fig0409-tn.png
similarity index 100%
rename from en/book/images/18333fig0409-tn.png
rename to book/04-git-server/images/18333fig0409-tn.png
diff --git a/en/book/images/18333fig0410-tn.png b/book/04-git-server/images/18333fig0410-tn.png
similarity index 100%
rename from en/book/images/18333fig0410-tn.png
rename to book/04-git-server/images/18333fig0410-tn.png
diff --git a/en/book/images/18333fig0411-tn.png b/book/04-git-server/images/18333fig0411-tn.png
similarity index 100%
rename from en/book/images/18333fig0411-tn.png
rename to book/04-git-server/images/18333fig0411-tn.png
diff --git a/en/book/images/18333fig0412-tn.png b/book/04-git-server/images/18333fig0412-tn.png
similarity index 100%
rename from en/book/images/18333fig0412-tn.png
rename to book/04-git-server/images/18333fig0412-tn.png
diff --git a/en/book/images/18333fig0413-tn.png b/book/04-git-server/images/18333fig0413-tn.png
similarity index 100%
rename from en/book/images/18333fig0413-tn.png
rename to book/04-git-server/images/18333fig0413-tn.png
diff --git a/en/book/images/18333fig0414-tn.png b/book/04-git-server/images/18333fig0414-tn.png
similarity index 100%
rename from en/book/images/18333fig0414-tn.png
rename to book/04-git-server/images/18333fig0414-tn.png
diff --git a/en/book/images/18333fig0415-tn.png b/book/04-git-server/images/18333fig0415-tn.png
similarity index 100%
rename from en/book/images/18333fig0415-tn.png
rename to book/04-git-server/images/18333fig0415-tn.png
diff --git a/en/book/images/bitnami.png b/book/04-git-server/images/bitnami.png
similarity index 100%
rename from en/book/images/bitnami.png
rename to book/04-git-server/images/bitnami.png
diff --git a/en/book/images/gitlab-broadcast.png b/book/04-git-server/images/gitlab-broadcast.png
similarity index 100%
rename from en/book/images/gitlab-broadcast.png
rename to book/04-git-server/images/gitlab-broadcast.png
diff --git a/en/book/images/gitlab-groups.png b/book/04-git-server/images/gitlab-groups.png
similarity index 100%
rename from en/book/images/gitlab-groups.png
rename to book/04-git-server/images/gitlab-groups.png
diff --git a/en/book/images/GitLab-menu.png b/book/04-git-server/images/gitlab-menu.png
similarity index 100%
rename from en/book/images/GitLab-menu.png
rename to book/04-git-server/images/gitlab-menu.png
diff --git a/en/book/images/gitlab-users.png b/book/04-git-server/images/gitlab-users.png
similarity index 100%
rename from en/book/images/gitlab-users.png
rename to book/04-git-server/images/gitlab-users.png
diff --git a/en/book/05-distributed-git/chapter5.asc b/book/05-distributed-git/1-distributed-git.asc
similarity index 100%
rename from en/book/05-distributed-git/chapter5.asc
rename to book/05-distributed-git/1-distributed-git.asc
diff --git a/en/book/images/18333fig0501-tn.png b/book/05-distributed-git/images/18333fig0501-tn.png
similarity index 100%
rename from en/book/images/18333fig0501-tn.png
rename to book/05-distributed-git/images/18333fig0501-tn.png
diff --git a/en/book/images/18333fig0502-tn.png b/book/05-distributed-git/images/18333fig0502-tn.png
similarity index 100%
rename from en/book/images/18333fig0502-tn.png
rename to book/05-distributed-git/images/18333fig0502-tn.png
diff --git a/en/book/images/18333fig0503-tn.png b/book/05-distributed-git/images/18333fig0503-tn.png
similarity index 100%
rename from en/book/images/18333fig0503-tn.png
rename to book/05-distributed-git/images/18333fig0503-tn.png
diff --git a/en/book/images/18333fig0504-tn.png b/book/05-distributed-git/images/18333fig0504-tn.png
similarity index 100%
rename from en/book/images/18333fig0504-tn.png
rename to book/05-distributed-git/images/18333fig0504-tn.png
diff --git a/en/book/images/18333fig0505-tn.png b/book/05-distributed-git/images/18333fig0505-tn.png
similarity index 100%
rename from en/book/images/18333fig0505-tn.png
rename to book/05-distributed-git/images/18333fig0505-tn.png
diff --git a/en/book/images/18333fig0506-tn.png b/book/05-distributed-git/images/18333fig0506-tn.png
similarity index 100%
rename from en/book/images/18333fig0506-tn.png
rename to book/05-distributed-git/images/18333fig0506-tn.png
diff --git a/en/book/images/18333fig0507-tn.png b/book/05-distributed-git/images/18333fig0507-tn.png
similarity index 100%
rename from en/book/images/18333fig0507-tn.png
rename to book/05-distributed-git/images/18333fig0507-tn.png
diff --git a/en/book/images/18333fig0508-tn.png b/book/05-distributed-git/images/18333fig0508-tn.png
similarity index 100%
rename from en/book/images/18333fig0508-tn.png
rename to book/05-distributed-git/images/18333fig0508-tn.png
diff --git a/en/book/images/18333fig0509-tn.png b/book/05-distributed-git/images/18333fig0509-tn.png
similarity index 100%
rename from en/book/images/18333fig0509-tn.png
rename to book/05-distributed-git/images/18333fig0509-tn.png
diff --git a/en/book/images/18333fig0510-tn.png b/book/05-distributed-git/images/18333fig0510-tn.png
similarity index 100%
rename from en/book/images/18333fig0510-tn.png
rename to book/05-distributed-git/images/18333fig0510-tn.png
diff --git a/en/book/images/18333fig0511-tn.png b/book/05-distributed-git/images/18333fig0511-tn.png
similarity index 100%
rename from en/book/images/18333fig0511-tn.png
rename to book/05-distributed-git/images/18333fig0511-tn.png
diff --git a/en/book/images/18333fig0512-tn.png b/book/05-distributed-git/images/18333fig0512-tn.png
similarity index 100%
rename from en/book/images/18333fig0512-tn.png
rename to book/05-distributed-git/images/18333fig0512-tn.png
diff --git a/en/book/images/18333fig0513-tn.png b/book/05-distributed-git/images/18333fig0513-tn.png
similarity index 100%
rename from en/book/images/18333fig0513-tn.png
rename to book/05-distributed-git/images/18333fig0513-tn.png
diff --git a/en/book/images/18333fig0514-tn.png b/book/05-distributed-git/images/18333fig0514-tn.png
similarity index 100%
rename from en/book/images/18333fig0514-tn.png
rename to book/05-distributed-git/images/18333fig0514-tn.png
diff --git a/en/book/images/18333fig0515-tn.png b/book/05-distributed-git/images/18333fig0515-tn.png
similarity index 100%
rename from en/book/images/18333fig0515-tn.png
rename to book/05-distributed-git/images/18333fig0515-tn.png
diff --git a/en/book/images/18333fig0516-tn.png b/book/05-distributed-git/images/18333fig0516-tn.png
similarity index 100%
rename from en/book/images/18333fig0516-tn.png
rename to book/05-distributed-git/images/18333fig0516-tn.png
diff --git a/en/book/images/18333fig0517-tn.png b/book/05-distributed-git/images/18333fig0517-tn.png
similarity index 100%
rename from en/book/images/18333fig0517-tn.png
rename to book/05-distributed-git/images/18333fig0517-tn.png
diff --git a/en/book/images/18333fig0518-tn.png b/book/05-distributed-git/images/18333fig0518-tn.png
similarity index 100%
rename from en/book/images/18333fig0518-tn.png
rename to book/05-distributed-git/images/18333fig0518-tn.png
diff --git a/en/book/images/18333fig0519-tn.png b/book/05-distributed-git/images/18333fig0519-tn.png
similarity index 100%
rename from en/book/images/18333fig0519-tn.png
rename to book/05-distributed-git/images/18333fig0519-tn.png
diff --git a/en/book/images/18333fig0520-tn.png b/book/05-distributed-git/images/18333fig0520-tn.png
similarity index 100%
rename from en/book/images/18333fig0520-tn.png
rename to book/05-distributed-git/images/18333fig0520-tn.png
diff --git a/en/book/images/18333fig0521-tn.png b/book/05-distributed-git/images/18333fig0521-tn.png
similarity index 100%
rename from en/book/images/18333fig0521-tn.png
rename to book/05-distributed-git/images/18333fig0521-tn.png
diff --git a/en/book/images/18333fig0522-tn.png b/book/05-distributed-git/images/18333fig0522-tn.png
similarity index 100%
rename from en/book/images/18333fig0522-tn.png
rename to book/05-distributed-git/images/18333fig0522-tn.png
diff --git a/en/book/images/18333fig0523-tn.png b/book/05-distributed-git/images/18333fig0523-tn.png
similarity index 100%
rename from en/book/images/18333fig0523-tn.png
rename to book/05-distributed-git/images/18333fig0523-tn.png
diff --git a/en/book/images/18333fig0524-tn.png b/book/05-distributed-git/images/18333fig0524-tn.png
similarity index 100%
rename from en/book/images/18333fig0524-tn.png
rename to book/05-distributed-git/images/18333fig0524-tn.png
diff --git a/en/book/images/18333fig0525-tn.png b/book/05-distributed-git/images/18333fig0525-tn.png
similarity index 100%
rename from en/book/images/18333fig0525-tn.png
rename to book/05-distributed-git/images/18333fig0525-tn.png
diff --git a/en/book/images/18333fig0526-tn.png b/book/05-distributed-git/images/18333fig0526-tn.png
similarity index 100%
rename from en/book/images/18333fig0526-tn.png
rename to book/05-distributed-git/images/18333fig0526-tn.png
diff --git a/en/book/images/18333fig0527-tn.png b/book/05-distributed-git/images/18333fig0527-tn.png
similarity index 100%
rename from en/book/images/18333fig0527-tn.png
rename to book/05-distributed-git/images/18333fig0527-tn.png
diff --git a/en/book/06-github/chapter6.asc b/book/06-github/1-github.asc
similarity index 100%
rename from en/book/06-github/chapter6.asc
rename to book/06-github/1-github.asc
diff --git a/en/book/07-git-tools/chapter7.asc b/book/07-git-tools/1-git-tools.asc
similarity index 100%
rename from en/book/07-git-tools/chapter7.asc
rename to book/07-git-tools/1-git-tools.asc
diff --git a/en/book/images/18333fig0601-tn.png b/book/07-git-tools/images/18333fig0601-tn.png
similarity index 100%
rename from en/book/images/18333fig0601-tn.png
rename to book/07-git-tools/images/18333fig0601-tn.png
diff --git a/en/book/08-customizing-git/chapter8.asc b/book/08-customizing-git/1-customizing-git.asc
similarity index 100%
rename from en/book/08-customizing-git/chapter8.asc
rename to book/08-customizing-git/1-customizing-git.asc
diff --git a/en/book/images/18333fig0701-tn.png b/book/08-customizing-git/images/18333fig0701-tn.png
similarity index 100%
rename from en/book/images/18333fig0701-tn.png
rename to book/08-customizing-git/images/18333fig0701-tn.png
diff --git a/en/book/images/18333fig0702-tn.png b/book/08-customizing-git/images/18333fig0702-tn.png
similarity index 100%
rename from en/book/images/18333fig0702-tn.png
rename to book/08-customizing-git/images/18333fig0702-tn.png
diff --git a/en/book/images/18333fig0703-tn.png b/book/08-customizing-git/images/18333fig0703-tn.png
similarity index 100%
rename from en/book/images/18333fig0703-tn.png
rename to book/08-customizing-git/images/18333fig0703-tn.png
diff --git a/en/book/09-git-and-other-scms/chapter9.asc b/book/09-git-and-other-scms/1-git-and-other-scms.asc
similarity index 100%
rename from en/book/09-git-and-other-scms/chapter9.asc
rename to book/09-git-and-other-scms/1-git-and-other-scms.asc
diff --git a/en/book/10-git-in-other-environments/chapter10.asc b/book/10-git-in-other-environments/1-git-other-environments.asc
similarity index 99%
rename from en/book/10-git-in-other-environments/chapter10.asc
rename to book/10-git-in-other-environments/1-git-other-environments.asc
index 03b27eb4a..a2c4b7539 100644
--- a/en/book/10-git-in-other-environments/chapter10.asc
+++ b/book/10-git-in-other-environments/1-git-other-environments.asc
@@ -103,7 +103,7 @@ This is a hub for performing Git actions; when you're _writing_ code, you'll pro
[[vs_home]]
.The "Home" view for a Git repository in Visual Studio.
-image::images/vs-2.png[The "Home" view for a Git repository in Visual Studio.]
+image::images/vs-2.png[The Home view for a Git repository in Visual Studio.]
Visual Studio now has a powerful task-focused UI for Git.
It includes a linear history view, a diff viewer, remote commands, and many other capabilities.
diff --git a/en/book/images/egit.png b/book/10-git-in-other-environments/images/egit.png
similarity index 100%
rename from en/book/images/egit.png
rename to book/10-git-in-other-environments/images/egit.png
diff --git a/en/book/images/git-bash.png b/book/10-git-in-other-environments/images/git-bash.png
similarity index 100%
rename from en/book/images/git-bash.png
rename to book/10-git-in-other-environments/images/git-bash.png
diff --git a/en/book/images/git-gui.png b/book/10-git-in-other-environments/images/git-gui.png
similarity index 100%
rename from en/book/images/git-gui.png
rename to book/10-git-in-other-environments/images/git-gui.png
diff --git a/en/book/images/gitk.png b/book/10-git-in-other-environments/images/gitk.png
similarity index 100%
rename from en/book/images/gitk.png
rename to book/10-git-in-other-environments/images/gitk.png
diff --git a/en/book/images/posh-git.png b/book/10-git-in-other-environments/images/posh-git.png
similarity index 100%
rename from en/book/images/posh-git.png
rename to book/10-git-in-other-environments/images/posh-git.png
diff --git a/en/book/images/vs-1.png b/book/10-git-in-other-environments/images/vs-1.png
similarity index 100%
rename from en/book/images/vs-1.png
rename to book/10-git-in-other-environments/images/vs-1.png
diff --git a/en/book/images/vs-2.png b/book/10-git-in-other-environments/images/vs-2.png
similarity index 100%
rename from en/book/images/vs-2.png
rename to book/10-git-in-other-environments/images/vs-2.png
diff --git a/en/book/images/zsh-oh-my.png b/book/10-git-in-other-environments/images/zsh-oh-my.png
similarity index 100%
rename from en/book/images/zsh-oh-my.png
rename to book/10-git-in-other-environments/images/zsh-oh-my.png
diff --git a/en/book/images/zsh-prompt.png b/book/10-git-in-other-environments/images/zsh-prompt.png
similarity index 100%
rename from en/book/images/zsh-prompt.png
rename to book/10-git-in-other-environments/images/zsh-prompt.png
diff --git a/en/book/11-git-internals/chapter11.asc b/book/11-git-internals/1-git-internals.asc
similarity index 100%
rename from en/book/11-git-internals/chapter11.asc
rename to book/11-git-internals/1-git-internals.asc
diff --git a/en/book/images/18333fig0901-tn.png b/book/11-git-internals/images/18333fig0901-tn.png
similarity index 100%
rename from en/book/images/18333fig0901-tn.png
rename to book/11-git-internals/images/18333fig0901-tn.png
diff --git a/en/book/images/18333fig0902-tn.png b/book/11-git-internals/images/18333fig0902-tn.png
similarity index 100%
rename from en/book/images/18333fig0902-tn.png
rename to book/11-git-internals/images/18333fig0902-tn.png
diff --git a/en/book/images/18333fig0903-tn.png b/book/11-git-internals/images/18333fig0903-tn.png
similarity index 100%
rename from en/book/images/18333fig0903-tn.png
rename to book/11-git-internals/images/18333fig0903-tn.png
diff --git a/en/book/images/18333fig0904-tn.png b/book/11-git-internals/images/18333fig0904-tn.png
similarity index 100%
rename from en/book/images/18333fig0904-tn.png
rename to book/11-git-internals/images/18333fig0904-tn.png
diff --git a/book/cover.html b/book/cover.html
new file mode 100644
index 000000000..523a2529a
--- /dev/null
+++ b/book/cover.html
@@ -0,0 +1 @@
+
diff --git a/book/index.asc b/book/index.asc
new file mode 100644
index 000000000..9b0c1cfae
--- /dev/null
+++ b/book/index.asc
@@ -0,0 +1 @@
+== Index
diff --git a/en/book/book.asc b/book/preface.asc
similarity index 84%
rename from en/book/book.asc
rename to book/preface.asc
index e5ca0c921..f00a1dc65 100644
--- a/en/book/book.asc
+++ b/book/preface.asc
@@ -32,28 +32,3 @@ I didn't much like that I was writing what I felt was essentially a community re
While I still don't love that conflict of interests, the importance of GitHub in the Git community is unavoidable.
Instead of an example of Git hosting, I have decided to turn that part of the book into more deeply describing what GitHub is and how to effectively use it.
If you are going to learn how to use Git then knowing how to use GitHub will help you take part in a huge community, which is valuable no matter which Git host you decide to use for your own code.
-
-include::01-introduction/chapter1.asc[]
-
-include::02-git-basics/chapter2.asc[]
-
-include::03-git-branching/chapter3.asc[]
-
-include::04-git-server/chapter4.asc[]
-
-include::05-distributed-git/chapter5.asc[]
-
-include::06-github/chapter6.asc[]
-
-include::07-git-tools/chapter7.asc[]
-
-include::08-customizing-git/chapter8.asc[]
-
-include::09-git-and-other-scms/chapter9.asc[]
-
-include::10-git-in-other-environments/chapter10.asc[]
-
-include::11-git-internals/chapter11.asc[]
-
-[index]
-== Index
diff --git a/en/.gitscribe b/en/.gitscribe
deleted file mode 100644
index f3d9ed57f..000000000
--- a/en/.gitscribe
+++ /dev/null
@@ -1,7 +0,0 @@
----
-publish: true
-edition: 2.0
-language: en
-version: 1.0
-author: Scott Chacon and Ben Straub
-cover: images/cover.jpg
diff --git a/en/book/book-docinfo.xml b/en/book/book-docinfo.xml
deleted file mode 100644
index 1e41ad498..000000000
--- a/en/book/book-docinfo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-
- Scott
- Chacon
- schacon@gmail.com
-
-
-
- Ben
- Straub
- ben@straub.cc
-
-
diff --git a/en/book/images/cover.jpg b/en/book/images/cover.jpg
deleted file mode 100644
index e7b25a6fc..000000000
Binary files a/en/book/images/cover.jpg and /dev/null differ
diff --git a/images/cover.png b/images/cover.png
new file mode 100644
index 000000000..681cbeea6
Binary files /dev/null and b/images/cover.png differ
