diff --git a/2-structured-data/pom.xml b/2-structured-data/pom.xml
new file mode 100644
index 000000000..0bc5616b9
--- /dev/null
+++ b/2-structured-data/pom.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Copyright 2015 Google Inc. All Rights Reserved.
+
+ Licensed 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine.gettingstartedjava</groupId>
+  <artifactId>bookshelf2</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gcloud</groupId>
+      <artifactId>gcloud-java-datastore</artifactId>
+      <version>0.0.12</version>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.37</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>gcloud-maven-plugin</artifactId>
+        <version>2.0.9.89.v20151202</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
new file mode 100644
index 000000000..03d8df7bf
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
@@ -0,0 +1,60 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.daos.CloudSqlDao;
+import com.example.appengine.gettingstartedjava.daos.DatastoreDao;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+public class RootServlet extends HttpServlet {
+
+  @Override
+  public void init() throws ServletException {
+    String storageType = System.getenv("AEV2_JAVA_STORAGETYPE");
+    BookDao dao = null;
+    switch (storageType) {
+      case "datastore":
+        dao = new DatastoreDao();
+        break;
+      case "cloudsql":
+        try {
+          dao = new CloudSqlDao();
+        } catch (SQLException e) {
+          throw new ServletException("SQL error", e);
+        }
+        break;
+      default:
+        throw new IllegalStateException("Invalid storage type. Check if environment variable is set.");
+    }
+    this.getServletContext().setAttribute("dao", dao);
+  }
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+        ServletException {
+    req.getRequestDispatcher("/books").forward(req, resp);
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
new file mode 100644
index 000000000..f66ff62ae
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+public interface BookDao {
+
+  public Long createBook(Book book) throws Exception;
+
+  public Book readBook(Long bookId) throws Exception;
+
+  public void updateBook(Book book) throws Exception;
+
+  public void deleteBook(Long bookId) throws Exception;
+
+  public Result<Book> listBooks(String startCursor) throws Exception;
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
new file mode 100644
index 000000000..f6da47491
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
@@ -0,0 +1,147 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CloudSqlDao implements BookDao {
+
+  private static final BasicDataSource dataSource = new BasicDataSource();
+
+  public CloudSqlDao() throws SQLException {
+    final String url = System.getenv("SQL_DATABASE_URL");
+    dataSource.setUrl(url);
+    final String createTableSql = "CREATE TABLE IF NOT EXISTS books ( id INT NOT NULL "
+        + "AUTO_INCREMENT, author VARCHAR(255), description VARCHAR(255), publishedDate "
+        + "VARCHAR(255), title VARCHAR(255), PRIMARY KEY (id))";
+    try (Connection conn = dataSource.getConnection()) {
+      conn.createStatement().executeUpdate(createTableSql);
+    }
+  }
+
+  @Override
+  public Long createBook(Book book) throws SQLException {
+    final String createBookString = "INSERT INTO books (author, description, publishedDate, title) "
+        + "VALUES (?, ?, ?, ?)";
+    try (Connection conn = dataSource.getConnection();
+        final PreparedStatement createBookStmt = conn.prepareStatement(createBookString,
+            Statement.RETURN_GENERATED_KEYS)) {
+      createBookStmt.setString(1, book.getAuthor());
+      createBookStmt.setString(2, book.getDescription());
+      createBookStmt.setString(3, book.getPublishedDate());
+      createBookStmt.setString(4, book.getTitle());
+      createBookStmt.executeUpdate();
+      try (ResultSet keys = createBookStmt.getGeneratedKeys()) {
+        keys.next();
+        return keys.getLong(1);
+      }
+    }
+  }
+
+  @Override
+  public Book readBook(Long bookId) throws SQLException {
+    final String readBookString = "SELECT * FROM books WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement readBookStmt = conn.prepareStatement(readBookString)) {
+      readBookStmt.setLong(1, bookId);
+      try (ResultSet keys = readBookStmt.executeQuery()) {
+        keys.next();
+        return new Book.Builder()
+            .author(keys.getString("author"))
+            .description(keys.getString("description"))
+            .id(keys.getLong("id"))
+            .publishedDate(keys.getString("publishedDate"))
+            .title(keys.getString("title"))
+            .build();
+      }
+    }
+  }
+
+  @Override
+  public void updateBook(Book book) throws SQLException {
+    final String updateBookString = "UPDATE books SET author = ?, description = ?, "
+        + "publishedDate = ?, title = ? WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement updateBookStmt = conn.prepareStatement(updateBookString)) {
+      updateBookStmt.setString(1, book.getAuthor());
+      updateBookStmt.setString(2, book.getDescription());
+      updateBookStmt.setString(3, book.getPublishedDate());
+      updateBookStmt.setString(4, book.getTitle());
+      updateBookStmt.setLong(5, book.getId());
+      updateBookStmt.executeUpdate();
+    }
+  }
+
+  @Override
+  public void deleteBook(Long bookId) throws SQLException {
+    final String deleteBookString = "DELETE FROM books WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement deleteBookStmt = conn.prepareStatement(deleteBookString)) {
+      deleteBookStmt.setLong(1, bookId);
+      deleteBookStmt.executeUpdate();
+    }
+  }
+
+  @Override
+  public Result<Book> listBooks(String cursor) throws SQLException {
+    int offset = 0;
+    if (cursor != null && !cursor.equals("")) {
+      offset = Integer.parseInt(cursor);
+    }
+    final String listBooksString = "SELECT SQL_CALC_FOUND_ROWS author, description, id, "
+        + "publishedDate, title FROM books ORDER BY title ASC LIMIT 10 OFFSET ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement listBooksStmt = conn.prepareStatement(listBooksString)) {
+      listBooksStmt.setInt(1, offset);
+      List<Book> resultBooks = new ArrayList<>();
+      try (ResultSet rs = listBooksStmt.executeQuery()) {
+        while (rs.next()) {
+          Book book = new Book.Builder()
+              .author(rs.getString("author"))
+              .description(rs.getString("description"))
+              .id(rs.getLong("id"))
+              .publishedDate(rs.getString("publishedDate"))
+              .title(rs.getString("title"))
+              .build();
+          resultBooks.add(book);
+        }
+      }
+      try (ResultSet rs = conn.createStatement().executeQuery("SELECT FOUND_ROWS()")) {
+        int totalNumRows = 0;
+        if (rs.next()) {
+          totalNumRows = rs.getInt(1);
+        }
+        if (totalNumRows > offset + 10) {
+          return new Result<>(resultBooks, Integer.toString(offset + 10));
+        } else {
+          return new Result<>(resultBooks);
+        }
+      }
+    }
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
new file mode 100644
index 000000000..1fd97db8a
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
@@ -0,0 +1,128 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import com.google.gcloud.datastore.Cursor;
+import com.google.gcloud.datastore.Datastore;
+import com.google.gcloud.datastore.DatastoreOptions;
+import com.google.gcloud.datastore.Entity;
+import com.google.gcloud.datastore.FullEntity;
+import com.google.gcloud.datastore.IncompleteKey;
+import com.google.gcloud.datastore.Key;
+import com.google.gcloud.datastore.KeyFactory;
+import com.google.gcloud.datastore.Query;
+import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery.OrderBy;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DatastoreDao implements BookDao {
+
+  private Datastore datastore;
+  private KeyFactory keyFactory;
+
+  public DatastoreDao() {
+    datastore = DatastoreOptions
+        .builder()
+        .projectId(System.getenv("PROJECT_ID"))
+        .build()
+        .service();
+    keyFactory = datastore.newKeyFactory().kind("Book");
+  }
+
+  @Override
+  public Long createBook(Book book) {
+    IncompleteKey key = keyFactory.kind("Book").newKey();
+    FullEntity<IncompleteKey> incBookEntity = Entity.builder(key)
+        .set("author", book.getAuthor())
+        .set("description", book.getDescription())
+        .set("publishedDate", book.getPublishedDate())
+        .set("title", book.getTitle())
+        .build();
+    Entity bookEntity = datastore.add(incBookEntity);
+    return bookEntity.key().id();
+  }
+
+  @Override
+  public Book readBook(Long bookId) {
+    Entity bookEntity = datastore.get(keyFactory.newKey(bookId));
+    return new Book.Builder()
+        .author(bookEntity.getString("author"))
+        .description(bookEntity.getString("description"))
+        .id(bookEntity.key().id())
+        .publishedDate(bookEntity.getString("publishedDate"))
+        .title(bookEntity.getString("title"))
+        .build();
+  }
+
+  @Override
+  public void updateBook(Book book) {
+    Key key = keyFactory.newKey(book.getId());
+    Entity entity = Entity.builder(key)
+        .set("author", book.getAuthor())
+        .set("description", book.getDescription())
+        .set("publishedDate", book.getPublishedDate())
+        .set("title", book.getTitle())
+        .build();
+    datastore.update(entity);
+  }
+
+  @Override
+  public void deleteBook(Long bookId) {
+    Key key = keyFactory.newKey(bookId);
+    datastore.delete(key);
+  }
+
+  @Override
+  public Result<Book> listBooks(String startCursorString) {
+    Query<Entity> q;
+    Cursor startCursor = null;
+    if(startCursorString != null && !startCursorString.equals("")) {
+          startCursor = Cursor.fromUrlSafe(startCursorString);
+    }
+    q = Query.entityQueryBuilder()
+        .kind("Book")
+        .limit(10)
+        .startCursor(startCursor)
+        .orderBy(OrderBy.asc("title"))
+        .build();
+    QueryResults<Entity> resultList = datastore.run(q);
+    List<Book> resultBooks = new ArrayList<>();
+    while(resultList.hasNext()) {
+      Entity bookEntity = resultList.next();
+      Book book = new Book.Builder()
+          .author(bookEntity.getString("author"))
+          .description(bookEntity.getString("description"))
+          .id(bookEntity.key().id())
+          .publishedDate(bookEntity.getString("publishedDate"))
+          .title(bookEntity.getString("title"))
+          .build();
+      resultBooks.add(book);
+    }
+    Cursor cursor = resultList.cursorAfter(); // note cursorAfter() doesn't work currently
+    if(cursor != null)  {
+      String cursorString = cursor.toUrlSafe();
+      return new Result<>(resultBooks, cursorString);
+    } else {
+      return new Result<>(resultBooks);
+    }
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
new file mode 100644
index 000000000..22a2e13ce
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
@@ -0,0 +1,117 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.objects;
+
+public class Book {
+
+  private String title;
+  private String author;
+  private String publishedDate;
+  private String description;
+  private Long id;
+
+  // We use a Builder pattern here to simplify and standardize construction of Book objects.
+  private Book(Builder b) {
+    this.title = b.title;
+    this.author = b.author;
+    this.publishedDate = b.publishedDate;
+    this.description = b.description;
+    this.id = b.id;
+  }
+
+  public static class Builder {
+    private String title;
+    private String author;
+    private String publishedDate;
+    private String description;
+    private Long id;
+
+    public Builder title(String title) {
+      this.title = title;
+      return this;
+    }
+
+    public Builder author(String author) {
+      this.author = author;
+      return this;
+    }
+
+    public Builder publishedDate(String publishedDate) {
+      this.publishedDate = publishedDate;
+      return this;
+    }
+
+    public Builder description(String description) {
+      this.description = description;
+      return this;
+    }
+
+    public Builder id(Long id) {
+      this.id = id;
+      return this;
+    }
+
+    public Book build() {
+      return new Book(this);
+    }
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public String getPublishedDate() {
+    return publishedDate;
+  }
+
+  public void setPublishedDate(String publishedDate) {
+    this.publishedDate = publishedDate;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  @Override
+  public String toString() {
+    return author;
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
new file mode 100644
index 000000000..9f48b9a79
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.objects;
+
+import java.util.List;
+
+public class Result<K> {
+
+  public String cursor;
+  public List<K> result;
+
+  public Result(List<K> result, String cursor) {
+    this.result = result;
+    this.cursor = cursor;
+  }
+
+  public Result(List<K> result) {
+    this.result = result;
+    this.cursor = null;
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java
new file mode 100644
index 000000000..e2f2653e5
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java
@@ -0,0 +1,59 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "create", value = "/create")
+public class CreateBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    req.setAttribute("action", "Add");
+    req.setAttribute("destination", "create");
+    req.getRequestDispatcher("/form.jsp").forward(req, resp);
+  }
+
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    Book book = new Book.Builder()
+        .author(req.getParameter("author"))
+        .description(req.getParameter("description"))
+        .publishedDate(req.getParameter("publishedDate"))
+        .title(req.getParameter("title"))
+        .build();
+    try {
+      Long id = dao.createBook(book);
+      resp.sendRedirect("/read?id="+id.toString());
+    } catch (Exception e) {
+      throw new ServletException("Error creating book", e);
+    }
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java
new file mode 100644
index 000000000..19d44a857
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "delete", value = "/delete")
+public class DeleteBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    Long id = Long.decode(req.getParameter("id"));
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      dao.deleteBook(id);
+      resp.sendRedirect("/books");
+    } catch (Exception e) {
+      throw new ServletException("Error deleting book", e);
+    }
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java
new file mode 100644
index 000000000..f2e52745f
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "list", value = "/books")
+public class ListBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+        ServletException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    String startCursor = req.getParameter("cursor");
+    List<Book> books = null;
+    String endCursor = null;
+    try {
+      Result<Book> result = dao.listBooks(startCursor);
+      books = result.result;
+      endCursor = result.cursor;
+    } catch (Exception e) {
+      throw new ServletException("Error listing books", e);
+    }
+    req.getSession().getServletContext().setAttribute("books", books);
+    req.setAttribute("cursor", endCursor);
+    req.getRequestDispatcher("/base.jsp").forward(req, resp);
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java
new file mode 100644
index 000000000..cb7cd1a75
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "read", value = "/read")
+public class ReadBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+      ServletException {
+    Long id = Long.decode(req.getParameter("id"));
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      Book book = dao.readBook(id);
+      req.setAttribute("book", book);
+      req.getRequestDispatcher("/view.jsp").forward(req, resp);
+    } catch (Exception e) {
+      throw new ServletException("Error reading book", e);
+    }
+  }
+}
diff --git a/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java
new file mode 100644
index 000000000..c22ae3678
--- /dev/null
+++ b/2-structured-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java
@@ -0,0 +1,67 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "update", value = "/update")
+public class UpdateBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      Book book = dao.readBook(Long.decode(req.getParameter("id")));
+      req.setAttribute("book", book);
+      req.setAttribute("action", "Edit");
+      req.setAttribute("destination", "update");
+      req.getRequestDispatcher("/form.jsp").forward(req, resp);
+    } catch (Exception e) {
+      throw new ServletException("Error loading book for editing", e);
+    }
+  }
+
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    Book book = new Book.Builder()
+        .author(req.getParameter("author"))
+        .description(req.getParameter("description"))
+        .id(Long.decode(req.getParameter("id")))
+        .publishedDate(req.getParameter("publishedDate"))
+        .title(req.getParameter("title"))
+        .build();
+    try {
+      dao.updateBook(book);
+      resp.sendRedirect("/read?id=" + req.getParameter("id"));
+    } catch (Exception e) {
+      throw new ServletException("Error updating book", e);
+    }
+  }
+}
diff --git a/2-structured-data/src/main/webapp/WEB-INF/appengine-web.xml b/2-structured-data/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..341dbc579
--- /dev/null
+++ b/2-structured-data/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <sessions-enabled>true</sessions-enabled>
+  <threadsafe>true</threadsafe>
+  <vm>true</vm>
+  <!-- TODO remove beta-settings -->
+  <beta-settings>
+    <setting name="java_quickstart" value="true" />
+  </beta-settings>
+  <env-variables>
+    <env-var name="AEV2_JAVA_STORAGETYPE" value="YOUR-DATABASE-SELECTION" />
+    <env-var name="SQL_DATABASE_URL" value="jdbc:mysql://HOST-IP:3306/YOUR-DB-NAME?user=USERNAME&amp;password=PASSWORD" />
+    <env-var name="PROJECT_ID" value="YOUR-PROJECT-ID" />
+  </env-variables>
+</appengine-web-app>
diff --git a/2-structured-data/src/main/webapp/WEB-INF/web.xml b/2-structured-data/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..6467df305
--- /dev/null
+++ b/2-structured-data/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,10 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+  <servlet>
+    <servlet-name>root</servlet-name>
+    <servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>root</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>
diff --git a/2-structured-data/src/main/webapp/base.jsp b/2-structured-data/src/main/webapp/base.jsp
new file mode 100644
index 000000000..e95ea8fc0
--- /dev/null
+++ b/2-structured-data/src/main/webapp/base.jsp
@@ -0,0 +1,57 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Java on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3>Books</h3>
+      <a href="/create" class="btn btn-success btn-sm">
+        <i class="glyphicon glyphicon-plus"></i>
+        Add book
+      </a>
+      <c:choose>
+      <c:when test="${empty books}">
+      <p>No books found</p>
+      </c:when>
+      <c:otherwise>
+      <c:forEach items="${books}" var="book">
+      <div class="media">
+        <a href="/read?id=${book.id}">
+          <div class="media-left">
+            <img alt="ahhh" src="http://placekitten.com/g/128/192">
+          </div>
+          <div class="media-body">
+            <h4>${fn:escapeXml(book.title)}</h4>
+            <p>${fn:escapeXml(book.author)}</p>
+          </div>
+        </a>
+      </div>
+      </c:forEach>
+      <c:if test="${not empty cursor}">
+      <nav>
+        <ul class="pager">
+          <li><a href="?cursor=${fn:escapeXml(cursor)}">More</a></li>
+        </ul>
+      </nav>
+      </c:if>
+      </c:otherwise>
+      </c:choose>
+    </div>
+  </body>
+</html>
diff --git a/2-structured-data/src/main/webapp/form.jsp b/2-structured-data/src/main/webapp/form.jsp
new file mode 100644
index 000000000..3e757efe6
--- /dev/null
+++ b/2-structured-data/src/main/webapp/form.jsp
@@ -0,0 +1,52 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Python on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3><c:out value="${action}"/> book</h3>
+
+      <form method="POST" action="${destination}">
+
+        <div class="form-group">
+          <label for="title">Title</label>
+          <input type="text" name="title" id="title" value="${fn:escapeXml(book.title)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="author">Author</label>
+          <input type="text" name="author" id="author" value="${fn:escapeXml(book.author)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="publishedDate">Date Published</label>
+          <input type="text" name="publishedDate" id="publishedDate" value="${fn:escapeXml(book.publishedDate)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="description">Description</label>
+          <textarea name="description" id="description" class="form-control">${fn:escapeXml(book.description)}</textarea>
+        </div>
+
+        <input type="hidden" name="id" value="${book.id}"/>
+        <button type="submit" class="btn btn-success">Save</button>
+      </form>
+    </div>
+  </body>
+</html>
diff --git a/2-structured-data/src/main/webapp/view.jsp b/2-structured-data/src/main/webapp/view.jsp
new file mode 100644
index 000000000..ffadb1288
--- /dev/null
+++ b/2-structured-data/src/main/webapp/view.jsp
@@ -0,0 +1,51 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Python on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3>Book</h3>
+      <div class="btn-group">
+        <a href="/update?id=${book.id}" class="btn btn-primary btn-sm">
+          <i class="glyphicon glyphicon-edit"></i>
+          Edit book
+        </a>
+        <a href="/delete?id=${book.id}" class="btn btn-danger btn-sm">
+          <i class="glyphicon glyphicon-trash"></i>
+          Delete book
+        </a>
+      </div>
+
+      <div class="media">
+        <div class="media-left">
+          <img class="book-image" src="http://placekitten.com/g/128/192">
+        </div>
+        <div class="media-body">
+          <h4 class="book-title">
+            ${fn:escapeXml(book.title)}
+            <small>${fn:escapeXml(book.publishedDate)}</small>
+          </h4>
+          <h5 class="book-author">By ${fn:escapeXml(not empty book.author?book.author:'Unknown')}</h5>
+          <p class="book-description">${fn:escapeXml(book.description)}</p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+
diff --git a/3-binary-data/pom.xml b/3-binary-data/pom.xml
new file mode 100644
index 000000000..0be6a4097
--- /dev/null
+++ b/3-binary-data/pom.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <packaging>war</packaging>
+  <version>1.0-SNAPSHOT</version>
+  <groupId>com.example.appengine.gettingstartedjava</groupId>
+  <artifactId>bookshelf3</artifactId>
+  <dependencies>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>javax.servlet-api</artifactId>
+      <version>3.1.0</version>
+      <type>jar</type>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gcloud</groupId>
+      <artifactId>gcloud-java-datastore</artifactId>
+      <version>0.0.12</version>
+    </dependency>
+    <dependency>
+      <groupId>com.google.gcloud</groupId>
+      <artifactId>gcloud-java-storage</artifactId>
+      <version>0.0.12</version>
+    </dependency>
+    <dependency>
+      <groupId>jstl</groupId>
+      <artifactId>jstl</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>taglibs</groupId>
+      <artifactId>standard</artifactId>
+      <version>1.1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.commons</groupId>
+      <artifactId>commons-dbcp2</artifactId>
+      <version>2.1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.37</version>
+    </dependency>
+    <dependency>
+        <groupId>joda-time</groupId>
+        <artifactId>joda-time</artifactId>
+        <version>2.9.1</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <!-- for hot reload of the web application -->
+    <outputDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</outputDirectory>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-war-plugin</artifactId>
+        <version>2.6</version>
+        <configuration>
+          <failOnMissingWebXml>false</failOnMissingWebXml>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>3.3</version>
+        <configuration>
+          <source>1.7</source>
+          <target>1.7</target>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>com.google.appengine</groupId>
+        <artifactId>gcloud-maven-plugin</artifactId>
+        <version>2.0.9.89.v20151202</version>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
new file mode 100644
index 000000000..82ddc1123
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/RootServlet.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.daos.CloudSqlDao;
+import com.example.appengine.gettingstartedjava.daos.DatastoreDao;
+import com.example.appengine.gettingstartedjava.util.CloudStorageHelper;
+
+import java.io.IOException;
+import java.sql.SQLException;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+public class RootServlet extends HttpServlet {
+
+  @Override
+  public void init() throws ServletException {
+    String storageType = System.getenv("AEV2_JAVA_STORAGETYPE");
+    BookDao dao = null;
+    switch (storageType) {
+      case "datastore":
+        dao = new DatastoreDao();
+        break;
+      case "cloudsql":
+        try {
+          dao = new CloudSqlDao();
+        } catch (SQLException e) {
+          throw new ServletException("SQL error", e);
+        }
+        break;
+      default:
+        throw new IllegalStateException("Invalid storage type. Check if environment variable is set.");
+    }
+    this.getServletContext().setAttribute("dao", dao);
+    CloudStorageHelper storageHelper = new CloudStorageHelper();
+    this.getServletContext().setAttribute("storageHelper", storageHelper);
+  }
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+        ServletException {
+    req.getRequestDispatcher("/books").forward(req, resp);
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
new file mode 100644
index 000000000..f66ff62ae
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/BookDao.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+public interface BookDao {
+
+  public Long createBook(Book book) throws Exception;
+
+  public Book readBook(Long bookId) throws Exception;
+
+  public void updateBook(Book book) throws Exception;
+
+  public void deleteBook(Long bookId) throws Exception;
+
+  public Result<Book> listBooks(String startCursor) throws Exception;
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
new file mode 100644
index 000000000..da1e90a3c
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/CloudSqlDao.java
@@ -0,0 +1,151 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import org.apache.commons.dbcp2.BasicDataSource;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CloudSqlDao implements BookDao {
+
+  private static final BasicDataSource dataSource = new BasicDataSource();
+
+  public CloudSqlDao() throws SQLException {
+    final String url = System.getenv("SQL_DATABASE_URL");
+    dataSource.setUrl(url);
+    final String createTableSql = "CREATE TABLE IF NOT EXISTS books3 ( id INT NOT NULL "
+        + "AUTO_INCREMENT, author VARCHAR(255), description VARCHAR(255), publishedDate "
+        + "VARCHAR(255), title VARCHAR(255), imageUrl VARCHAR(255), PRIMARY KEY (id))";
+    try (Connection conn = dataSource.getConnection()) {
+      conn.createStatement().executeUpdate(createTableSql);
+    }
+  }
+
+  @Override
+  public Long createBook(Book book) throws SQLException {
+    final String createBookString = "INSERT INTO books3 "
+        + "(author, description, publishedDate, title, imageUrl) VALUES (?, ?, ?, ?, ?)";
+    try (Connection conn = dataSource.getConnection();
+        final PreparedStatement createBookStmt = conn.prepareStatement(createBookString,
+            Statement.RETURN_GENERATED_KEYS)) {
+      createBookStmt.setString(1, book.getAuthor());
+      createBookStmt.setString(2, book.getDescription());
+      createBookStmt.setString(3, book.getPublishedDate());
+      createBookStmt.setString(4, book.getTitle());
+      createBookStmt.setString(5, book.getImageUrl());
+      createBookStmt.executeUpdate();
+      try (ResultSet keys = createBookStmt.getGeneratedKeys()) {
+        keys.next();
+        return keys.getLong(1);
+      }
+    }
+  }
+
+  @Override
+  public Book readBook(Long bookId) throws SQLException {
+    final String readBookString = "SELECT * FROM books3 WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement readBookStmt = conn.prepareStatement(readBookString)) {
+      readBookStmt.setLong(1, bookId);
+      try (ResultSet keys = readBookStmt.executeQuery()) {
+        keys.next();
+        return new Book.Builder()
+            .author(keys.getString("author"))
+            .description(keys.getString("description"))
+            .id(keys.getLong("id"))
+            .publishedDate(keys.getString("publishedDate"))
+            .title(keys.getString("title"))
+            .imageUrl(keys.getString("imageUrl"))
+            .build();
+      }
+    }
+  }
+
+  @Override
+  public void updateBook(Book book) throws SQLException {
+    final String updateBookString = "UPDATE books3 SET author = ?, description = ?, "
+        + "publishedDate = ?, title = ?, imageUrl = ? WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement updateBookStmt = conn.prepareStatement(updateBookString)) {
+      updateBookStmt.setString(1, book.getAuthor());
+      updateBookStmt.setString(2, book.getDescription());
+      updateBookStmt.setString(3, book.getPublishedDate());
+      updateBookStmt.setString(4, book.getTitle());
+      updateBookStmt.setString(5, book.getImageUrl());
+      updateBookStmt.setLong(6, book.getId());
+      updateBookStmt.executeUpdate();
+    }
+  }
+
+  @Override
+  public void deleteBook(Long bookId) throws SQLException {
+    final String deleteBookString = "DELETE FROM books3 WHERE id = ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement deleteBookStmt = conn.prepareStatement(deleteBookString)) {
+      deleteBookStmt.setLong(1, bookId);
+      deleteBookStmt.executeUpdate();
+    }
+  }
+
+  @Override
+  public Result<Book> listBooks(String cursor) throws SQLException {
+    int offset = 0;
+    if (cursor != null && !cursor.equals("")) {
+      offset = Integer.parseInt(cursor);
+    }
+    final String listBooksString = "SELECT SQL_CALC_FOUND_ROWS author, description, id, "
+        + "publishedDate, title, imageUrl FROM books3 ORDER BY title ASC LIMIT 10 OFFSET ?";
+    try (Connection conn = dataSource.getConnection();
+        PreparedStatement listBooksStmt = conn.prepareStatement(listBooksString)) {
+      listBooksStmt.setInt(1, offset);
+      List<Book> resultBooks = new ArrayList<>();
+      try (ResultSet rs = listBooksStmt.executeQuery()) {
+        while (rs.next()) {
+          Book book = new Book.Builder()
+              .author(rs.getString("author"))
+              .description(rs.getString("description"))
+              .id(rs.getLong("id"))
+              .publishedDate(rs.getString("publishedDate"))
+              .title(rs.getString("title"))
+              .imageUrl(rs.getString("imageUrl"))
+              .build();
+          resultBooks.add(book);
+        }
+      }
+      try (ResultSet rs = conn.createStatement().executeQuery("SELECT FOUND_ROWS()")) {
+        int totalNumRows = 0;
+        if (rs.next()) {
+          totalNumRows = rs.getInt(1);
+        }
+        if (totalNumRows > offset + 10) {
+          return new Result<>(resultBooks, Integer.toString(offset + 10));
+        } else {
+          return new Result<>(resultBooks);
+        }
+      }
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
new file mode 100644
index 000000000..589ffa251
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/daos/DatastoreDao.java
@@ -0,0 +1,136 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.daos;
+
+import com.google.gcloud.datastore.Cursor;
+import com.google.gcloud.datastore.Datastore;
+import com.google.gcloud.datastore.DatastoreOptions;
+import com.google.gcloud.datastore.Entity;
+import com.google.gcloud.datastore.FullEntity;
+import com.google.gcloud.datastore.IncompleteKey;
+import com.google.gcloud.datastore.Key;
+import com.google.gcloud.datastore.KeyFactory;
+import com.google.gcloud.datastore.Query;
+import com.google.gcloud.datastore.QueryResults;
+import com.google.gcloud.datastore.StructuredQuery.OrderBy;
+
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DatastoreDao implements BookDao {
+
+  private Datastore datastore;
+  private KeyFactory keyFactory;
+
+  public DatastoreDao() {
+    datastore = DatastoreOptions
+        .builder()
+        .projectId(System.getenv("PROJECT_ID"))
+        .build()
+        .service();
+    keyFactory = datastore.newKeyFactory().kind("Book");
+  }
+
+  @Override
+  public Long createBook(Book book) {
+    IncompleteKey key = keyFactory.kind("Book").newKey();
+    FullEntity<IncompleteKey> incBookEntity = Entity.builder(key)
+        .set("author", book.getAuthor())
+        .set("description", book.getDescription())
+        .set("publishedDate", book.getPublishedDate())
+        .set("title", book.getTitle())
+        .set("imageUrl", book.getImageUrl())
+        .build();
+    Entity bookEntity = datastore.add(incBookEntity);
+    return bookEntity.key().id();
+  }
+
+  @Override
+  public Book readBook(Long bookId) {
+    Entity bookEntity = datastore.get(keyFactory.newKey(bookId));
+    return new Book.Builder()
+        .author(bookEntity.getString("author"))
+        .description(bookEntity.getString("description"))
+        .id(bookEntity.key().id())
+        .publishedDate(bookEntity.getString("publishedDate"))
+        .title(bookEntity.getString("title"))
+          // maintain backwards compatibility with
+          // books created in 2-structured data which do not have imageUrl property
+        .imageUrl(bookEntity.contains("imageUrl") ? bookEntity.getString("imageUrl") : null)
+        .build();
+  }
+
+  @Override
+  public void updateBook(Book book) {
+    Key key = keyFactory.newKey(book.getId());
+    Entity entity = Entity.builder(key)
+        .set("author", book.getAuthor())
+        .set("description", book.getDescription())
+        .set("publishedDate", book.getPublishedDate())
+        .set("title", book.getTitle())
+        .set("imageUrl", book.getImageUrl())
+        .build();
+    datastore.update(entity);
+  }
+
+  @Override
+  public void deleteBook(Long bookId) {
+    Key key = keyFactory.newKey(bookId);
+    datastore.delete(key);
+  }
+
+  @Override
+  public Result<Book> listBooks(String startCursorString) {
+    Query<Entity> q;
+    Cursor startCursor = null;
+    if(startCursorString != null && !startCursorString.equals("")) {
+          startCursor = Cursor.fromUrlSafe(startCursorString);
+    }
+    q = Query.entityQueryBuilder()
+        .kind("Book")
+        .limit(10)
+        .startCursor(startCursor)
+        .orderBy(OrderBy.asc("title"))
+        .build();
+    QueryResults<Entity> resultList = datastore.run(q);
+    List<Book> resultBooks = new ArrayList<>();
+    while(resultList.hasNext()) {
+      Entity bookEntity = resultList.next();
+      Book book = new Book.Builder()
+          .author(bookEntity.getString("author"))
+          .description(bookEntity.getString("description"))
+          .id(bookEntity.key().id())
+          .publishedDate(bookEntity.getString("publishedDate"))
+          .title(bookEntity.getString("title"))
+          // maintain backwards compatibility with
+          // books created in 2-structured data which do not have imageUrl property
+          .imageUrl(bookEntity.contains("imageUrl") ? bookEntity.getString("imageUrl") : null)
+          .build();
+      resultBooks.add(book);
+    }
+    Cursor cursor = resultList.cursorAfter(); // note cursorAfter() doesn't work currently
+    if(cursor != null)  {
+      String cursorString = cursor.toUrlSafe();
+      return new Result<>(resultBooks, cursorString);
+    } else {
+      return new Result<>(resultBooks);
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
new file mode 100644
index 000000000..246ec31ba
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Book.java
@@ -0,0 +1,133 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.objects;
+
+public class Book {
+
+  private String title;
+  private String author;
+  private String publishedDate;
+  private String description;
+  private Long id;
+  private String imageUrl;
+
+  // We use a Builder pattern here to simplify and standardize construction of Book objects.
+  private Book(Builder b) {
+    this.title = b.title;
+    this.author = b.author;
+    this.publishedDate = b.publishedDate;
+    this.description = b.description;
+    this.id = b.id;
+    this.imageUrl = b.imageUrl;
+  }
+
+  public static class Builder {
+    private String title;
+    private String author;
+    private String publishedDate;
+    private String description;
+    private Long id;
+    private String imageUrl;
+
+    public Builder title(String title) {
+      this.title = title;
+      return this;
+    }
+
+    public Builder author(String author) {
+      this.author = author;
+      return this;
+    }
+
+    public Builder publishedDate(String publishedDate) {
+      this.publishedDate = publishedDate;
+      return this;
+    }
+
+    public Builder description(String description) {
+      this.description = description;
+      return this;
+    }
+
+    public Builder id(Long id) {
+      this.id = id;
+      return this;
+    }
+
+    public Builder imageUrl(String imageUrl) {
+      this.imageUrl = imageUrl;
+      return this;
+    }
+
+    public Book build() {
+      return new Book(this);
+    }
+  }
+
+  public String getTitle() {
+    return title;
+  }
+
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  public String getAuthor() {
+    return author;
+  }
+
+  public void setAuthor(String author) {
+    this.author = author;
+  }
+
+  public String getPublishedDate() {
+    return publishedDate;
+  }
+
+  public void setPublishedDate(String publishedDate) {
+    this.publishedDate = publishedDate;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public void setDescription(String description) {
+    this.description = description;
+  }
+
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public String getImageUrl() {
+    return imageUrl;
+  }
+
+  public void setImageUrl(String imageUrl) {
+    this.imageUrl = imageUrl;
+  }
+
+  @Override
+  public String toString() {
+    return author;
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
new file mode 100644
index 000000000..9f48b9a79
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/objects/Result.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.objects;
+
+import java.util.List;
+
+public class Result<K> {
+
+  public String cursor;
+  public List<K> result;
+
+  public Result(List<K> result, String cursor) {
+    this.result = result;
+    this.cursor = cursor;
+  }
+
+  public Result(List<K> result) {
+    this.result = result;
+    this.cursor = null;
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java
new file mode 100644
index 000000000..79a18461d
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/CreateBookServlet.java
@@ -0,0 +1,66 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.util.CloudStorageHelper;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@MultipartConfig
+@WebServlet(name = "create", value = "/create")
+public class CreateBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    req.setAttribute("action", "Add");
+    req.setAttribute("destination", "create");
+    req.getRequestDispatcher("/form.jsp").forward(req, resp);
+  }
+
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    CloudStorageHelper storageHelper =
+        (CloudStorageHelper) req.getServletContext().getAttribute("storageHelper");
+    String imageUrl = storageHelper.getImageUrl(req, resp);
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    Book book = new Book.Builder()
+        .author(req.getParameter("author"))
+        .description(req.getParameter("description"))
+        .publishedDate(req.getParameter("publishedDate"))
+        .title(req.getParameter("title"))
+        .imageUrl(imageUrl)
+        .build();
+    try {
+      Long id = dao.createBook(book);
+      resp.sendRedirect("/read?id="+id.toString());
+    } catch (Exception e) {
+      throw new ServletException("Error creating book", e);
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java
new file mode 100644
index 000000000..19d44a857
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/DeleteBookServlet.java
@@ -0,0 +1,45 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "delete", value = "/delete")
+public class DeleteBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    Long id = Long.decode(req.getParameter("id"));
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      dao.deleteBook(id);
+      resp.sendRedirect("/books");
+    } catch (Exception e) {
+      throw new ServletException("Error deleting book", e);
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java
new file mode 100644
index 000000000..f2e52745f
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ListBookServlet.java
@@ -0,0 +1,54 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.objects.Result;
+
+import java.io.IOException;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "list", value = "/books")
+public class ListBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+        ServletException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    String startCursor = req.getParameter("cursor");
+    List<Book> books = null;
+    String endCursor = null;
+    try {
+      Result<Book> result = dao.listBooks(startCursor);
+      books = result.result;
+      endCursor = result.cursor;
+    } catch (Exception e) {
+      throw new ServletException("Error listing books", e);
+    }
+    req.getSession().getServletContext().setAttribute("books", books);
+    req.setAttribute("cursor", endCursor);
+    req.getRequestDispatcher("/base.jsp").forward(req, resp);
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java
new file mode 100644
index 000000000..cb7cd1a75
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/ReadBookServlet.java
@@ -0,0 +1,47 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@WebServlet(name = "read", value = "/read")
+public class ReadBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+      ServletException {
+    Long id = Long.decode(req.getParameter("id"));
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      Book book = dao.readBook(id);
+      req.setAttribute("book", book);
+      req.getRequestDispatcher("/view.jsp").forward(req, resp);
+    } catch (Exception e) {
+      throw new ServletException("Error reading book", e);
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java
new file mode 100644
index 000000000..dbd440277
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/servlets/UpdateBookServlet.java
@@ -0,0 +1,74 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.servlets;
+
+import com.example.appengine.gettingstartedjava.daos.BookDao;
+import com.example.appengine.gettingstartedjava.objects.Book;
+import com.example.appengine.gettingstartedjava.util.CloudStorageHelper;
+
+import java.io.IOException;
+
+import javax.servlet.ServletException;
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+@SuppressWarnings("serial")
+@MultipartConfig
+@WebServlet(name = "update", value = "/update")
+public class UpdateBookServlet extends HttpServlet {
+
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    try {
+      Book book = dao.readBook(Long.decode(req.getParameter("id")));
+      req.setAttribute("book", book);
+      req.setAttribute("action", "Edit");
+      req.setAttribute("destination", "update");
+      req.getRequestDispatcher("/form.jsp").forward(req, resp);
+    } catch (Exception e) {
+      throw new ServletException("Error loading book for editing", e);
+    }
+  }
+
+  @Override
+  public void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException,
+      IOException {
+    CloudStorageHelper storageHelper =
+        (CloudStorageHelper) req.getServletContext().getAttribute("storageHelper");
+    String imageUrl = storageHelper.getImageUrl(req, resp);
+    BookDao dao = (BookDao) this.getServletContext().getAttribute("dao");
+    Book book = new Book.Builder()
+        .author(req.getParameter("author"))
+        .description(req.getParameter("description"))
+        .id(Long.decode(req.getParameter("id")))
+        .publishedDate(req.getParameter("publishedDate"))
+        .title(req.getParameter("title"))
+        .imageUrl(imageUrl)
+        .build();
+    try {
+      dao.updateBook(book);
+      resp.sendRedirect("/read?id=" + req.getParameter("id"));
+    } catch (Exception e) {
+      throw new ServletException("Error updating book", e);
+    }
+  }
+}
diff --git a/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java
new file mode 100644
index 000000000..6b7085b77
--- /dev/null
+++ b/3-binary-data/src/main/java/com/example/appengine/gettingstartedjava/util/CloudStorageHelper.java
@@ -0,0 +1,85 @@
+/**
+ * Copyright 2015 Google Inc. All Rights Reserved.
+ *
+ * Licensed 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.
+ */
+
+package com.example.appengine.gettingstartedjava.util;
+
+import com.google.common.io.ByteStreams;
+import com.google.gcloud.storage.Acl;
+import com.google.gcloud.storage.BlobInfo;
+import com.google.gcloud.storage.BlobWriteChannel;
+import com.google.gcloud.storage.Storage;
+import com.google.gcloud.storage.StorageOptions;
+
+import org.joda.time.DateTime;
+import org.joda.time.DateTimeZone;
+import org.joda.time.format.DateTimeFormat;
+import org.joda.time.format.DateTimeFormatter;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.channels.Channels;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.Part;
+
+public class CloudStorageHelper {
+
+  private static Storage storage = null;
+
+  public CloudStorageHelper() {
+    storage = StorageOptions.defaultInstance().service();
+  }
+
+  public String uploadFile(Part filePart) throws IOException {
+    DateTimeFormatter dtf = DateTimeFormat.forPattern("-YYYY-MM-dd-HHmmssSSS");
+    DateTime dt = DateTime.now(DateTimeZone.UTC);
+    String dtString = dt.toString(dtf);
+    final String fileName = filePart.getSubmittedFileName() + dtString;
+    String BUCKET_NAME = System.getenv("BUCKET_NAME");
+    // Modify access list to allow all users with link to read file
+    List<Acl> acls = new ArrayList<>();
+    acls.add(new Acl(Acl.User.ofAllUsers(), Acl.Role.READER));
+    BlobInfo blobInfo = BlobInfo.builder(BUCKET_NAME, fileName).acl(acls).build();
+    InputStream filecontent = filePart.getInputStream();
+    BlobWriteChannel blobWriter = storage.writer(blobInfo);
+    ByteStreams.copy(filecontent, Channels.newOutputStream(blobWriter));
+    blobWriter.close();
+    blobInfo = storage.get(BUCKET_NAME, fileName);
+    return blobInfo.mediaLink();
+  }
+
+  public String getImageUrl(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+      ServletException {
+    Part filePart = req.getPart("file");
+    final String fileName = filePart.getSubmittedFileName();
+    String imageUrl = req.getParameter("imageUrl");
+    if (fileName != null && !fileName.isEmpty()) {
+      final String extension = fileName.substring(fileName.lastIndexOf('.') + 1);
+      String[] allowedExt = { "jpg", "jpeg", "png", "gif" };
+      for (String s : allowedExt) {
+        if (extension.equals(s)) {
+          return this.uploadFile(filePart);
+        }
+      }
+      throw new ServletException("file must be an image");
+    }
+    return imageUrl;
+  }
+}
diff --git a/3-binary-data/src/main/webapp/WEB-INF/appengine-web.xml b/3-binary-data/src/main/webapp/WEB-INF/appengine-web.xml
new file mode 100644
index 000000000..2948a5f71
--- /dev/null
+++ b/3-binary-data/src/main/webapp/WEB-INF/appengine-web.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
+  <sessions-enabled>true</sessions-enabled>
+  <threadsafe>true</threadsafe>
+  <vm>true</vm>
+  <!-- TODO remove beta-settings -->
+  <beta-settings>
+    <setting name="java_quickstart" value="true" />
+  </beta-settings>
+  <env-variables>
+    <env-var name="AEV2_JAVA_STORAGETYPE" value="YOUR-DATABASE-SELECTION" />
+    <env-var name="SQL_DATABASE_URL" value="jdbc:mysql://HOST-IP:3306/YOUR-DB-NAME?user=USERNAME&amp;password=PASSWORD" />
+    <env-var name="PROJECT_ID" value="YOUR-PROJECT-ID" />
+    <env-var name="BUCKET_NAME" value="YOUR-BUCKET-NAME" />
+  </env-variables>
+</appengine-web-app>
diff --git a/3-binary-data/src/main/webapp/WEB-INF/web.xml b/3-binary-data/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000000000..6467df305
--- /dev/null
+++ b/3-binary-data/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,10 @@
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5">
+  <servlet>
+    <servlet-name>root</servlet-name>
+    <servlet-class>com.example.appengine.gettingstartedjava.RootServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>root</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+</web-app>
diff --git a/3-binary-data/src/main/webapp/base.jsp b/3-binary-data/src/main/webapp/base.jsp
new file mode 100644
index 000000000..154130d81
--- /dev/null
+++ b/3-binary-data/src/main/webapp/base.jsp
@@ -0,0 +1,57 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Java on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3>Books</h3>
+      <a href="/create" class="btn btn-success btn-sm">
+        <i class="glyphicon glyphicon-plus"></i>
+        Add book
+      </a>
+      <c:choose>
+      <c:when test="${empty books}">
+      <p>No books found</p>
+      </c:when>
+      <c:otherwise>
+      <c:forEach items="${books}" var="book">
+      <div class="media">
+        <a href="/read?id=${book.id}">
+          <div class="media-left">
+            <img alt="ahhh" src="${fn:escapeXml(not empty book.imageUrl?book.imageUrl:'http://placekitten.com/g/128/192')}">
+          </div>
+          <div class="media-body">
+            <h4>${fn:escapeXml(book.title)}</h4>
+            <p>${fn:escapeXml(book.author)}</p>
+          </div>
+        </a>
+      </div>
+      </c:forEach>
+      <c:if test="${not empty cursor}">
+      <nav>
+        <ul class="pager">
+          <li><a href="?cursor=${fn:escapeXml(cursor)}">More</a></li>
+        </ul>
+      </nav>
+      </c:if>
+      </c:otherwise>
+      </c:choose>
+    </div>
+  </body>
+</html>
diff --git a/3-binary-data/src/main/webapp/form.jsp b/3-binary-data/src/main/webapp/form.jsp
new file mode 100644
index 000000000..83641ae35
--- /dev/null
+++ b/3-binary-data/src/main/webapp/form.jsp
@@ -0,0 +1,62 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Java on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3><c:out value="${action}"/> book</h3>
+
+      <form method="POST" action="${destination}" enctype="multipart/form-data">
+
+        <div class="form-group">
+          <label for="title">Title</label>
+          <input type="text" name="title" id="title" value="${fn:escapeXml(book.title)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="author">Author</label>
+          <input type="text" name="author" id="author" value="${fn:escapeXml(book.author)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="publishedDate">Date Published</label>
+          <input type="text" name="publishedDate" id="publishedDate" value="${fn:escapeXml(book.publishedDate)}" class="form-control"/>
+        </div>
+
+        <div class="form-group">
+          <label for="description">Description</label>
+          <textarea name="description" id="description" class="form-control">${fn:escapeXml(book.description)}</textarea>
+        </div>
+
+        <div class="form-group">
+          <label for="image">Cover Image</label>
+          <input type="file" name="file" id="file" class="form-control"/>
+        </div>
+
+        <div class="form-group hidden">
+          <label for="imageUrl">Cover Image URL</label>
+          <input type="hidden" name="id" value="${book.id}"/>
+          <input type="text" name="imageUrl" id="imageUrl" value="${fn:escapeXml(book.imageUrl)}" class="form-control"/>
+        </div>
+
+        <button type="submit" class="btn btn-success">Save</button>
+      </form>
+    </div>
+  </body>
+</html>
diff --git a/3-binary-data/src/main/webapp/view.jsp b/3-binary-data/src/main/webapp/view.jsp
new file mode 100644
index 000000000..251ff3c49
--- /dev/null
+++ b/3-binary-data/src/main/webapp/view.jsp
@@ -0,0 +1,51 @@
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <title>Bookshelf - Java on Google Cloud Platform</title>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
+  </head>
+  <body>
+    <div class="navbar navbar-default">
+      <div class="container">
+        <div class="navbar-header">
+          <div class="navbar-brand">Bookshelf</div>
+        </div>
+        <ul class="nav navbar-nav">
+          <li><a href="/books">Books</a></li>
+        </ul>
+      </div>
+    </div>
+    <div class="container">
+      <h3>Book</h3>
+      <div class="btn-group">
+        <a href="/update?id=${book.id}" class="btn btn-primary btn-sm">
+          <i class="glyphicon glyphicon-edit"></i>
+          Edit book
+        </a>
+        <a href="/delete?id=${book.id}" class="btn btn-danger btn-sm">
+          <i class="glyphicon glyphicon-trash"></i>
+          Delete book
+        </a>
+      </div>
+
+      <div class="media">
+        <div class="media-left">
+          <img class="book-image" src="${fn:escapeXml(not empty book.imageUrl?book.imageUrl:'http://placekitten.com/g/128/192')}">
+        </div>
+        <div class="media-body">
+          <h4 class="book-title">
+            ${fn:escapeXml(book.title)}
+            <small>${fn:escapeXml(book.publishedDate)}</small>
+          </h4>
+          <h5 class="book-author">By ${fn:escapeXml(not empty book.author?book.author:'Unknown')}</h5>
+          <p class="book-description">${fn:escapeXml(book.description)}</p>
+        </div>
+      </div>
+    </div>
+  </body>
+</html>
+