merging changes from trunk

git-svn-id: https://svn.apache.org/repos/asf/ignite/site/branches/ignite-redisign@1873864 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/.htaccess b/.htaccess
index bf09eb2..bf1ef92 100644
--- a/.htaccess
+++ b/.htaccess
@@ -6,14 +6,34 @@
 Redirect 301 /features/dotnet.html /features/multilanguage.html
 Redirect 301 /features/cpp.html /features/multilanguage.html
 Redirect 301 /features/clientprotos.html /features/multilanguage.html
-Redirect 301 collocatedprocessing.html /features/collocatedprocessing.html
-Redirect 301 /features/durablememory.html /arch/durablememory.html
+Redirect 301 /collocatedprocessing.html /features/collocatedprocessing.html
+Redirect 301 /features/durablememory.html /arch/memorycentric.html
+Redirect 301 /arch/durablememory.html /arch/memorycentric.html
 Redirect 301 /memorycentric.html /arch/memorycentric.html
 Redirect 301 /features/persistence.html /arch/persistence.html
 Redirect 301 /features/deploy.html /arch/clustering.html
 Redirect 301 /features/igniterdd.html /use-cases/spark/shared-memory-layer.html
+Redirect 301 /use-cases/spark/shared-memory-layer.html /use-cases/spark-acceleration.html
+Redirect 301 /use-cases/spark/sql-queries.html /use-cases/spark-acceleration.html
+Redirect 301 /use-cases/caching/database-caching.html /use-cases/in-memory-cache.html
+Redirect 301 /use-cases/database/in-memory-database.html /use-cases/in-memory-database.html
+Redirect 301 /use-cases/database/distributed-database.html /use-cases/in-memory-database.html
+Redirect 301 /use-cases/database/sql-database.html /use-cases/in-memory-database.html
+Redirect 301 /use-cases/hadoop/mapreduce.html /use-cases/hadoop-acceleration.html
+Redirect 301 /use-cases/hadoop/hdfs-cache.html /use-cases/hadoop-acceleration.html
+Redirect 301 /features/igfs.html /use-cases/hadoop-acceleration.html
+Redirect 301 /features/mapreduce.html /use-cases/hadoop-acceleration.html
+Redirect 301 /use-cases/database/key-value-store.html /use-cases/key-value-store.html
+Redirect 301 /usecases.html /
+Redirect 301 /use-cases/comparison/ignite-for-rdbms.html /
+Redirect 301 /use-cases/comparison/ignite-for-nosql.html /
+Redirect 301 /features/datagrid.html /use-cases/datagrid.html
+Redirect 301 /use-cases/platforms/dotnet.html /features/multilanguage.html
+Redirect 301 /provenusecases.html /use-cases/provenusecases.html
+Redirect 301 /features/datavisualization.html /features/manageandmonitor.html
+Redirect 301 /addons.html /features.html
 
-RewriteEngine On 
+RewriteEngine On
 
 RewriteCond %{SERVER_PORT} 80 
 RewriteRule ^(.*)$ https://%{SERVER_NAME}/$1 [R=301,L]
diff --git a/addons.html b/addons.html
deleted file mode 100644
index 18f476f..0000000
--- a/addons.html
+++ /dev/null
@@ -1,169 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/addons.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>Addons and Related Solutions - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="addons" class="page-section">
-            <h1 class="first">Addons and Related Solutions for Apache Ignite</h1>
-            <p>Ignite Manage are projects that intend to make user experience with Ignite easier. To contribute your project to Ignite, send an email to <a href="mailto:dev@ignite.apache.org" aria-label="Developers List">dev list</a>.</p>
-        </section>
-
-        <section id="web-console" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
-                    <h2 style="padding-bottom: 5px;">
-                        <a href="https://console.gridgain.com/" target="_blank" rel="noopener" aria-label="GridGain Web Console">
-                            <img style="margin-bottom:20px;" height="35"; width="40" src="images/logo_ignite_32_32.png" alt="Logo Apache Ignite">
-                        </a>
-                        Apache Ignite Web Console
-                    </h2>
-                    <p class="addons-contibutor">Contributed by: GridGain Team</p>
-                    <p><b>Ignite Web Console</b> is an interactive web-based management tool that allows you to:</p>
-                    <ul class="page-list">
-                        <li>Create and download various configurations for Apache Ignite</li>
-                        <li>Automatically load SQL metadata from any RDBMS</li>
-                        <li>Connect to Ignite cluster and run SQL analytics on it</li>
-                        <li>Manage and Monitor Ignite nodes and caches</li>
-                        <li>View heap, CPU, and other useful node and cache metrics</li>
-                    </ul>
-
-                    <p>
-                        Ignite Web Console is a web application that can be deployed on your system environment.
-                        For demo purposes, check out <b><a href="https://console.gridgain.com" target="_blank" rel="noopener" aria-label="GridGain Web Console">Ignite Web Console</a></b> hosted by GridGain.
-                    </p>
-
-                    <div class="page-heading">Docs:</div>
-
-                    <p>Click <a href="https://apacheignite-tools.readme.io/docs/ignite-web-console" target="_blank" rel="noopener" aria-label="Ignite Web Console">here</a> for documentation.</p>
-
-                    <div class="videos">
-                        <div class="page-heading">Videos:</div>
-                        <ul>
-                            <li>
-                                <i class="fa fa-lg fa-play-circle-o"></i>
-                                <span class="video-title">
-                                    <a target="youtube" href="https://youtu.be/V-o3IFVnk5k">Web Console Monitoring - Demo mode</a>
-                                </span>
-                                <span class="video-duration">04:07</span>
-                            </li>
-                        </ul>
-                    </div>
-
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
-                    <a href="images/webconsole-sql.png" aria-label="Web Console"><img class="img-responsive" src="images/webconsole-sql.png" alt="Web Console Screenshot"></a>&nbsp;
-                    <p class="img-caption">Click on the image to view full size.</p>
-                </div>
-            </div><p>&nbsp;</p>
-        </section>
-
-        <!--<section id="ga-grid" class="page-section">-->
-            <!--<div class="col-sm-12 col-md-12 col-xs-12">-->
-                <!--<div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">-->
-                    <!--<h2 style="padding-bottom: 5px;">-->
-                        <!--<a href="https://github.com/techbysample/gagrid" target="_blank" rel="noopener">-->
-                            <!--<img style="margin-bottom:20px;" height="35"; width="40" src="images/GAGrid_Logo_Beta.png">-->
-                        <!--</a> GA Grid<sup><span style="font-size: 20px;">&beta;eta</span></sup>-->
-                    <!--</h2>-->
-                    <!--<p class="addons-contibutor">Contributed by: Turik Campbell</p>-->
-                    <!--<p><b>GA Grid</b> is a distributive in memory Genetic Algorithm (GA) component for Apache Ignite.-->
-                        <!--A GA is a method of solving optimization problems by simulating the process of biological evolution.-->
-                    <!--</p>-->
-                    <!--<p>-->
-                        <!--GAs are excellent for searching through large and complex data sets for an optimal solution.-->
-                        <!--Real world applications of GAs include:  automotive design, computer gaming, robotics, investments,-->
-                        <!--traffic/shipment routing and more.-->
-                    <!--</p>-->
-
-                    <!--<div class="page-links">-->
-                        <!--<a href="https://github.com/techbysample/gagrid" target="_blank" rel="noopener">GA Grid <i class="fa fa-angle-double-right"></i></a>-->
-                    <!--</div>-->
-                <!--</div>-->
-                <!--<div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">-->
-                    <!--<a href="/images/GAGrid_Overview.png"><img class="img-responsive" src="/images/GAGrid_Overview.png"></a>&nbsp;-->
-                    <!--<p class="img-caption">Click on the image to view full size.</p>-->
-                <!--</div>-->
-            <!--</div><p>&nbsp;</p>-->
-        <!--</section>-->
-
-        <section id="aiex" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
-                    <h2 style="padding-bottom: 5px;">
-                        <a href="https://github.com/sumeet70/aiex" target="_blank" rel="noopener" aria-label="Apache Ignite Extensions">
-                            <img style="margin-bottom:20px;" height="35"; width="40" src="images/aiex-logo.png" alt="AIEX Logo">
-                        </a> Apache Ignite Extensions
-                    </h2>
-                    <p class="addons-contibutor">Contributed by: Sumeet Singh</p>
-                    <p><b>Apache Ignite Extensions</b> is a modular system to create user interface modules
-                        for interacting with application deployed in Apache Ignite. It allows users to:
-                    </p>
-                    <ul class="page-list">
-                        <li>Obtain topology information, list of nodes, and various metrics</li>
-                        <li>Perform basic cache operations</li>
-                    </ul>
-                    <div class="page-links">
-                        <a href="https://github.com/sumeet70/aiex" target="_blank" rel="noopener" aria-label="Apache Ignite Extensions">Apache Ignite Extensions <i class="fa fa-angle-double-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
-                    <a href="/images/aiex.png" aria-label="AIEX Screenshot"><img class="img-responsive" src="/images/aiex.png" alt="AIEX Screenshot"></a>&nbsp;
-                    <p class="img-caption">Click on the image to view full size.</p>
-                </div>
-            </div>
-        </section>
-
-
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/download.html b/download.html
index cf0b7f8..b322e0b 100644
--- a/download.html
+++ b/download.html
@@ -83,44 +83,6 @@
     </div>
     <div class="container">
         <div class="row">
-            <div class="col-md-12 col-sm-12 col-xs-12">
-                <nav id="top-nav" class="navbar navbar-default" role="navigation">
-                    <div class="container-fluid">
-                        <!--<div class="navbar-header">-->
-                            <!--<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar">-->
-                                <!--<span class="sr-only">Toggle navigation</span>-->
-                                <!--<span class="icon-bar"></span>-->
-                                <!--<span class="icon-bar"></span>-->
-                                <!--<span class="icon-bar"></span>-->
-                            <!--</button>-->
-                        <!--</div>-->
-                        <div class="collapse navbar-collapse" id="top-navbar">
-                            <ul class="nav navbar-nav">
-                                <ul class="nav navbar-nav">
-                                    <li><a href="http://apache-ignite-users.70518.x6.nabble.com/" target="_blank" rel="noopener" aria-label="User Forum"
-                                           onclick="ga('send', 'event', 'community', 'top_menu_click', 'user_forum');">
-                                        <i class="fa fa-users" aria-hidden="true"></i> User Forum</a>
-                                    </li>
-                                    <li><a href="http://stackoverflow.com/questions/tagged/ignite" target="_blank" rel="noopener" aria-label="Stack Overflow"
-                                           onclick="ga('send', 'event', 'community', 'top_menu_click', 'stack_overflow');">
-                                        <i class="fa fa-stack-overflow" aria-hidden="true"></i> Stack Overflow</i></a>
-                                    </li>
-                                    <li><a href="/events.html" target="_blank" rel="noopener" aria-label="Apache Ignite Events"
-                                           onclick="ga('send', 'event', 'community', 'top_menu_click', 'ignite_events');">
-                                        <i class="fa fa-calendar" aria-hidden="true"></i> Events</a>
-                                    </li>
-                                    <!--li><a href="/screencasts.html"
-                                           onclick="ga('send', 'event', 'community', 'top_menu_click', 'screencasts');">
-                                        <i class="fa fa-video-camera" aria-hidden="true"></i> Screencasts</a>
-                                    </li-->
-                                </ul>
-                            </ul>
-                        </div>
-                    </div>
-                </nav>
-            </div>
-        </div>
-        <div class="row">
             <div class="col-md-2 col-sm-2 col-xs-6">
                 <div class="logo" style="width:150px;"><a href="/index.html" aria-label="Ignite Homepage"><img src="/images/ignite_logo_inv.svg" alt="Apache Ignite Logo"></a></div>
             </div>
@@ -164,14 +126,14 @@
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_sql');">
                                             Distributed SQL</a>
                                         </li>
-                                        <li><a href="/features/datagrid.html" aria-label="DataGrid"
+                                        <li><a href="/use-cases/key-value-store.html" aria-label="DataGrid"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_key_value');">
                                             Distributed Key-Value</a>
                                         </li>
-                                        <!--<li><a href="/arch/persistence.html"-->
-                                        <!--onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">-->
-                                        <!--Distributed Persistence</a>-->
-                                        <!--</li>-->
+                                        <li><a href="/arch/persistence.html"
+                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">
+                                            Native Persistence</a>
+                                        </li>
                                         <li><a href="/features/transactions.html" aria-label="Transactions"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'acid_transactions');">
                                             ACID Transactions</a>
@@ -202,165 +164,128 @@
 
                                             <!-- Ignite tooling. -->
                                         <li role="presentation" class="submenu-header">Tooling</li>
-                                        <li><a href="/features/datavisualization.html#apache-ignite-web-console" aria-label="Ignite Web Console"
-                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'ignite_web_console');">
-                                            Ignite Web Console</a>
-                                        </li>
-                                        <li><a href="/features/datavisualization.html" aria-label="Data Visualization and Analysis"
-                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'data_visualization');">
-                                            Data Visualization and Analysis</a>
+                                        <li><a href="/features/manageandmonitor.html" aria-label="Ignite Management & Monitoring"
+                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'ignite_manage_monitor');">
+                                            Management & Monitoring</a>
                                         </li>
                                     </ul>
                                 </li>
+
                                 <li class="dropdown" style="cursor: pointer;">
                                     <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Use Cases">Use Cases<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Proven by</li>
-                                        <li><a href="/provenusecases.html" aria-label="Proven Use Cases"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
-                                            Ignite in Production</a>
-                                        </li>
-                                        <li class="divider">
 
-                                            <!--Database-->
-                                        <li role="presentation" class="submenu-header">Data Store</li>
-                                        <li><a href="/use-cases/database/distributed-database.html" aria-label="Data Store"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
-                                            Distributed Database</a>
+                                        <li role="presentation" class="submenu-header">Caching & Database</li>
+                                        <li><a href="/use-cases/in-memory-cache.html"
+                                               aria-label="In-Memory Cache"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'in_memory_cache');">
+                                            In-Memory Cache</a>
                                         </li>
-                                        <li><a href="/use-cases/database/in-memory-database.html" aria-label="In-Memory Database"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
-                                            In-Memory Database</a>
-                                        </li>
-                                        <!--<li><a href="/use-cases/database/sql-database.html">SQL Database</a></li>-->
                                         <li><a href="/features/datagrid.html" aria-label="In-Memory Data Grid"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'data_grid');">
                                             In-Memory Data Grid</a>
                                         </li>
-                                        <li><a href="/use-cases/database/key-value-store.html" aria-label="Key-Value Store"
+                                        <li><a href="/use-cases/in-memory-database.html" aria-label="In-Memory Database"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
+                                            In-Memory Database</a>
+                                        </li>
+                                        <li><a href="/use-cases/key-value-store.html" aria-label="Key-Value Store"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'key_value_store');">
                                             Key-Value Store</a>
                                         </li>
                                         <li class="divider">
 
-                                        <!--In-Memory Caching-->
-                                        <li role="presentation" class="submenu-header">In-Memory Cache</li>
-                                        <li><a href="/use-cases/caching/database-caching.html" aria-label="Database Caching"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'database-caching');">
-                                            Database Caching</a>
+                                        <li role="presentation" class="submenu-header">Data & Compute Hubs</li>
+                                        <li><a href="/use-cases/hpc.html" aria-label="High-Performance Computing"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'massive_parallel_processing');">
+                                            High-Performance Computing</a>
                                         </li>
-                                        <li><a href="/use-cases/caching/jcache-provider.html" aria-label="JCache Provider"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'jcache-provider');">
-                                            JCache Provider</a>
+                                        <li><a href="/use-cases/dih.html" aria-label="Digital Integration Hub"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'digital_integration_hub');">
+                                            Digital Integration Hub</a>
                                         </li>
-                                        <li><a href="/use-cases/caching/hibernate-l2-cache.html" aria-label="Hibernate L2 Cache"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hibernate-l2-cache');">
-                                            Hibernate L2 Cache</a>
-                                        </li>
-                                        <li><a href="/use-cases/caching/web-session-clustering.html" aria-label="Web Session Clustering"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'web-session-clustering');">
-                                            Web Session Clustering</a>
-                                        </li>
+
                                         <li class="divider">
 
-                                        <!-- Comparison -->
-                                        <li role="presentation" class="submenu-header">Comparison</li>
-                                        <li><a href="/use-cases/comparison/ignite-for-nosql.html" aria-label="Ignite for NoSQL Users"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'ignite-for-nosql');">
-                                            Ignite for NoSQL Users</a>
+                                        <li role="presentation" class="submenu-header">Faster Analytics</li>
+                                        <li><a href="/use-cases/spark-acceleration.html"
+                                               aria-label="Apache Spark Acceleration"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'apache_spark_acceleration');">
+                                            Apache Spark Acceleration</a>
                                         </li>
-                                        <li><a href="/use-cases/comparison/ignite-for-rdbms.html" aria-label="Ignite for RDBMS Users"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'ignite-for-rdbms');">
-                                            Ignite for RDBMS Users</a>
+                                        <li><a href="/use-cases/hadoop-acceleration.html"
+                                               aria-label="Hadoop Acceleration"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hadoop_acceleration');">
+                                            Apache Hadoop Acceleration</a>
                                         </li>
+
                                         <li class="divider">
 
-                                        <!--Ignite with Spark & Hadoop-->
-                                        <li role="presentation" class="submenu-header">Ignite with Spark</li>
-                                        <li><a href="/use-cases/spark/shared-memory-layer.html" aria-label="In-Memory Store for Spark"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'shared-memory-layer');">
-                                            In-Memory Store for Spark</a>
-                                        </li>
-                                        <li><a href="/use-cases/spark/sql-queries.html" aria-label="Faster SQL for Spark"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'sql-queries');">
-                                            Faster Sql for Spark</a>
+                                        <li role="presentation" class="submenu-header">Ignite in Production</li>
+                                        <li><a href="/provenusecases.html" aria-label="Powered by Ignite"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
+                                            Powered by Ignite</a>
                                         </li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Docs">Docs<span class="caret"></span></a>
+                                    <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Resources">Resources
+                                        <span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Technical Documentation</li>
-                                        <li><a href="http://apacheignite.readme.io/docs" target="_blank" rel="noopener">Ignite <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <!-- <li><a href="http://apacheignite-sql.readme.io/docs" target="_blank" rel="noopener">Ignite SQL<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <li><a href="https://liyuj.gitee.io" target="_blank" rel="noopener">Ignite (Chinese) <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-net.readme.io/docs/" target="_blank" rel="noopener">Ignite.NET <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-cpp.readme.io/" target="_blank" rel="noopener">Ignite.C++ <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/java-thin-client" target="_blank" rel="noopener">Java Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-net.readme.io/docs/thin-client" target="_blank" rel="noopener">.NET Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-cpp.readme.io/docs/thin-client" target="_blank" rel="noopener">C++ Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/nodejs-thin-client" target="_blank" rel="noopener">Node.js Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/python-thin-client" target="_blank" rel="noopener">Python Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/php-thin-client" target="_blank" rel="noopener">PHP Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Docs & APIs</li>
+                                        <li><a href="#">APIs</a></li>
+                                        <li><a href="http://apacheignite.readme.io/docs" target="_blank"
+                                               rel="noopener">Technical Docs<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="https://liyuj.gitee.io" target="_blank"
+                                               rel="noopener">Technical Docs (Chinese)<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+
                                         <li class="divider">
-                                        <li role="presentation" class="submenu-header">APIs</li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/javadoc/index.html" target="_blank" rel="noopener">Javadoc <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/dotnetdoc/index.html" target="_blank" rel="noopener">.NET API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/cppdoc/index.html" target="_blank" rel="noopener">C++ API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/scaladoc/scalar/index.html" target="_blank" rel="noopener">Scala API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://github.com/apache/ignite/tree/master/examples" target="_blank" rel="noopener">Examples <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Learning Ignite</li>
+                                        <li><a href="/blogs.html">Blogs</a></li>
+                                        <li><a href="https://github.com/apache/ignite/tree/master/examples" target="_blank" rel="noopener">
+                                            Examples <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="/screencasts.html">Videos & Presentations</a></li>
+                                        <li><a href="/events.html">Upcoming Events</a></li>
+                                        <li><a href="https://www.pluralsight.com/courses/apache-ignite-getting-started" target="_blank" rel="noopener">
+                                            Getting Started Course<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+
+
                                         <li class="divider">
                                         <li role="presentation" class="submenu-header">Ignite Book</li>
                                         <li><a href="http://a.co/h4MBi1v" target="_blank" rel="noopener">Amazon <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://leanpub.com/ignite" target="_blank" rel="noopener">Leanpub <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://www.packtpub.com/big-data-and-business-intelligence/apache-ignite-quick-start-guide" target="_blank" rel="noopener">Packt <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li class="divider">
-                                        <li role="presentation" class="submenu-header">Ignite Course</li>
-                                        <li><a href="https://www.pluralsight.com/courses/apache-ignite-getting-started" target="_blank" rel="noopener">Getting Started Course<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
                                     <a class="dropdown-toggle" data-toggle="dropdown">Community<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Contribute</li>
-                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
-                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
-                                        <li class="divider"></li>
-
-                                        <li role="presentation" class="submenu-header">Resources</li>
-                                        <li><a href="/community/resources.html#ask">Ask a Question</a></li>
-                                        <li><a href="/community/resources.html#mail-lists">Mailing Lists</a></li>
-                                        <!--<li><a href="https://gitter.im/apacheignite/ignite" target="_blank" rel="noopener">Chat-->
-                                        <!--<img src="/images/gitter-small.png" alt="Join the chat at https://gitter.im/apacheignite/ignite" style="padding-left:5px; padding-bottom:3px;"/></a>-->
-                                        <!--</li>-->
-                                        <li><a href="https://twitter.com/ApacheIgnite" target="_blank" rel="noopener">Twitter <i class="fa fa-twitter-square fa-lg" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="/screencasts.html">Screencasts</a></li>
-                                        <li><a href="/blogs.html">Blogs</a></li>
-                                        <li><a href="/community/resources.html#git">Github Repo <i class="fa fa-github fa-lg" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://issues.apache.org/jira/browse/IGNITE" target="_blank" rel="noopener">Ignite Jira <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://cwiki.apache.org/confluence/display/IGNITE/" target="_blank" rel="noopener">Ignite Wiki <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Questions & Issues</li>
+                                        <li><a href="/community/resources.html">Mailing Lists & Forums</a></li>
+                                        <li><a href="https://issues.apache.org/jira/browse/IGNITE" target="_blank" rel="noopener">
+                                            Ignite Jira <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li>
                                             <a href="https://cwiki.apache.org/confluence/display/IGNITE/Third+Party+Support+and+Employment" target="_blank" rel="noopener">
                                                 Production Support <i class="fa fa-external-link" style="padding-left:5px;"></i></a>
                                         </li>
+                                        <li class="divider"></li>
+
+                                        <li role="presentation" class="submenu-header">Contributions</li>
+                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
+                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
+                                        <li><a href="https://cwiki.apache.org/confluence/display/IGNITE/" target="_blank" rel="noopener">
+                                            Ignite Wiki <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="/community/resources.html#git">Github Repo <i class="fa fa-github fa-lg" style="padding-left:5px;"></i></a></li>
+
 
                                         <li class="divider"></li>
-                                        <li role="presentation" class="submenu-header">Events &amp; Groups</li>
-                                        <li><a href="/events.html">Apache Ignite Events</a></li>
-                                        <li><a href="/meetup-groups.html">Community Groups</i></a></li>
+                                        <li role="presentation" class="submenu-header">Meetups & Events</li>
+                                        <li><a href="/meetup-groups.html">Ignite Meetups</a></li>
+                                        <li><a href="/events.html">Upcoming Events</a></li>
                                     </ul>
                                 </li>
-                                <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown">Manage<span class="caret"></span></a>
-                                    <ul class="dropdown-menu" role="menu">
-                                        <li><a href="/addons.html#web-console">Ignite Web Console</a></li>
-                                        <li><a href="/addons.html#aiex">Apache Ignite Extensions</a></li>
-                                        <li><a href="/managedservices.html">Managed Services</a></li>
-                                    </ul>
+                                <li>
+                                    <a class="download-button-dropdown" href="/download.cgi">Download</a>
                                 </li>
-								<li>
-									<a class="download-button-dropdown" href="/download.cgi">Download</a>
-								</li>
                             </ul>
                         </div>
                     </div>
@@ -1826,7 +1751,6 @@
                 <!--<ul class="list-unstyled">-->
                     <!--<li><a href="/index.html#overview">Overview</a></li>-->
                     <!--<li><a href="/features.html">Features</a></li>-->
-                    <!--<li><a href="/usecases.html">Use Cases</a></li>-->
                     <!--<li><a href="http://apacheignite.readme.io/docs">Documentation</a></li>-->
                     <!--<li><a href="http://apache-ignite-users.70518.x6.nabble.com/">Ask Question</a></li>-->
                     <!--<li><a href="/community/resources.html">Community</a></li>-->
diff --git a/features/datagrid-2.html b/features/datagrid-2.html
deleted file mode 100644
index 8db741f..0000000
--- a/features/datagrid-2.html
+++ /dev/null
@@ -1,525 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/datagrid.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <meta name="description" content="Apache Ignite In-Memory Data Grid is a distributed transactional key-value store that stores data
-        in-memory and on-disk and supports key-value, SQL, and processing APIs"/>
-    <title>In-Memory Data Grid - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="datagrid" class="page-section">
-            <h1 class="first">Key-Value In-Memory Data Grid</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <p>
-                    Ignite provides extensive and rich key-value APIs and can act as an in-memory data grid.
-                    You can think of Ignite as of a distributed partitioned hash map with every
-                    cluster node owning a portion of the overall data set. Unlike other in-memory data grids (IMDG),
-                    Ignite enables storing data both, in memory and on disk, and
-                    therefore is able to store more data than can fit in the physical memory.
-                </p>
-                <p>
-                    Ignite data grid is one of the fastest implementations of ACID transactions or
-                    atomic data updates in distributed clusters today. We know it because we constantly benchmark it ourselves.
-                </p>
-                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <div class="page-heading">3rd Party Databases</div>
-                    <p>
-                        Ignite in-memory data grid can improve performance and scalability of existing 3rd party databases - RDBMS,
-                        NoSQL, or Hadoop-based storages, by sliding in as a distributed cache between the application and database layers.
-                        Ignite will automatically write-through or read-through all the updates
-                        or reads to or from the underlying database. Ignite will also merge with the underlying database
-                        transactions, providing transparent transactional behavior to the users.
-                    </p>
-                    <p>
-                        However, this approach has its limitations. For example, SQL or scan queries will only include the
-                        results stored in memory, and not in the external database, since Ignite cannot index the external data.
-                        If you require that data on disk should be indexed and accessible via SQL queries, we recommend that you look at
-                        <a href="/arch/persistence.html">Ignite native persistence</a>.
-                    </p>
-                </div>
-
-                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/IMDG.png" width="300px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <div class="page-heading">Native Persistence</div>
-                    <p>
-                        Ignite <a href="/arch/persistence.html">native persistence</a> is a distributed ACID and SQL-compliant disk store that transparently
-                        integrates with Ignite's durable memory. Ignite persistence is optional and can be turned on and off.
-                        When turned off, Ignite becomes a pure in-memory store. When native persistence is enabled, Ignite stores
-                        both data and indexes on disk. A subset of data and the most frequently used indexes are stored in memory.
-                        Additionally, since Ignite persists indexes on disk, they do not have to be rebuilt on cluster
-                        restart making the system faster than other in-memory databases.
-                    </p>
-                </div>
-
-                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/native_persistence_key_value.png" width="300px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">Key-Value APIs</div>
-            <p>
-                In addition to the standard <a href="/use-cases/caching/jcache-provider.html">JCache (JSR 107)</a> API, Ignites supports distributed ACID transactions,
-                scan and continuous queries, collocated processing and more.
-            </p>
-
-            <p>
-                The data grid has been built from the ground up to linearly scale to hundreds of nodes with strong
-                semantics for data locality and affinity data routing to reduce redundant data noise. It can be
-                viewed as a distributed partitioned hash map with every cluster node owning a portion of the
-                overall data. This way the more cluster nodes we add, the more data we can cache.
-            </p>
-
-            <div class="page-heading">Affinity Collocation</div>
-            <p>
-                To improve performance and scalability of an application, Ignite allows collocating data with data or compute with data.
-                By collocating related cache keys together, you can make sure that all keys will be cached on the same processing node,
-                hence avoiding costly network trips to fetch data from remote nodes.
-                It is also possible to route computations to the nodes where the data is cached.
-            </p>
-
-            <div class="videos">
-                <div class="page-heading">Videos</div>
-                <ul class="page-list">
-                    <li>
-                        <i class="fa fa-lg fa-play-circle-o"></i>
-                                <span class="video-title">
-                                    <a target="youtube" href="https://www.youtube.com/watch?v=pFbDWpOiMOU">Getting Started with Data Grid</a>
-                                </span>
-                        <span class="video-duration">03:49</span>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="code-examples">
-                <div class="page-heading">Code Examples</div>
-                <!-- Nav tabs -->
-                <ul id="datagrid-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#datagrid-example-basic" role="tab" data-toggle="tab">Put and Get</a></li>
-                    <li><a href="#datagrid-example-transactions" role="tab" data-toggle="tab">Transactions</a></li>
-                    <li><a href="#datagrid-example-locks" role="tab" data-toggle="tab">Locks</a></li>
-                    <li><a href="#datagrid-example-sqlquery" role="tab" data-toggle="tab">SQL Query</a></li>
-                    <li><a href="#datagrid-example-sqljoin" role="tab" data-toggle="tab">SQL Join</a></li>
-                    <li><a href="#datagrid-example-sqlaggregation" role="tab" data-toggle="tab">SQL Aggregation</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="datagrid-example-basic">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final IgniteCache&lt;Integer, String&gt; cache = ignite.cache("cacheName");
-
-                            // Store keys in cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.put(i, Integer.toString(i));
-
-                            // Retrieve values from cache.
-                            for (int i = 0; i < 10; i++)
-                                System.out.println("Got [key=" + i + ", val=" + cache.get(i) + ']');
-
-                            // Remove objects from cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.remove(i);
-
-                            // Atomic put-if-absent.
-                            cache.putIfAbsent(1, "1");
-
-                            // Atomic replace.
-                            cache.replace(1, "1", "2");
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-transactions">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Clone every object we get from cache, so we can freely update it.
-                            IgniteCache&lt;Integer, Account&gt; cache = ignite.cache("cacheName");
-
-                            try (IgniteTx tx = Ignition.ignite().transactions().txStart()) {
-                                Account acct = cache.get(acctId);
-
-                                assert acct != null;
-
-                                // Deposit $20 into account.
-                                acct.setBalance(acct.getBalance() + 20);
-
-                                // Store updated account in cache.
-                                cache.put(acctId, acct);
-
-                                tx.commit();
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-locks">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final GridCache&lt;String, Integer&gt; cache = ignite.cache("cacheName");
-
-                            // Lock cache key "Hello".
-                            Lock lock = cache.lock("Hello");
-
-                            lock.lock();
-
-                            try {
-                                cache.put("Hello", 11);
-                                cache.put("World", 22);
-                            }
-                            finally {
-                                lock.unlock();
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqlquery">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; cache = ignite.cache("mycache");
-
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                              "select concat(firstName, ' ', lastName) from Person");
-
-                            // Select concatinated first and last name for all persons.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor = cache.query(sql)) {
-                              for (List&lt;?&gt; row : cursor)
-                                System.out.println("Full name: " + row.get(0));
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqljoin">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; personCache = ignite.cache("personCache");
-
-                            // Select with join between Person and Organization to
-                            // get the names of all the employees of a specific organization.
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                                "select p.name  "
-                                    + "from Person p, \"orgCache\".Organization o where "
-                                    + "p.orgId = o.id "
-                                    + "and o.name = ?");
-
-                            // Execute the query and obtain the query result cursor.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor =  personCache.query(sql.setArgs("Ignite"))) {
-                                for (List&lt;?&gt; row : cursor)
-                                    System.out.println("Person name=" + row);
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqlaggregation">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; personCache = ignite.cache("personCache");
-
-                            // Select average age of people working within different departments.
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                                "select avg(p.age) as avg_age, d.name as dpmt_name, o.name as org_name "
-                                    + "from Person p, \"depCache\".Department d, \"orgCache\".Organization o "
-                                    + "where p.depid = d.id and d.orgid = o.id "
-                                    + "group by d.name, o.name "
-                                    + "order by avg_age";
-
-                            // Execute the query and obtain the query result cursor.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor =  personCache.query(sql.setArgs("Ignite"))) {
-                                for (List&lt;?&gt; row : cursor)
-                                    System.out.println("Average age by department and organization: " + row);
-                            }
-                        </pre>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-        <section id="key-features" class="page-section">
-            <h2>More on Data Grid</h2>
-            <table class="formatted" name="key-value-apis">
-                <thead>
-                <tr>
-                    <th width="35%" class="left">Feature</th>
-                    <th>Description</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="left">Key-Value Store</td>
-                    <td>
-                        <p>
-                            Ignite data grid is a <code>key-value store</code> which can store data both, in-memory
-                            and on-disk. It can be viewed as a distributed partitioned hash map, with every cluster
-                            node owning a portion of the overall data. This way the more cluster nodes we add,
-                            the more data we can store.
-                        </p>
-
-                        <div class="page-links">
-                            <a href="/use-cases/database/key-value-store.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Durable Memory</td>
-                    <td>
-                        <p>
-                            Ignite <code>Durable Memory</code> allows storing and processing data and indexes
-                            both, in memory and on disk. The in-memory data, including indexes, is always
-                            stored and managed <code>off-heap</code>, completely removing any type of Garbage
-                            Collection overhead.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/durable-memory" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">JCache (JSR 107)</td>
-                    <td>
-                        <p>
-                            Ignite is a 100% compliant implementation of <span style="white-space: nowrap">JCache (JSR 107)</span> specification.
-                            JCache provides a very simple to use, yet very powerful API for data caching.
-                        </p>
-                        <div class="page-links">
-                            <a href="/use-cases/caching/jcache-provider.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Memory-Centric Storage</td>
-                    <td>
-                        <p>
-                            Apache Ignite is based on distributed <i>memory-centric architecture</i> that combines the
-                            performance and scale of in-memory computing together with the disk durability and strong
-                            consistency in one system.
-                        </p>
-                        <div class="page-links">
-                            <a href="/arch/memorycentric.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Collocated Processing</td>
-                    <td>
-                        <p>
-                            Ignite allows executing any native Java, C++, and .NET/C# code directly on the server-side,
-                            close to the data, in collocated fashion.
-                        </p>
-                        <div  class="page-links">
-                            <a href="/features/collocatedprocessing.html" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Client-side Near Caches</td>
-                    <td>
-                        <p>
-                            Near cache is local client-side cache that stores the most recently and most frequently accessed data.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/near-caches" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">ACID Transactions</td>
-                    <td>
-                        <p>
-                            Ignite supports distributed ACID transactions for key-value as well as SQL operations.
-                        </p>
-                        <div class="page-links">
-                            <a href="/features/transactions.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Deadlock-Free Transactions</td>
-                    <td>
-                        <p>
-                            Ignite supports deadlock-free, optimistic transactions, which do not acquire any locks,
-                            and free users from worrying about the lock order.
-                            Such transactions also provide much better performance.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Transactional Entry Processor</td>
-                    <td>
-                        <p>
-                            Ignite transactional entry processor allows executing collocated user logic on the server
-                            side within a transaction.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/affinity-collocation#ignitecompute-vs-entryprocessor" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Cross-Partition Transactions</td>
-                    <td>
-                        <p>
-                            In Ignite, transactions can be performed on all partitions of a cache across the whole cluster.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#ignitetransactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Locks</td>
-                    <td>
-                        <p>
-                            Ignite allows developers to define explicit locks enforcing mutual exclusion on cached objects.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/distributed-locks" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Continuous Queries</td>
-                    <td>
-                        <p>
-                            Continuous queries are useful for cases when you want to execute a query and then
-                            continue to get notified about the data changes that fall into your query filter.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/continuous-queries" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Write-Through</td>
-                    <td>
-                        <p>
-                            Write-Through mode allows updating the data in the database.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Read-Through</td>
-                    <td>
-                        <p>
-                            Read-Through mode allows reading the data from the database.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Write-Behind Caching</td>
-                    <td>
-                        <p>
-                            Ignite provides an option to asynchronously perform updates to the database via Write-Behind Caching.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#section-write-behind-caching" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Hibernate L2 Caching</td>
-                    <td>
-                        <p>
-                            Ignite data grid can be used as <code>Hibernate Second-Level Cache</code> (or L2 cache),
-                            which can significantly speed-up the persistence layer of your application.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/hibernate-l2-cache" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Spring Caching</td>
-                    <td>
-                        <p>
-                            Ignite provides Spring-annotation-based way to enable caching for Java methods so that
-                            the result of a method execution is stored in the Ignite cache. If later the same
-                            method is called with the same set of parameters, the result will be retrieved from
-                            the cache instead of actually executing the method.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite-mix.readme.io/docs/spring-caching" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Spring Data</td>
-                    <td>
-                        <p>
-                            Apache Ignite implements Spring Data <code>CrudRepository</code> interface that not only supports basic CRUD operations but also provides access to the Apache Ignite SQL capabilities via the unified Spring Data API.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/spring-data" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">OSGI Support</td>
-                    <td>
-                        <p></p> &nbsp;
-                        <div  class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/starting-inside-an-osgi-container" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/datagrid.html b/features/datagrid.html
deleted file mode 100644
index 8db741f..0000000
--- a/features/datagrid.html
+++ /dev/null
@@ -1,525 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/datagrid.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <meta name="description" content="Apache Ignite In-Memory Data Grid is a distributed transactional key-value store that stores data
-        in-memory and on-disk and supports key-value, SQL, and processing APIs"/>
-    <title>In-Memory Data Grid - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="datagrid" class="page-section">
-            <h1 class="first">Key-Value In-Memory Data Grid</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <p>
-                    Ignite provides extensive and rich key-value APIs and can act as an in-memory data grid.
-                    You can think of Ignite as of a distributed partitioned hash map with every
-                    cluster node owning a portion of the overall data set. Unlike other in-memory data grids (IMDG),
-                    Ignite enables storing data both, in memory and on disk, and
-                    therefore is able to store more data than can fit in the physical memory.
-                </p>
-                <p>
-                    Ignite data grid is one of the fastest implementations of ACID transactions or
-                    atomic data updates in distributed clusters today. We know it because we constantly benchmark it ourselves.
-                </p>
-                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <div class="page-heading">3rd Party Databases</div>
-                    <p>
-                        Ignite in-memory data grid can improve performance and scalability of existing 3rd party databases - RDBMS,
-                        NoSQL, or Hadoop-based storages, by sliding in as a distributed cache between the application and database layers.
-                        Ignite will automatically write-through or read-through all the updates
-                        or reads to or from the underlying database. Ignite will also merge with the underlying database
-                        transactions, providing transparent transactional behavior to the users.
-                    </p>
-                    <p>
-                        However, this approach has its limitations. For example, SQL or scan queries will only include the
-                        results stored in memory, and not in the external database, since Ignite cannot index the external data.
-                        If you require that data on disk should be indexed and accessible via SQL queries, we recommend that you look at
-                        <a href="/arch/persistence.html">Ignite native persistence</a>.
-                    </p>
-                </div>
-
-                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/IMDG.png" width="300px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <div class="page-heading">Native Persistence</div>
-                    <p>
-                        Ignite <a href="/arch/persistence.html">native persistence</a> is a distributed ACID and SQL-compliant disk store that transparently
-                        integrates with Ignite's durable memory. Ignite persistence is optional and can be turned on and off.
-                        When turned off, Ignite becomes a pure in-memory store. When native persistence is enabled, Ignite stores
-                        both data and indexes on disk. A subset of data and the most frequently used indexes are stored in memory.
-                        Additionally, since Ignite persists indexes on disk, they do not have to be rebuilt on cluster
-                        restart making the system faster than other in-memory databases.
-                    </p>
-                </div>
-
-                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/native_persistence_key_value.png" width="300px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">Key-Value APIs</div>
-            <p>
-                In addition to the standard <a href="/use-cases/caching/jcache-provider.html">JCache (JSR 107)</a> API, Ignites supports distributed ACID transactions,
-                scan and continuous queries, collocated processing and more.
-            </p>
-
-            <p>
-                The data grid has been built from the ground up to linearly scale to hundreds of nodes with strong
-                semantics for data locality and affinity data routing to reduce redundant data noise. It can be
-                viewed as a distributed partitioned hash map with every cluster node owning a portion of the
-                overall data. This way the more cluster nodes we add, the more data we can cache.
-            </p>
-
-            <div class="page-heading">Affinity Collocation</div>
-            <p>
-                To improve performance and scalability of an application, Ignite allows collocating data with data or compute with data.
-                By collocating related cache keys together, you can make sure that all keys will be cached on the same processing node,
-                hence avoiding costly network trips to fetch data from remote nodes.
-                It is also possible to route computations to the nodes where the data is cached.
-            </p>
-
-            <div class="videos">
-                <div class="page-heading">Videos</div>
-                <ul class="page-list">
-                    <li>
-                        <i class="fa fa-lg fa-play-circle-o"></i>
-                                <span class="video-title">
-                                    <a target="youtube" href="https://www.youtube.com/watch?v=pFbDWpOiMOU">Getting Started with Data Grid</a>
-                                </span>
-                        <span class="video-duration">03:49</span>
-                    </li>
-                </ul>
-            </div>
-
-            <div class="code-examples">
-                <div class="page-heading">Code Examples</div>
-                <!-- Nav tabs -->
-                <ul id="datagrid-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#datagrid-example-basic" role="tab" data-toggle="tab">Put and Get</a></li>
-                    <li><a href="#datagrid-example-transactions" role="tab" data-toggle="tab">Transactions</a></li>
-                    <li><a href="#datagrid-example-locks" role="tab" data-toggle="tab">Locks</a></li>
-                    <li><a href="#datagrid-example-sqlquery" role="tab" data-toggle="tab">SQL Query</a></li>
-                    <li><a href="#datagrid-example-sqljoin" role="tab" data-toggle="tab">SQL Join</a></li>
-                    <li><a href="#datagrid-example-sqlaggregation" role="tab" data-toggle="tab">SQL Aggregation</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="datagrid-example-basic">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final IgniteCache&lt;Integer, String&gt; cache = ignite.cache("cacheName");
-
-                            // Store keys in cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.put(i, Integer.toString(i));
-
-                            // Retrieve values from cache.
-                            for (int i = 0; i < 10; i++)
-                                System.out.println("Got [key=" + i + ", val=" + cache.get(i) + ']');
-
-                            // Remove objects from cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.remove(i);
-
-                            // Atomic put-if-absent.
-                            cache.putIfAbsent(1, "1");
-
-                            // Atomic replace.
-                            cache.replace(1, "1", "2");
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-transactions">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Clone every object we get from cache, so we can freely update it.
-                            IgniteCache&lt;Integer, Account&gt; cache = ignite.cache("cacheName");
-
-                            try (IgniteTx tx = Ignition.ignite().transactions().txStart()) {
-                                Account acct = cache.get(acctId);
-
-                                assert acct != null;
-
-                                // Deposit $20 into account.
-                                acct.setBalance(acct.getBalance() + 20);
-
-                                // Store updated account in cache.
-                                cache.put(acctId, acct);
-
-                                tx.commit();
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-locks">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final GridCache&lt;String, Integer&gt; cache = ignite.cache("cacheName");
-
-                            // Lock cache key "Hello".
-                            Lock lock = cache.lock("Hello");
-
-                            lock.lock();
-
-                            try {
-                                cache.put("Hello", 11);
-                                cache.put("World", 22);
-                            }
-                            finally {
-                                lock.unlock();
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqlquery">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; cache = ignite.cache("mycache");
-
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                              "select concat(firstName, ' ', lastName) from Person");
-
-                            // Select concatinated first and last name for all persons.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor = cache.query(sql)) {
-                              for (List&lt;?&gt; row : cursor)
-                                System.out.println("Full name: " + row.get(0));
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqljoin">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; personCache = ignite.cache("personCache");
-
-                            // Select with join between Person and Organization to
-                            // get the names of all the employees of a specific organization.
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                                "select p.name  "
-                                    + "from Person p, \"orgCache\".Organization o where "
-                                    + "p.orgId = o.id "
-                                    + "and o.name = ?");
-
-                            // Execute the query and obtain the query result cursor.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor =  personCache.query(sql.setArgs("Ignite"))) {
-                                for (List&lt;?&gt; row : cursor)
-                                    System.out.println("Person name=" + row);
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-sqlaggregation">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, Person&gt; personCache = ignite.cache("personCache");
-
-                            // Select average age of people working within different departments.
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                                "select avg(p.age) as avg_age, d.name as dpmt_name, o.name as org_name "
-                                    + "from Person p, \"depCache\".Department d, \"orgCache\".Organization o "
-                                    + "where p.depid = d.id and d.orgid = o.id "
-                                    + "group by d.name, o.name "
-                                    + "order by avg_age";
-
-                            // Execute the query and obtain the query result cursor.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor =  personCache.query(sql.setArgs("Ignite"))) {
-                                for (List&lt;?&gt; row : cursor)
-                                    System.out.println("Average age by department and organization: " + row);
-                            }
-                        </pre>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-        <section id="key-features" class="page-section">
-            <h2>More on Data Grid</h2>
-            <table class="formatted" name="key-value-apis">
-                <thead>
-                <tr>
-                    <th width="35%" class="left">Feature</th>
-                    <th>Description</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="left">Key-Value Store</td>
-                    <td>
-                        <p>
-                            Ignite data grid is a <code>key-value store</code> which can store data both, in-memory
-                            and on-disk. It can be viewed as a distributed partitioned hash map, with every cluster
-                            node owning a portion of the overall data. This way the more cluster nodes we add,
-                            the more data we can store.
-                        </p>
-
-                        <div class="page-links">
-                            <a href="/use-cases/database/key-value-store.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Durable Memory</td>
-                    <td>
-                        <p>
-                            Ignite <code>Durable Memory</code> allows storing and processing data and indexes
-                            both, in memory and on disk. The in-memory data, including indexes, is always
-                            stored and managed <code>off-heap</code>, completely removing any type of Garbage
-                            Collection overhead.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/durable-memory" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">JCache (JSR 107)</td>
-                    <td>
-                        <p>
-                            Ignite is a 100% compliant implementation of <span style="white-space: nowrap">JCache (JSR 107)</span> specification.
-                            JCache provides a very simple to use, yet very powerful API for data caching.
-                        </p>
-                        <div class="page-links">
-                            <a href="/use-cases/caching/jcache-provider.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Memory-Centric Storage</td>
-                    <td>
-                        <p>
-                            Apache Ignite is based on distributed <i>memory-centric architecture</i> that combines the
-                            performance and scale of in-memory computing together with the disk durability and strong
-                            consistency in one system.
-                        </p>
-                        <div class="page-links">
-                            <a href="/arch/memorycentric.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Collocated Processing</td>
-                    <td>
-                        <p>
-                            Ignite allows executing any native Java, C++, and .NET/C# code directly on the server-side,
-                            close to the data, in collocated fashion.
-                        </p>
-                        <div  class="page-links">
-                            <a href="/features/collocatedprocessing.html" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Client-side Near Caches</td>
-                    <td>
-                        <p>
-                            Near cache is local client-side cache that stores the most recently and most frequently accessed data.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/near-caches" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">ACID Transactions</td>
-                    <td>
-                        <p>
-                            Ignite supports distributed ACID transactions for key-value as well as SQL operations.
-                        </p>
-                        <div class="page-links">
-                            <a href="/features/transactions.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Deadlock-Free Transactions</td>
-                    <td>
-                        <p>
-                            Ignite supports deadlock-free, optimistic transactions, which do not acquire any locks,
-                            and free users from worrying about the lock order.
-                            Such transactions also provide much better performance.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Transactional Entry Processor</td>
-                    <td>
-                        <p>
-                            Ignite transactional entry processor allows executing collocated user logic on the server
-                            side within a transaction.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/affinity-collocation#ignitecompute-vs-entryprocessor" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Cross-Partition Transactions</td>
-                    <td>
-                        <p>
-                            In Ignite, transactions can be performed on all partitions of a cache across the whole cluster.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#ignitetransactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Locks</td>
-                    <td>
-                        <p>
-                            Ignite allows developers to define explicit locks enforcing mutual exclusion on cached objects.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/distributed-locks" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Continuous Queries</td>
-                    <td>
-                        <p>
-                            Continuous queries are useful for cases when you want to execute a query and then
-                            continue to get notified about the data changes that fall into your query filter.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/continuous-queries" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Write-Through</td>
-                    <td>
-                        <p>
-                            Write-Through mode allows updating the data in the database.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Read-Through</td>
-                    <td>
-                        <p>
-                            Read-Through mode allows reading the data from the database.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Write-Behind Caching</td>
-                    <td>
-                        <p>
-                            Ignite provides an option to asynchronously perform updates to the database via Write-Behind Caching.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/3rd-party-store#section-write-behind-caching" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Hibernate L2 Caching</td>
-                    <td>
-                        <p>
-                            Ignite data grid can be used as <code>Hibernate Second-Level Cache</code> (or L2 cache),
-                            which can significantly speed-up the persistence layer of your application.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/hibernate-l2-cache" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Spring Caching</td>
-                    <td>
-                        <p>
-                            Ignite provides Spring-annotation-based way to enable caching for Java methods so that
-                            the result of a method execution is stored in the Ignite cache. If later the same
-                            method is called with the same set of parameters, the result will be retrieved from
-                            the cache instead of actually executing the method.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite-mix.readme.io/docs/spring-caching" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Spring Data</td>
-                    <td>
-                        <p>
-                            Apache Ignite implements Spring Data <code>CrudRepository</code> interface that not only supports basic CRUD operations but also provides access to the Apache Ignite SQL capabilities via the unified Spring Data API.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/spring-data" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">OSGI Support</td>
-                    <td>
-                        <p></p> &nbsp;
-                        <div  class="page-links">
-                            <a href="https://apacheignite-mix.readme.io/docs/starting-inside-an-osgi-container" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/datavisualization.html b/features/datavisualization.html
deleted file mode 100644
index 114ef83..0000000
--- a/features/datavisualization.html
+++ /dev/null
@@ -1,163 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/datavisualization.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Data Visualization - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="datavisualization" class="page-section">
-            <h1 class="first">Data Visualization Tools for Apache Ignite</h1>
-            <p> Apache Ignite integrates with a variety of data visualization tools that help analyze and interpret the data
-                stored in distributed caches through charts or rich graphical representations providing actionable insights.</p>
-        </section>
-
-        <section id="apache-ignite-web-console" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
-                    <h2 style="padding-bottom: 5px;">
-                        <a href="https://console.gridgain.com/" target="_blank" rel="noopener">
-                            <img style="margin-bottom:10px;" height="35"; width="40" src="/images/logo_ignite_32_32.png">
-                        </a> Ignite Web Console
-                    </h2>
-
-                    <p>Ignite Web Console is an interactive web-based management tool that allows you to:</p>
-                    <ul class="page-list">
-                        <li>Create and download various configurations for Apache Ignite</li>
-                        <li>Automatically load SQL metadata from any RDBMS</li>
-                        <li>Connect to Ignite cluster and run SQL analytics on it</li>
-                        <li>Manage and Monitor Ignite nodes and caches</li>
-                        <li>View heap, CPU, and other useful node and cache metrics</li>
-                    </ul>
-
-                    <p>
-                        Ignite Web Console is a web application that can be deployed on your system environment.
-                        For demo purposes, check out <b><a href="https://console.gridgain.com" target="_blank" rel="noopener">Ignite Web Console</a></b> hosted by GridGain.
-                    </p>
-
-                    <div class="page-heading">Docs:</div>
-
-                    <p>Click <a href="https://apacheignite-tools.readme.io/docs/ignite-web-console" target="_blank" rel="noopener">here</a> for documentation.</p>
-
-                    <div class="videos">
-                        <div class="page-heading">Videos:</div>
-                        <ul>
-                            <li>
-                                <i class="fa fa-lg fa-play-circle-o"></i>
-                                <span class="video-title">
-                                    <a target="youtube" href="https://youtu.be/V-o3IFVnk5k">Web Console Monitoring</a>
-                                </span>
-                                <span class="video-duration">04:07</span>
-                            </li>
-                        </ul>
-                    </div>
-
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
-                    <a href="/images/webconsole-sql.png"><img class="img-responsive" src="/images/webconsole-sql.png"></a>&nbsp;
-                    <p class="img-caption">Click on the image to view full size.</p>
-                </div>
-            </div><p>&nbsp;</p>
-        </section>
-
-        <section id="tableau" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
-                    <h2 style="padding-bottom: 5px;">
-                        <a href="https://www.tableau.com/" target="_blank" rel="noopener">
-                            <img style="margin-bottom:10px;" height="35"; width="40" src="/images/tableau_logo-2.png">
-                        </a> Tableau
-                    </h2>
-                    <p>Tableau is an interactive data-visualization tool focused on business intelligence.
-                        Using the Ignite ODBC driver, you can connect to an Ignite cluster from Tableau.</p>
-                    <p>You can use Ignite with Tableau to:</p>
-                    <ul class="page-list">
-                        <li>Retrieve distributed data stored in Ignite caches</li>
-                        <li>View tabular or graphical representation of the cached data</li>
-                        <li>Analyze data in different ways supported by Tableau</li>
-                    </ul>
-                    <div class="page-links">
-                        <a href="https://apacheignite-sql.readme.io/docs/tableau" target="_blank" rel="noopener">Integration with Tableau <i class="fa fa-angle-double-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
-                    <a href="/images/tableau_visualizing_data.png"><img class="img-responsive" src="/images/tableau_visualizing_data.png"></a>&nbsp;
-                    <p class="img-caption">Click on the image to view full size.</p>
-                </div>
-            </div><p>&nbsp;</p>
-        </section>
-
-        <section id="apache-zeppelin" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
-                    <h2 style="padding-bottom: 5px;">
-                        <a href="https://zeppelin.apache.org/" target="_blank" rel="noopener">
-                            <img height="35"; width="40" src="/images/zeppelin_logo.png">
-                        </a> Zeppelin
-                    </h2>
-                    <p>Apache Zeppelin is a web-based notebook that enables interactive data analytics.
-                        Using the Ignite JDBC driver, you can connect to an Ignite cluster from Zeppelin.</p>
-                    <p>You can use Ignite with Zeppelin to:</p>
-                    <ul class="page-list">
-                        <li>Retrieve distributed data using Ignite SQL interpreter</li>
-                        <li>View tabular or graphical representation of the cached data</li>
-                        <li>Execute distributed computations in Scala</li>
-                    </ul>
-                    <div class="page-links">
-                        <a href="https://apacheignite-sql.readme.io/docs/apache-zeppelin" target="_blank" rel="noopener">Integration with Apache Zeppelin <i class="fa fa-angle-double-right"></i></a>
-                    </div>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
-                    <a href="/images/zeppelin-integration-bargraph.png"><img class="img-responsive" src="/images/zeppelin-integration-bargraph.png"></a>&nbsp;
-                    <p class="img-caption">Click on the image to view full size.</p>
-                </div>
-            </div>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/igfs.html b/features/igfs.html
deleted file mode 100644
index 2626d04..0000000
--- a/features/igfs.html
+++ /dev/null
@@ -1,166 +0,0 @@
- <!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/features/igfs.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>In-Memory File System - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="igfs" class="page-section">
-            <h1 class="first">In-Memory File System</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-
-                    <p>
-                        One of the unique capabilities of Apache Ignite is a distributed in-memory file system called
-                        Ignite File System (IGFS). IGFS delivers a similar functionality to Hadoop HDFS, but
-                        only in-memory. In fact, in addition to its own APIs, IGFS implements Hadoop FileSystem API
-                        and can be transparently plugged into Hadoop or Spark deployments.
-                    </p>
-                    <p>
-                        IGFS splits the data from each file into separate data blocks and stores them in
-                        a distributed in-memory cache. However, unlike Hadoop HDFS, IGFS does not need a name node
-                        and automatically determines file data locality using a hashing function.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/spark-igfs.png" width="540px" style="float:right;"/>
-                </div>
-            </div>
-            <p>
-                IGFS can be deployed stand alone, as well as on top of HDFS in which case it becomes
-                a transparent caching layer for the files stored in HDFS.
-            </p>
-
-            <p>IGFS integrates with native Apache Hadoop distribution, Cloudera CDH, and Hortonworks HDP.</p>
-            <div class="page-heading">Tachyon Replacement</div>
-            <p>
-                IGFS can transparently replace Tachyon file system in Spark deployments. Given that IGFS is based
-                on battle-tested Ignite data grid technology, it exhibits much better write and read performance
-                than Tachyon, and is more stable.
-            </p>
-            <div class="page-heading">Hadoop File System</div>
-            <p>
-                See <a href="http://apacheignite-fs.readme.io/docs/file-system" target="docs">Hadoop integration documentation</a> if
-                you plan to use IGFS as Hadoop file system. In this case working with IGFS is no different than working
-                with HDFS.
-            </p>
-            <div class="page-heading">GitHub Native API Examples</div>
-            <p>
-                Also see <a href="https://github.com/apache/ignite/tree/master/examples/src/main/java/org/apache/ignite/examples/igfs" target="github">IGFS native API examples</a>
-                available on GitHub.
-            </p>
-        </section>
-        <section id="key-features" class="page-section">
-            <h2>Ignite File System Features</h2>
-            <table class="formatted" name="Ignite File System Features">
-                <thead>
-                    <tr>
-                        <th width="35%" class="left">Feature</th>
-                        <th>Description</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td class="left">On-Heap and Off-Heap</td>
-                        <td>
-                            <p>
-                                IGFS allows to store files either on-heap or off-heap. For larger memory spaces
-                                it is critical to use off-heap to avoid JVM lengthy garbage collection pauses.
-                            </p>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">IGFS as Hadoop FileSystem</td>
-                        <td>
-                            <p>
-                                IGFS implements Hadoop <code>FileSystem</code> API and can be deployed as a native
-                                Hadoop file system, just like HDFS. This allows to natively deploy IGFS into Hadoop or
-                                Spark installations in a plug-n-play fashion.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite-fs.readme.io/docs/file-system" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Hadoop FileSystem Cache</td>
-                        <td>
-                            <p>
-                                IGFS can also be deployed as a <code>caching layer</code> over another Hadoop File System. In this
-                                case, if a file is updated IGFS, then update will automatically be written through to
-                                HDFS. Also, if a file is read and is not currently in IGFS, it will be automatically
-                                loaded from HDFS.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite-fs.readme.io/docs/secondary-file-system" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Any Hadoop Distribution</td>
-                        <td>
-                            <p>
-                                IGFS integrates with native Apache Hadoop distribution, as well as Cloudera CDH, and
-                                Hortonworks HDP.
-                            </p>
-                            <div class="page-links" style="line-height: 1.3;">
-                                <a href="http://apacheignite-fs.readme.io/docs/installing-on-apache-hadoop" target="docs">IGFS on Apache Hadoop <i class="fa fa-angle-double-right"></i></a><br/>
-                                <a href="http://apacheignite-fs.readme.io/docs/installing-on-cloudera-cdh" target="docs">IGFS on Cloudera CDH <i class="fa fa-angle-double-right"></i></a><br/>
-                                <a href="http://apacheignite-fs.readme.io/docs/installing-on-hortonworks-hdp" target="docs">IGFS on Hortonworks HDP <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/manageandmonitor.html b/features/manageandmonitor.html
new file mode 100644
index 0000000..a1e89da
--- /dev/null
+++ b/features/manageandmonitor.html
@@ -0,0 +1,131 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/features/datavisualization.html" />
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Apache Ignite&reg Management & Monitoring</title>
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+
+    <main id="main" role="main" class="container">
+        <section id="datavisualization" class="page-section">
+            <h1 class="first">Apache Ignite&reg Management and Monitoring</h1>
+            <p>
+                Apache Ignite exposes metrics in JMX and OpenCensus formats making it possible to monitor the
+                clusters with a broad range of tools, including Zabbix, Prometheus, Grafana, App Dynamics.
+            </p>
+            <p>
+
+                On top of that, below is a list of tools developed specifically for Ignite production maintenance.
+                In addition to the monitoring capabilities, those tools let us manage Ignite clusters and execute
+                Ignite-specific operations straight from the UI.
+            </p>
+        </section>
+
+        <section id="apache-ignite-web-console" class="page-section">
+            <div class="col-sm-12 col-md-12 col-xs-12">
+                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
+                    <h2 style="padding-bottom: 5px;">
+                        <a href="https://console.gridgain.com/" target="_blank" rel="noopener">
+                            <img style="margin-bottom:10px;" height="35"; width="40" src="/images/logo_ignite_32_32.png">
+                        </a>Ignite Web Console
+                    </h2>
+
+                    <p>Ignite Web Console is an interactive web-based management tool that lets you:</p>
+                    <ul class="page-list">
+                        <li>Create and download various configurations to use for your Apache Ignite cluster.</li>
+                        <li>Import database schemas from virtually any RDBMS.</li>
+                        <li>Execute SQL queries over distributed data sets and view the execution plans.</li>
+                    </ul>
+
+                    <p>Refer to <a href="https://apacheignite-tools.readme.io/docs/ignite-web-console" target="_blank"
+                            rel="noopener">Ignite Web Console</a> documentation for more details.</p>
+
+                </div>
+                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
+                    <a href="/images/webconsole-sql.png"><img class="img-responsive" src="/images/webconsole-sql.png"></a>&nbsp;
+                    <p class="img-caption">Click on the image to view full size.</p>
+                </div>
+            </div><p>&nbsp;</p>
+        </section>
+
+        <section id="tableau" class="page-section">
+            <div class="col-sm-12 col-md-12 col-xs-12">
+                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0; padding-right:15px;">
+                    <h2 style="padding-bottom: 5px;">
+                        <a href="https://console.gridgain.com/" target="_blank" rel="noopener">
+                            <img style="margin-bottom:10px;" height="35"; width="40" src="/images/gg-iso-70x80.png">
+                        </a>GridGain Web Console
+                    </h2>
+
+                    <p>GridGain Web Console is a free management and monitoring tool,
+                        built on top of Apache Ignite Web Console that allows you to do the following:</p>
+                    <ul class="page-list">
+                        <li>All the capabilities of Ignite Web Console.</li>
+                        <li>Manage and Monitor Ignite nodes and caches.</li>
+                        <li>View heap, CPU, and other useful node and cache metrics.</li>
+                    </ul>
+
+                    <p>
+                        Refer to <a href="https://www.gridgain.com/docs/web-console/" target="_blank" rel="noopener">GridGain Web Console</a>
+                        documentation for more details and check out a
+                        <a href="https://console.gridgain.com" target="_blank" rel="noopener">hosted version</a>
+                        skipping the installation phase.
+                    </p>
+
+
+                </div>
+                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0;">
+                    <a
+                            href="/images/ggwc-dashboard.png"><img class="img-responsive"
+                                                                   src="/images/ggwc-dashboard.png"></a>&nbsp;
+                    <p class="img-caption">Click on the image to view full size.</p>
+                </div>
+            </div><p>&nbsp;</p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/features/mapreduce.html b/features/mapreduce.html
deleted file mode 100644
index 52fd026..0000000
--- a/features/mapreduce.html
+++ /dev/null
@@ -1,125 +0,0 @@
- <!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/features/mapreduce.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>In-Memory MapReduce - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="mapreduce" class="page-section">
-            <h1 class="first">In-Memory MapReduce</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0;">
-
-                    <p>
-                        Apache Ignite comes with in-memory implementation of Hadoop MapReduce APIs which provides
-                        significant acceleration over the native Hadoop MapReduce implementation. Ignite MapReduce
-                        performs much better than Hadoop due to push-based resource allocation as well as in-process
-                        collocation of computations with data.
-                    </p>
-                    <p>
-                        Additionally, since <a href="igfs.html">Ignite File System (IGFS)</a> does not need a
-                        <i>Name Node</i>, when used with <i>IGFS</i>, Ignite MapReduce jobs go directly to the
-                        IGFS data nodes in a single <span style="white-space: nowrap">round-trip</span>.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0;">
-                    <img class="img-responsive" src="/images/hadoop_sequence-1.png" width="440px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="page-heading">Native Hadoop MapReduce</div>
-            <p>
-                See <a href="http://apacheignite-fs.readme.io/docs/map-reduce" target="docs">MapReduce documentation</a>
-                to plug Ignite MapReduce natively into Hadoop deployments.
-            </p>
-        </section>
-        <section id="key-features" class="page-section">
-            <h2>Ignite MapReduce Features</h2>
-            <table class="formatted" name="Ignite MapReduce Features">
-                <thead>
-                    <tr>
-                        <th width="35%" class="left">Feature</th>
-                        <th>Description</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <tr>
-                        <td class="left">Native Hadoop MapReduce</td>
-                        <td>
-                            <p>
-                                Ignite MapReduce is an implementation of Hadoop MapReduce APIs and can be
-                                natively plugged into existing Hadoop installations to provide a
-                                significant performance boost.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite-fs.readme.io/docs/map-reduce" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Hadoop Accelerator</td>
-                        <td>
-                            <p>
-                                Ignite comes with Hadoop Accelerator distribution which provides both,
-                                Ignite File System (IGFS) and Ignite MapReduce, in one installation which
-                                can be easily plugged into existing Hadoop installations.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite-fs.readme.io/docs/hadoop-accelerator" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/multilanguage-2.html b/features/multilanguage-2.html
deleted file mode 100644
index 0075dc8..0000000
--- a/features/multilanguage-2.html
+++ /dev/null
@@ -1,342 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/multilanguage.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>Multi-Language Support</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-    <main id="main" role="main" class="container">
-        <section id="java" class="page-section">
-            <h1 class="first">Multi-Language Support</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Apache Ignite is developed predominantly in <b>Java</b> and, thus, can be deployed and used on
-                        numerous operating systems and architectures supported by Java Virtual Machine. For instance,
-                        you can find Ignite deployments running on Linux, Windows, Mac OS, Oracle Solaris operating
-                        systems and x86, x64, SPARC, PowerPC instruction set architectures.
-                    </p>
-                    <p>
-                        <a href="https://apacheignite.readme.io/" target="_blank" rel="noopener">Java APIs</a> are provided for every
-                        Ignite feature available. The APIs allow to embed Ignite related logic directly in Java or Scala
-                        powered applications and interact with the cluster by means of SQL and key-value operations,
-                        execute distributed computations and machine learning algorithms, and do much more.
-                    </p>
-                    <p>
-                        In addition to Java, Ignite natively supports <b>.NET</b> platform with <b>C#</b> and <b>C++</b>
-                        languages. Both <a href="https://apacheignite-net.readme.io/" target="_blank" rel="noopener">Ignite .NET</a>
-                        and <a href="https://apacheignite-cpp.readme.io/" target="_blank" rel="noopener">Ignite C++</a> APIs delegate most
-                        of the calls to Java using JNI. Here, it is worth mentioning that the JNI overhead is minimal
-                        and does not cause any performance degradation, especially in distributed environments where
-                        the network is a main contributor to the overall application performance.
-                    </p>
-                    <p>
-                        You can interact with Ignite as you would with any other <b>SQL</b> storage, using standard JDBC or
-                        ODBC connectivity. Ignite also provides native SQL APIs for Java, .NET and C++ developers
-                        for better performance.
-                    </p>
-                    <p>
-                        Ignite offers thin clients to access Ignite from <b>Python</b>, <b>PHP</b>, and <b>Node.JS</b>.
-                        To access Ignite from other programming consider using Ignite binary client protocol, JDBC and ODBC drivers, or other
-                        client protocols listed below.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/multilanguage.png" style="float:right;"/>
-                </div>
-
-            </div>
-
-            <div class="code-examples">
-                <div class="page-heading"> Getting Started Guides</div>
-
-                <p>
-                    The following getting started guides show how to start and use Apache Ignite in minutes:
-                </p>
-
-                <ul class="page-list">
-                    <li><a href="https://apacheignite.readme.io/docs/getting-started" target="_blank" rel="noopener">Java</a></li>
-                    <li><a href="https://apacheignite-net.readme.io/docs/getting-started-2" target="_blank" rel="noopener">.NET</a></li>
-                    <li><a href="https://apacheignite-cpp.readme.io/docs/getting-started-1" target="_blank" rel="noopener">C++</a></li>
-                    <li><a href="https://apacheignite-sql.readme.io/docs/getting-started" target="_blank" rel="noopener">SQL</a></li>
-                    <li><a href="http://apacheignite.readme.io/docs/python-thin-client" target="_blank" rel="noopener">Python</a></li>
-                    <li><a href="http://apacheignite.readme.io/docs/php-thin-client" target="_blank" rel="noopener">PHP</a></li>
-                    <li><a href="http://apacheignite.readme.io/docs/nodejs-thin-client" target="_blank" rel="noopener">Node.JS</a></li>
-                </ul>
-            </div>
-
-            <div class="code-examples">
-                <div class="page-heading">Code Examples</div>
-                <!-- Nav tabs -->
-                <ul id="messaging-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#java-ex" aria-controls="home" data-toggle="tab">Java</a></li>
-                    <li><a href="#dotnet-ex" aria-controls="profile" data-toggle="tab">.NET</a></li>
-                    <li><a href="#cpp-ex" aria-controls="profile" data-toggle="tab">C++</a></li>
-                    <li><a href="#python-ex" aria-controls="profile" data-toggle="tab">Python</a></li>
-                    <li><a href="#php-ex" aria-controls="profile" data-toggle="tab">PHP</a></li>
-                    <li><a href="#nodeJS-ex" aria-controls="profile" data-toggle="tab">Node.JS</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div class="tab-pane active" id="java-ex">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            IgniteCache&lt;Integer, String&gt; cache = ignite.cache("myCache");
-
-                            // Store keys in cache (values will end up on different nodes).
-                            for (int i = 0; i &lt; 10; i++)
-                                cache.put(i, Integer.toString(i));
-
-                            for (int i = 0; i &lt; 10; i++)
-                                System.out.println("Got [key=" + i + ", val=" + cache.get(i) + ']');
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dotnet-ex">
-                        <pre class="brush:csharp">
-                            using (var ignite = Ignition.Start())
-                            {
-                                var cache = ignite.GetOrCreateCache&lt;int, string&gt;("myCache");
-
-                                // Store keys in cache (values will end up on different nodes).
-                                for (int i = 0; i &lt; 10; i++)
-                                    cache.Put(i, i.ToString());
-
-                                for (int i = 0; i &lt; 10; i++)
-                                    Console.WriteLine("Got [key={0}, val={1}]", i, cache.Get(i));
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="cpp-ex">
-                        <pre class="brush:cpp">
-                            // Get cache instance.
-                            Cache&lt;int, std::string&gt; cache = grid.GetCache&lt;int, std::string&gt;("myCache");
-
-                            // Store keys in cache (values will end up on different  nodes).
-                            for (int i = 0; i &lt; 10; ++i)
-                            {
-                                std::stringstream value;
-                                value &lt;&lt; i;
-
-                                cache.Put(i, value.str());
-                            }
-
-                            for (int i = 0; i &lt; 10; ++i)
-                                std::cout &lt;&lt; "Got [key=" &lt;&lt; i &lt;&lt; ", val=" &lt;&lt; cache.Get(i) &lt;&lt; "]";
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="python-ex">
-                        <pre class="brush:python">
-                            from pyignite import Client
-
-                            client = Client()
-                            client.connect('127.0.0.1', 10800)
-
-                            #Create cache
-                            my_cache = client.create_cache('my cache')
-
-                            #Put value in cache
-                            my_cache.put('my key', 42)
-
-                            #Get value from cache
-                            result = my_cache.get('my key')
-                            print(result)
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="php-ex">
-                        <pre class="brush:php">
-                            $client = new Client();
-
-                            $client->connect(new ClientConfiguration('127.0.0.1:10800'));
-                            $cache = $client-&gt;getOrCreateCache('myCache')-&gt;
-                                setKeyType(ObjectType::INTEGER);
-
-                            // put and get value
-                            $cache-&gt;put(1, 'abc');
-                            $value = $cache-&gt;get(1);
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="nodeJS-ex">
-                        <pre class="brush:jscript">
-                            const igniteClient = new IgniteClient();
-
-                            await igniteClient.connect(new IgniteClientConfiguration('127.0.0.1:10800'));
-                            const cache = (await igniteClient.getOrCreateCache('myCache')).
-                                setKeyType(ObjectType.PRIMITIVE_TYPE.INTEGER);
-
-                            // put and get value
-                            await cache.put(1, 'abc');
-                            const value = await cache.get(1);
-                        </pre>
-                    </div>
-                </div>
-            </div>
-
-            <p>
-                More examples are available on
-                <a href="https://github.com/apache/ignite/tree/master" target="_blank" rel="noopener">GitHub</a>:
-            <ul class="page-list">
-                <li><a href="https://github.com/apache/ignite/tree/master/examples" target="_blank" rel="noopener">Java Examples</a></li>
-                <li><a href="https://github.com/apache/ignite/tree/master/modules/platforms/dotnet/examples" target="_blank" rel="noopener">.NET Examples</a></li>
-                <li><a href="https://github.com/apache/ignite/tree/master/modules/platforms/cpp/examples" target="_blank" rel="noopener">C++ Examples</a></li>
-            </ul>
-            </p>
-
-            <div class="page-heading">Supported Drivers and Protocols</div>
-            <table class="formatted" name="Supported Clients Features">
-                <thead>
-                <tr>
-                    <th width="35%" class="left">Feature</th>
-                    <th>Description</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="left">Ignite Native Client</td>
-                    <td>
-                        <p>
-                            Ignite Native Clients provide full functionality to remote applications connecting to
-                            the cluster. It allows to use the whole set of Ignite APIs, including SQL, key-value,
-                            transactions, compute, streaming, services, etc. The native clients can be used from
-                            Ignite Java, .NET or C++ APIs.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/clients-vs-servers" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Thin Clients</td>
-                    <td>
-                        <p>
-                            A thin client is a lightweight Ignite client that connects to the cluster via a standard socket connection.
-                            Ignite provides thin clients for
-                            <a href="https://apacheignite.readme.io/docs/java-thin-client" target="docs">Java</a>,
-                            <a href="https://apacheignite-net.readme.io/docs/thin-client" target="docs">.NET</a>,
-                            <a href="http://apacheignite.readme.io/docs/php-thin-client" target="docs">PHP</a>,
-                            <a href="http://apacheignite.readme.io/docs/python-thin-client" target="docs">Python</a>, and
-                            <a href="http://apacheignite.readme.io/docs/nodejs-thin-client" target="docs">Node.JS</a>.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/thin-clients" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">JDBC/ODBC Drivers</td>
-                    <td>
-                        <p>
-                            Ignite is shipped with JDBC/ODBC Drivers that allow you to retrieve distributed data from
-                            the cluster using standard SQL queries.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">REST/HTTP</td>
-                    <td>
-                        <p>
-                            Ignite provides an HTTP REST client that gives you the ability to communicate with the
-                            grid over HTTP and HTTPS protocols using REST approach. REST APIs can be used to
-                            perform different operations, like read/write from/to the cluster, execute tasks, get
-                            various metrics and more.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/rest-api" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Memcached</td>
-                    <td>
-                        <p>
-                            Ignite is <a href="http://memcached.org/" target="_blank" rel="noopener">Memcached</a> compliant,
-                            which enables users to store and retrieve distributed data from Ignite cache using any
-                            Memcached compatible client, including Java, PHP, Python, Ruby, and other Memcached
-                            clients.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/memcached-support" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">PHP PDO</td>
-                    <td>
-                        <p>
-                            PHP provides a lightweight, consistent interface for accessing databases named PHP Data
-                            Objects - PDO. With the usage of Apache Ignite's ODBC driver, it's possible to connect to an
-                            Apache Ignite cluster from a PHP application accessing and modifying data that is stored there.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/php-pdo" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Redis</td>
-                    <td>
-                        <p>
-                            Ignite is partially <a href="http://redis.io/" target="_blank" rel="noopener">Redis</a> compliant and enables users
-                            to store data in and retrieve from Apache Ignite caches using any Redis compatible client.
-                        </p>
-                        <div class="page-links">
-                            <a href="http://apacheignite.readme.io/docs/redis" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
\ No newline at end of file
diff --git a/features/sql-2.html b/features/sql-2.html
deleted file mode 100644
index 356331d..0000000
--- a/features/sql-2.html
+++ /dev/null
@@ -1,760 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/sql.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Distributed SQL - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="sql-queries" class="page-section">
-            <h1 class="first">Distributed Memory-Centric SQL Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0;">
-                    <p>
-                        Apache Ignite comes with ANSI-99 compliant, horizontally scalable and fault-tolerant
-                        distributed SQL database. You can interact with Ignite as you would with any other SQL storage, using standard JDBC or ODBC
-                        connectivity. Ignite also provides native SQL APIs for Java, .NET and C++ developers for better performance.
-                    </p>
-                    <p>
-                        Unlike other distributed SQL databases, Ignite memory-centric storage treats both memory and disk as active storage tiers.
-                        The disk tier, a.k.a. <nobr><a href="/arch/persistence.html">native persistence</a></nobr>, is disabled by default,
-                        in which case Ignite becomes a pure <nobr><a href="/use-cases/database/in-memory-database.html">in-memory database</a> (IMDB)</nobr>.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="page-heading">SQL Joins</div>
-            <p>
-                Ignite can <nobr><a href="https://apacheignite-sql.readme.io/docs/distributed-joins" target="_blank" rel="noopener">join data</a></nobr>
-                in both collocated and non-collocated fashions. When <a href="/features/collocatedprocessing.html">collocated</a>,
-                JOINs are executed on the nodes where the data is stored, avoiding
-                expensive serialization and network trips. Such approach provides the best scalability and performance
-                in distributed databases.
-            </p>
-
-            <div class="page-heading">SQL Transactions</div>
-            <p>
-                Ignite supports <a href="https://apacheignite-sql.readme.io/v2.6/docs/multiversion-concurrency-control">SQL transactions</a>
-                by enabling <a href="https://apacheignite.readme.io/v2.6/docs/multiversion-concurrency-control">multiversion concurrency control</a>
-                (MVCC) - a method of controlling consistency of data accessed by multiple users concurrently. MVCC implements the snapshot
-                isolation guarantee which ensures that each transaction always sees a consistent snapshot of data.
-            </p>
-
-            <div class="page-heading">SQL and In-Memory Mode</div>
-            <p>
-                Apache Ignite can function in a pure in-memory mode in which all data and indexes are stored entirely
-                in RAM. In this mode, you can achieve the maximum performance possible because the data is never
-                written to disk. As with any other in-memory database, you can configure backup copies of the data to
-                prevent possible data loss if cluster nodes fail.
-            </p>
-
-            <div class="page-heading">SQL and Native Persistence</div>
-            <p>
-                In this mode, <a href="/arch/persistence.html">Ignite native persistence</a> serves as the primary
-                storage that can survive cluster failures and restarts. 100% of data and indexes are
-                persisted to disk and the same or smaller amount is cached in memory.
-                When memory resources are scarce, indexes will take priority over data in
-                which case indexes will be cached first. This policy helps to run high-performant
-                SQL queries even if RAM is limited. If a value or index is missing in memory, Ignite will query on-disk data.
-            </p>
-            <p>
-                On cluster restart, Ignite reads data and indexes from disk eliminating the need for memory warm-up.
-                This process significantly decreases any potential downtime.
-            </p>
-
-            <div class="page-heading">SQL and 3rd Party Databases</div>
-            <p>Ignite can be used as a caching layer (aka. data grid) above an existing 3rd party database -
-                RDBMS, NoSQL, or HDFS. This mode is used to accelerate the underlying database.</p>
-
-            <p> When a 3rd party database is configured, Ignite retrieves data from the memory, and inserts data into both the memory and the database.
-                Therefore, in this mode Ignite requires preloading data into caches for SELECT queries; however, it propagates all
-                updates - INSERT, UPDATE, DELETE - to the database.</p>
-
-            <p>Want to learn more? See <a href="https://apacheignite-sql.readme.io/docs/overview" target="_blank" rel="noopener">Ignite SQL Capabilities</a></p>
-
-            <div class="code-examples">
-                <div class="page-heading">Connectivity</div>
-                <p>The following code examples show how to use the JDBC and ODBC drivers and open a connection:</p>
-                <!-- Nav tabs -->
-                <ul id="connectivity-examples" class="nav nav-tabs">
-                    <li  class="active"><a href="#jdbc-connectivity" aria-controls="profile" data-toggle="tab">JDBC</a></li>
-                    <li><a href="#odbc-connectivity" aria-controls="profile" data-toggle="tab">ODBC</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-
-                    <div class="tab-pane active" id="jdbc-connectivity">
-                        <pre class="brush:java">
-
-                            Class.forName("org.apache.ignite.IgniteJdbcThinDriver");
-
-                            Connection conn = DriverManager.getConnection(
-                                "jdbc:ignite:thin://127.0.0.1/");
-
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="odbc-connectivity">
-                        <pre class="brush:cpp">
-                            // Combining connect string
-                            std::string connectStr = "DRIVER={Apache Ignite};SERVER=localhost;PORT=10800;SCHEMA=Person;";
-
-                            SQLCHAR outstr[ODBC_BUFFER_SIZE];
-                            SQLSMALLINT outstrlen;
-
-                            // Connecting to ODBC server
-                            SQLRETURN ret = SQLDriverConnect(dbc, NULL, reinterpret_cast&lt;SQLCHAR*&gt;(&connectStr[0]), static_cast&lt;SQLSMALLINT&gt;(connectStr.size()),
-                                outstr, sizeof(outstr), &outstrlen, SQL_DRIVER_COMPLETE)
-                        </pre>
-                    </div>
-                </div>
-                <p>
-                    Ignite <a href="https://apacheignite.readme.io/docs/getting-started" target="_blank" rel="noopener">Java</a>,
-                    <a href="https://apacheignite-net.readme.io/docs/getting-started-2" target="_blank" rel="noopener">.NET</a> or
-                    <a href="https://apacheignite-cpp.readme.io/docs/getting-started-1" target="_blank" rel="noopener">C++</a> APIs can be
-                    used as alternatives to the JDBC and ODBC drivers.
-                </p>
-            </div>
-
-
-            <div class="code-examples">
-                <div class="page-heading">SQL Tables Creation</div>
-                <p>Ignite supports <b>Data Definition Language (DDL)</b> statements for creating and removing SQL tables
-                    and indexes at runtime.
-                </p>
-                <p> The following examples show how to create tables:​ </p>
-                <!-- Nav tabs -->
-                <ul id="ddl-examples" class="nav nav-tabs">
-                    <li  class="active"><a href="#ddl-sql" aria-controls="profile" data-toggle="tab">SQL</a></li>
-                    <li><a href="#ddl-jdbc" aria-controls="profile" data-toggle="tab">JDBC</a></li>
-                    <li><a href="#ddl-odbc" aria-controls="profile" data-toggle="tab">ODBC</a></li>
-                    <!--<li><a href="#ddl-java" aria-controls="profile" data-toggle="tab">Java API</a></li>
-                    <li><a href="#ddl-cpp" aria-controls="profile" data-toggle="tab">C++ API</a></li>-->
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-
-                    <div class="tab-pane active" id="ddl-sql">
-                        <pre class="brush:sql">
-                            CREATE TABLE City (
-                                id LONG PRIMARY KEY, name VARCHAR)
-                                WITH "template=replicated"
-
-                            CREATE TABLE Person (
-                                id LONG, name VARCHAR, city_id LONG, PRIMARY KEY (id, city_id))
-                                WITH "backups=1, affinityKey=city_id"
-                        </pre>
-                    </div>
-                    <!--<div class="tab-pane" id="ddl-java">
-                        <pre class="brush:java">
-                            IgniteCache&lt;CityKey, City&gt; cache = ignite.cache("cityCache");
-
-                            // Create table based on REPLICATED template
-                            SqlFieldsQuery query = new SqlFieldsQuery(
-                                "CREATE TABLE City (" +
-                                " id LONG PRIMARY KEY, name VARCHAR)" +
-                                " WITH \"template=replicated\"");
-
-                            cache.query(query).getAll();
-
-                            // Create table based on PARTITIONED template with one backup
-                            query = new SqlFieldsQuery(
-                                "CREATE TABLE Person (" +
-                                " id LONG, name VARCHAR, city_id LONG," +
-                                " PRIMARY KEY (id, city_id))" +
-                                " WITH \"backups=1, affinityKey=city_id\"");
-
-                            cache.query(query).getAll();
-
-                        </pre>
-                    </div>-->
-                    <div class="tab-pane" id="ddl-jdbc">
-                        <pre class="brush:java">
-                            // Create table
-                            try (Statement stmt = conn.createStatement()) {
-
-                                // Create table based on REPLICATED template
-                                stmt.executeUpdate("CREATE TABLE City (" +
-                                    " id LONG PRIMARY KEY, name VARCHAR) " +
-                                    " WITH \"template=replicated\"");
-
-                                // Create table based on PARTITIONED template with one backup
-                                stmt.executeUpdate("CREATE TABLE Person (" +
-                                " id LONG, name VARCHAR, city_id LONG, " +
-                                " PRIMARY KEY (id, city_id)) " +
-                                " WITH \"backups=1, affinityKey=city_id\"");
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="ddl-odbc">
-                        <pre class="brush:cpp">
-                            SQLHSTMT stmt;
-
-                            // Allocate a statement handle
-                            SQLAllocHandle(SQL_HANDLE_STMT, dbc, &stmt);
-
-                            // Create table based on REPLICATED template
-                            SQLCHAR query[] = "CREATE TABLE City ( "
-                                "id LONG PRIMARY KEY, name VARCHAR) "
-                                "WITH \"template=replicated\"";
-                            SQLSMALLINT queryLen = static_cast&lt;SQLSMALLINT&gt;(sizeof(queryLen));
-
-                            SQLRETURN ret = SQLExecDirect(stmt, query, queryLen);
-
-                            // Create table based on PARTITIONED template with one backup
-                            SQLCHAR query[] = "CREATE TABLE Person ( "
-                                "id LONG, name VARCHAR, city_id LONG "
-                                "PRIMARY KEY (id, city_id)) "
-                                "WITH \"backups=1, affinityKey=city_id\"";
-                            SQLSMALLINT queryLen = static_cast&lt;SQLSMALLINT&gt;(sizeof(query));
-
-                            SQLRETURN ret = SQLExecDirect(stmt, query, queryLen);
-                        </pre>
-                    </div>
-                    <!--<div class="tab-pane" id="ddl-cpp">
-                        <pre class="brush:cpp">
-                            Cache&lt;CityKey, City&gt; cache = ignite.GetCache&lt;CityKey, City&gt;("cityCache");
-
-                            // Create table based on REPLICATED template
-                            SqlFieldsQuery query("CREATE TABLE City ("
-                                " id LONG PRIMARY KEY, name VARCHAR)"
-                                " WITH \"template=replicated\"");
-
-                            cache.Query(query);
-
-                            // Create table based on PARTITIONED template with one backup
-                            query.SetSql("CREATE TABLE Person ("
-                                " id LONG, name VARCHAR, city_id LONG,"
-                                " PRIMARY KEY (id, city_id))"
-                                " WITH \"backups=1, affinityKey=city_id\"");
-
-                            cache.Query(query);
-                        </pre>
-                    </div>-->
-                </div>
-
-                <p> In the above example, for the Person table, Ignite creates a distributed cache with 1 backup of data and city_id as the affinity key.
-                    These <b>extended parameters</b> are Ignite specific that can be passed using the <code>WITH</code> clause. To set other cache configurations for the table,
-                    you should use the <code>template</code> parameter and provide the name of the cache configuration previously registered(via XML or code).
-                    <a href="https://apacheignite-sql.readme.io/docs/create-table#section-parameters" target="_blank" rel="noopener">Read more</a> about extended parameters.
-                </p>
-                <p>
-                    See <a href="https://apacheignite-sql.readme.io/docs/ddl" target="_blank" rel="noopener">Ignite DDL documentation</a> for more details.
-                </p>
-            </div>
-            <div class="code-examples">
-                <div class="page-heading">Data Modification</div>
-                <p>
-                    To modify data stored in Ignite, use standard <b>DML</b> statements like INSERT, UPDATE, or DELETE.
-                </p>
-                <!-- Nav tabs -->
-                <ul id="dml-examples" class="nav nav-tabs">
-                    <li  class="active"><a href="#dml-sql" aria-controls="profile" data-toggle="tab">SQL</a></li>
-                    <li><a href="#dml-jdbc" aria-controls="profile" data-toggle="tab">JDBC</a></li>
-                    <li><a href="#dml-odbc" aria-controls="profile" data-toggle="tab">ODBC</a></li>
-                    <li><a href="#dml-java" aria-controls="profile" data-toggle="tab">Java API</a></li>
-                    <li><a href="#dml-dotnet" aria-controls="profile" data-toggle="tab">.NET API</a></li>
-                    <li><a href="#dml-cpp" aria-controls="profile" data-toggle="tab">C++ API</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-
-                    <div class="tab-pane active" id="dml-sql">
-                        <pre class="brush:sql">
-                            INSERT INTO City (id, name) VALUES (1, 'Forest Hill');
-                            INSERT INTO City (id, name) VALUES (2, 'Denver');
-
-
-                            UPDATE City
-                            SET name = 'Foster City'
-                            WHERE id = 2
-
-
-                            DELETE FROM City
-                            WHERE name = 'Foster City'
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dml-java">
-                        <pre class="brush:java">
-                            IgniteCache&lt;Long, City&gt; cache = ignite.cache("SQL_PUBLIC_CITY");
-
-                            // Insert data
-                            cache.query(new SqlFieldsQuery("INSERT INTO City(id, name) " +
-                                " values (1, 'Forest Hill'), (2, 'Denver')"));
-
-                            // Update data
-                            cache.query(new SqlFieldsQuery("UPDATE City set name = ? " +
-                                "WHERE id = ?").setArgs("Foster City", 2L));
-
-                            // Delete data
-                            cache.query(new SqlFieldsQuery("DELETE FROM City " +
-                                "WHERE id = ?").setArgs(2L));
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dml-jdbc">
-                        <pre class="brush:java">
-                            // Populate City table
-                            try (PreparedStatement stmt =
-                            conn.prepareStatement("INSERT INTO City (id, name) VALUES (?, ?)")) {
-
-                                stmt.setLong(1, 1L);
-                                stmt.setString(2, "Forest Hill");
-                                stmt.executeUpdate();
-
-                                stmt.setLong(1, 2L);
-                                stmt.setString(2, "Denver");
-                                stmt.executeUpdate();
-                            }
-
-                            // Update City
-                            try (Statement stmt = conn.createStatement()) {
-
-                                stmt.executeUpdate("UPDATE City SET name = 'Foster City' WHERE id = 2");
-                            }
-
-                            // Delete from City
-                            try (Statement stmt = conn.createStatement()) {
-
-                                stmt.executeUpdate("DELETE FROM City WHERE name = 'Foster City'");
-                            }
-
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dml-odbc">
-                        <pre class="brush:cpp">
-                            SQLHSTMT stmt;
-
-                            // Allocate a statement handle
-                            SQLAllocHandle(SQL_HANDLE_STMT, dbc, &stmt);
-
-                            // Populate City table
-                            SQLCHAR query1[] = "INSERT INTO City (id, name) VALUES (?, ?)";
-
-                            ret = SQLPrepare(stmt, query1, static_cast&lt;SQLSMALLINT&gt;(sizeof(query1)));
-
-                            key = 1;
-                            strncpy(name, "Forest Hill", sizeof(name));
-                            ret = SQLExecute(stmt);
-
-                            key = 2;
-                            strncpy(name, "Denver", sizeof(name));
-                            ret = SQLExecute(stmt);
-
-                            // Update City
-                            SQLCHAR query[] = "UPDATE City SET name = 'Foster City' WHERE id = 2"
-
-                            SQLSMALLINT queryLen = static_cast&lt;SQLSMALLINT&gt;(sizeof(queryLen));
-
-                            SQLRETURN ret = SQLExecDirect(stmt, query, queryLen);
-
-                            // Delete from City
-                            SQLCHAR query[] = "DELETE FROM City WHERE name = 'Foster City'"
-
-                            SQLSMALLINT queryLen = static_cast&lt;SQLSMALLINT&gt;(sizeof(queryLen));
-
-                            SQLRETURN ret = SQLExecDirect(stmt, query, queryLen);
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dml-dotnet">
-                        <pre class="brush:csharp">
-                            ICache&lt;long, City&gt; cache = ignite.GetCache&lt;long, City&gt;("SQL_PUBLIC_CITY");
-
-                            // Insert data
-                            cache.QueryFields(new SqlFieldsQuery("INSERT INTO City(id, name) " +
-                                " values (1, 'Forest Hill'), (2, 'Denver')"));
-
-                            // Update data
-                            cache.QueryFields(new SqlFieldsQuery("UPDATE City set name = ? " +
-                                "WHERE id = ?", "Foster City", 2));
-
-                            // Delete data
-                            cache.QueryFields(new SqlFieldsQuery("DELETE FROM City " +
-                                "WHERE id = ?", 2));
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dml-cpp">
-                        <pre class="brush:cpp">
-                            Cache&lt;int64_t, City&gt; cache = ignite.GetCache&lt;int64_t, City&gt;("SQL_PUBLIC_CITY");
-
-                            // Insert data
-                            cache.Query(SqlFieldsQuery("INSERT INTO City(id, name) "
-                                " values (1, 'Forest Hill'), (2, 'Denver')"));
-
-                            // Update data
-                            query = SqlFieldsQuery("UPDATE City set name = ? WHERE id = ?");
-                            query.AddArgument("Foster City");
-                            query.AddArgument(2LL);
-                            cache.Query(query);
-
-                            // Delete data
-                            query = SqlFieldsQuery("DELETE FROM City WHERE id = ?");
-                            query.AddArgument(2LL);
-                            cache.Query(query);
-                        </pre>
-                    </div>
-                </div>
-                <p>
-                    See <a href="https://apacheignite-sql.readme.io/docs/dml" target="_blank" rel="noopener">Ignite DML documentation</a> for more details.
-                </p>
-            </div>
-            <div class="code-examples">
-                <div class="page-heading">Transactional Updates</div>
-                <p>
-                    The BEGIN, COMMIT and ROLLBACK commands allow you to handle SQL Transactions.
-                </p>
-                <!-- Nav tabs -->
-                <ul id="sql-transactions-examples" class="nav nav-tabs">
-                    <li  class="active"><a href="#sql-commit" aria-controls="profile" data-toggle="tab">COMMIT</a></li>
-                    <li><a href="#sql-rollback" aria-controls="profile" data-toggle="tab">ROLLBACK</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-
-                    <div class="tab-pane active" id="sql-commit">
-                        <pre class="brush:sql">
-                            BEGIN;
-
-                            INSERT INTO Person (id, name, city_id) VALUES (1, 'John Doe', 3);
-
-                            Update City SET population = population + 1 where id = 3;
-
-                            COMMIT;
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="sql-rollback">
-                        <pre class="brush:sql">
-                            BEGIN;
-
-                            INSERT INTO Person (id, name, city_id) VALUES (1, 'John Doe', 3);
-
-                            Update City SET population = population + 1 where id = 3;
-
-                            ROLLBACK;
-                        </pre>
-                    </div>
-                <p>
-                    See <a href="https://apacheignite-sql.readme.io/docs/transactions" target="_blank" rel="noopener">SQL Transactions documentation</a> for more details.
-                </p>
-            </div>
-            <div class="code-examples">
-                <div class="page-heading">Querying Data</div>
-                <p>Ignite supports free-form SQL queries and joins that are fully distributed and fault-tolerant.
-                    The SQL syntax is ANSI-99 compliant which means that you can use
-                    any kind of SQL functions, aggregations, groupings or joins, defined by the specification,
-                    as a part of an SQL query.
-                </p>
-                <!-- Nav tabs -->
-                <ul id="sql-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#query-sql" aria-controls="home" data-toggle="tab">SQL</a></li>
-                    <li><a href="#query-jdbc" aria-controls="profile" data-toggle="tab">JDBC</a></li>
-                    <li><a href="#query-odbc" aria-controls="profile" data-toggle="tab">ODBC</a></li>
-                    <li><a href="#query-java" aria-controls="profile" data-toggle="tab">Java API</a></li>
-                    <li><a href="#query-dotnet" aria-controls="profile" data-toggle="tab">.NET API</a></li>
-                    <li><a href="#query-cpp" aria-controls="profile" data-toggle="tab">C++ API</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div class="tab-pane active" id="query-sql">
-                        <pre class="brush:sql">
-                            SELECT p.name, c.name
-                            FROM Person p, City c
-                            WHERE p.city_id = c.id
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="query-java">
-                        <pre class="brush:java">
-                            IgniteCache&lt;PersonKey, Person&gt; personCache = ignite.cache("SQL_PUBLIC_PERSON");
-
-                            // SQL join on Person and City.
-                            SqlFieldsQuery sql = new SqlFieldsQuery(
-                            "SELECT p.name, c.name  "
-                                + "FROM Person as p, City as c "
-                                + "WHERE p.city_id = c.id");
-
-                            // Execute the query and obtain the query result cursor.
-                            try (QueryCursor&lt;List&lt;?&gt;&gt; cursor =  personCache.query(sql)) {
-                                for (List&lt;?&gt; row : cursor)
-                                    System.out.println("Person name & city=" + row.get(0));
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="query-jdbc">
-                        <pre class="brush:java">
-                            try (Statement stmt = conn.createStatement()) {
-                                try (ResultSet rs =
-                                stmt.executeQuery("SELECT p.name, c.name " +
-                                " FROM Person p, City c " +
-                                " WHERE p.city_id = c.id")) {
-
-                                System.out.println("Query results:");
-
-                                while (rs.next())
-                                     System.out.println(">>>    " +
-                                        rs.getString(1) +
-                                        ", " +
-                                        rs.getString(2));
-                                }
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="query-odbc">
-                        <pre class="brush:cpp">
-                            SQLHSTMT stmt;
-
-                            // Allocate a statement handle
-                            SQLAllocHandle(SQL_HANDLE_STMT, dbc, &stmt);
-
-                            // Get data
-                            SQLCHAR query[] = "SELECT p.name, c.name "
-                              "FROM Person p, City c "
-                              "WHERE p.city_id = c.id";
-
-                            SQLSMALLINT queryLen = static_cast&lt;SQLSMALLINT&gt;(sizeof(queryLen));
-
-                            SQLRETURN ret = SQLExecDirect(stmt, query, queryLen);
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="query-dotnet">
-                        <pre class="brush:csharp">
-							ICache&lt;PersonKey, Person&gt; personCache = ignite.GetCache&lt;PersonKey, Person&gt;("SQL_PUBLIC_PERSON");
-
-							// SQL join on Person and City.
-							SqlFieldsQuery sql = new SqlFieldsQuery(
-							"SELECT p.name, c.name  "
-								+ "FROM Person as p, City as c "
-								+ "WHERE p.city_id = c.id");
-
-							// Execute the query and obtain the query result cursor.
-							foreach (IList row in personCache.QueryFields(sql))
-							{
-								Console.WriteLine($"Person '{row[0]}' from city '{row[1]}'");
-							}
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="query-cpp">
-                        <pre class="brush:cpp">
-                            Cache&lt;PersonKey, Person&gt; personCache = ignite.GetCache&lt;int64_t, Person&gt;("SQL_PUBLIC_PERSON");
-
-                            // SQL join on Person and City.
-                            SqlFieldsQuery sql("SELECT p.name, c.name "
-                                    "FROM Person as p, City as c "
-                                    "WHERE p.city_id = c.id");
-
-                            // Execute the query and obtain the query result cursor.
-                            FieldsQueryCursor cursor = personCache.Query(sql));
-
-                            while (cursor.HasNext())
-                            {
-                                QueryFieldsRow row = cursor.GetNext();
-
-                                std::cout &lt;&lt; "Person: " &lt;&lt; row.GetNext&lt;std::string&gt;() &lt;&lt; ", "
-                                          &lt;&lt; "City: " &lt;&lt; row.GetNext&lt;std::string&gt;() &lt;&lt; std::endl;
-                            }
-                        </pre>
-                    </div>
-                </div>
-                <p>
-                    See <a href="https://apacheignite-sql.readme.io/docs/select" target="_blank" rel="noopener">SELECT queries documentation</a> for more details.
-                </p>
-            </div>
-
-            <div class="page-heading github-examples">GitHub Examples</div>
-            <p>
-                Also see <a href="https://github.com/apache/ignite/blob/master/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java" target="github">SQL queries examples</a>
-                and <a href="https://github.com/apache/ignite/blob/master/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryDmlExample.java" target="github"> DML example</a> available on GitHub.
-            </p>
-        </section>
-
-        <section id="key-features" class="page-section">
-            <h2>SQL Database Features</h2>
-            <table class="formatted" name="SQL Database Features">
-                <thead>
-                <tr>
-                    <th width="35%" class="left">Feature</th>
-                    <th>Description</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="left">SQL Queries</td>
-                    <td>
-                        <p>
-                            Ignite supports free-form SQL queries without any limitations. The SQL syntax is ANSI-99 compliant which means
-                            that you can use any kind of SQL functions, aggregations, groupings or joins.
-                        </p>
-                        <p>
-                            SQL queries in Ignite are fully distributed and perform in a fault-tolerant manner that guarantees
-                            consistent query results regardless of cluster topology changes.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/select" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Distributed DDL</td>
-                    <td>
-                        <p>
-                            Apache Ignite supports Data Definition Language (DDL) statements for creating and removing SQL tables and indexes at runtime. Both native Apache Ignite SQL APIs as well as JDBC and ODBC drivers can be used for SQL schema modifications.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/ddl" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Distributed DML</td>
-                    <td>
-                        <p>
-                            Apache Ignite SQL Grid not only allows selecting data from the Data Grid, using <code>SQL ANSI-99</code> syntax,
-                            but it also makes it possible to modify that data with well-known DML statements like <code>INSERT</code>, <code>MERGE</code>, <code>UPDATE</code>, and <code>DELETE</code>.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/dml" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Collocated SQL Joins</td>
-                    <td>
-                        <p>
-                            SQL joins can be performed on collocated data stored across multiple caches.
-                            Since all the cache entries with the same affinity key are stored on the same processing node, these queries do not require expensive network trips to fetch the data from remote nodes, and hence, are extermely fast.
-                            Joins can also be performed between <code>PARTITIONED</code> and <code>REPLICATED</code> caches.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/distributed-joins#collocated-joins" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Non-Collocated SQL Joins</td>
-                    <td>
-                        <p>
-                            In Ignite, the default implementation of SQL join requires all the participating caches to be collocated. However,
-                            for cases where it is extremely difficult to collocate all the data, Ignite offers non-collocated SQL joins.
-                            Data can be distributed in any way across the cluster, and Ignite will figure out where to fetch the results from.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/distributed-joins#non-collocated-joins" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-
-                <tr>
-                    <td class="left">SQL Indexes</td>
-                    <td>
-                        <p>
-                            For SQL queries, Ignite supports in-memory indexing to facilitate fast data lookups.
-                            If you are caching your data in off-heap memory, then query indexes will also be cached in off-heap memory.
-                            Ignite allows configuring single column indexes as well as group indexes. It also provides support for custom indexing.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/create-index" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">JDBC/ODBC Driver</td>
-                    <td>
-                        <p>
-                            Ignite is shipped with <code>JDBC/ODBC Driver</code> that allows you to retrieve distributed data from
-                            cache using standard SQL queries and JDBC/ODBC API.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/jdbc-driver" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">Geospacial Support</td>
-                    <td>
-                        <p>
-                            Ignite supports querying and indexing geometry data types such as points, lines, and polygons considering the spatial relationship between these geometries.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/geospatial-support" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">.NET & C++ Support</td>
-                    <td>
-                        <p>
-                            Ignite.NET and Ignite C++ are buit on top of Ignite. This allows you to perform almost all SQL Grid operations including SQL and DML commands as well as distributed joins.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/net-sql-api" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">SQL Tooling</td>
-                    <td>
-                        <p>
-                            You can process data stored in the Ignite cluster using a SQL tool of your choice -
-                            <b>DBeaver</b>, <b>Pentaho</b>, <b>Tableau</b>, <b>Web Console</b>, <b>Apache Zeppelin</b> and more.
-                        </p>
-                        <div class="page-links">
-                            <a href="https://apacheignite-sql.readme.io/docs/sql-tooling" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/features/transactions-2.html b/features/transactions-2.html
deleted file mode 100644
index 2b48e25..0000000
--- a/features/transactions-2.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/features/transactions.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>ACID Transactions</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-    <main id="main" role="main" class="container">
-        <section id="java" class="page-section">
-            <h1 class="first">ACID Transactions</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Apache Ignite is a strongly consistent platform that fully supports distributed ACID transactions
-                        for key-value as well as SQL operations. The consistency guarantees are met for both memory and disk tiers.
-                    </p>
-                    <p>
-                        Transactions in Apache Ignite can span multiple cluster nodes, caches (aka. tables) and partitions.
-                        Both pessimistic and optimistic locking are available for applications. The optimistic mode
-                        also supports deadlock-free transactions that help avoid distributed deadlocks in user code.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-4 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/in_memory_data.png" width="500" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">Two-Phase-Commit Protocol</div>
-            <p>
-                In a distributed system, a transaction may span multiple cluster nodes. Obviously, this poses some
-                challenges when we want to ensure that the data is consistent across all the participating nodes.
-                For example, in the event of a cluster node failure, the transaction may not have fully committed on
-                the lost node. A widely-used approach to ensuring data consistency in this type of scenario is the
-                two-phase commit protocol (2PC).
-            </p>
-            <p>
-                Ignite comes with one the fastest implementations of 2PC protocol. Moreover,
-                often when transactions span only one node or one partition, Ignite will utilize a much faster
-                one-phase-commit (1PC) protocol. Whenever the data is updated within a transaction,
-                Ignite will keep the transactional state in a local transaction map until the changes are committed,
-                at which point the data is transferred to the participating remote nodes. Only the nodes that hold the
-                primary or backup copies of the data will participate in the transaction.
-            </p>
-            <div class="page-heading">Transactional SQL and MVCC</div>
-            <p>
-                In addition to key-value transactions, Ignite supports <a href="https://apacheignite-sql.readme.io/v2.6/docs/multiversion-concurrency-control">SQL transactions</a>
-                by enabling <a href="https://apacheignite.readme.io/v2.6/docs/multiversion-concurrency-control">multiversion concurrency control</a>
-                (MVCC) - a method of controlling consistency of data accessed by multiple users concurrently.
-                It implements the <a href="https://en.wikipedia.org/wiki/Snapshot_isolation" target="_blank" rel="noopener">snapshot</a>
-                isolation guarantee which ensures that each transaction always sees a consistent snapshot of data.
-            </p>
-
-            <div class="page-heading">Consistency and Ignite Persistence</div>
-            <p>
-                If Ignite native persistence is used then all the updates are written to the write-ahead log (WAL) file
-                that guarantees data consistency, even if the cluster or individual nodes go down in the middle
-                of a transaction.
-            </p>
-            <p>
-                The purpose of the WAL is to propagate updates to the disk in the append-only mode, which is the fastest
-                way to persist data to disk. WAL provides a recovery mechanism for failure scenarios when a single node
-                or the whole cluster go down. A cluster can always be recovered to the
-                latest successfully committed transaction.
-            </p>
-            <div class="page-heading">Consistency and 3rd Party Persistence</div>
-            <p>
-                In scenarios when Ignite is used as a caching layer on top of 3rd party databases, such as
-                RDBMS, Ignite transactions will span both, the cached data and the external database.
-                For instance, when an RDBMS is used as a persistence layer, Ignite will write the
-                transactional changes to the database before it sends the commit message to participating cluster nodes.
-                This way, if a transaction fails at the database level, Ignite can still send the rollback message
-                to every node involved, keeping the data consistent between the in-memory cache and the external database.
-            </p>
-
-            <div class="code-examples">
-                <div class="page-heading">Code Examples</div>
-                <!-- Nav tabs -->
-                <ul id="messaging-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#java-ex" aria-controls="home" data-toggle="tab">Java</a></li>
-                    <li><a href="#dotnet-ex" aria-controls="profile" data-toggle="tab">.NET</a></li>
-                    <li><a href="#cpp-ex" aria-controls="profile" data-toggle="tab">C++</a></li>
-                    <li><a href="#sql-ex" aria-controls="profile" data-toggle="tab">SQL</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div class="tab-pane active" id="java-ex">
-                        <pre class="brush:java">
-                            try (Transaction tx = transactions.txStart()) {
-                                Integer hello = cache.get("Hello");
-
-                                if (hello == 1)
-                                    cache.put("Hello", 11);
-
-                                    cache.put("World", 22);
-
-                                tx.commit();
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="dotnet-ex">
-                        <pre class="brush:csharp">
-                            using (ITransaction tx = transactions.TxStart())
-                            {
-                                var hello = cache.Get(1);
-
-                                if (hello != "Hello")
-                                    cache.Put(1, "Hello");
-
-                                    cache.Put(2, "World");
-
-                                tx.Commit();
-                            }
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="cpp-ex">
-                        <pre class="brush:cpp">
-                            Transaction tx = transactions.TxStart();
-
-                            int hello = cache.Get("Hello");
-
-                            if (hello == 1)
-                                cache.Put("Hello", 11);
-
-                            cache.Put("World", 22);
-
-                            tx.Commit();
-                        </pre>
-                    </div>
-                    <div class="tab-pane" id="sql-ex">
-                        <pre class="brush:sql">
-                            Class.forName("org.apache.ignite.IgniteJdbcThinDriver");
-
-                            // Open JDBC connection.
-                            Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1");
-
-                            PreparedStatement updateStmt = null;
-                            PreparedStatement selectStmt = null;
-
-                            // Start transaction
-                            conn.setAutoCommit(false);
-
-                            selectStmt = conn.prepareStatement("select name from Person where id = 1");
-                            selectStmt.setInt(1, 1);
-                            ResultSet rs = selectStmt.executeQuery();
-
-                            if (rs.next())
-                                System.out.println("name = " + rs.getString("name"));
-
-                            updateStmt = conn.prepareStatement("update Person set name = ? where id = ? ");
-
-                            updateStmt.setString(1, "New Name");
-                            updateStmt.setInt(2, 1);
-                            updateStmt.executeUpdate();
-
-                            // Commit transaction
-                            conn.commit();
-                        </pre>
-                    </div>
-                </div>
-            </div>
-
-            <div class="page-heading">More on Ignite Transactions</div>
-            <table class="formatted" name="More on Ignite Transactions">
-                <thead>
-                <tr>
-                    <th width="35%" class="left">Feature</th>
-                    <th>Description</th>
-                </tr>
-                </thead>
-                <tbody>
-                <tr>
-                    <td class="features-left">ACID Transactions</td>
-                    <td>
-                        <p>
-                            Ignite provides fully ACID compliant distributed transactions that ensure guaranteed consistency for SQL and key-value operations.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="features-left">MVCC</td>
-                    <td>
-                        <p>
-                            Ignite supports multiversion concurrency control (MVCC) that allows controlling consistency of data accessed by multiple users concurrently.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/multiversion-concurrency-control" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="features-left">2-Phase-Commit</td>
-                    <td>
-                        <p>
-                            Ignite utilizes a Two-Phase-Commit (2PC) protocol for its transactions and optimizes
-                            to one-phase-commit whenever possible:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#two-phase-commit-2pc" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="features-left">Write-Ahead Log</td>
-                    <td>
-                        <p>
-                            Ignite persistence maintains the WAL that propagates updates to disk in the fastest way possible and
-                            provides a recovery mechanism for scenarios where a single node or the whole cluster goes down:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/write-ahead-log" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="features-left">Deadlock-Free Transactions</td>
-                    <td>
-                        <p>
-                            Ignite supports deadlock-free, optimistic transactions, which do not acquire any locks.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#deadlock-free-transactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="features-left">Deadlocks Detection</td>
-                    <td>
-                        <p>
-                            Debugging and troubleshooting distributed deadlocks in Ignite:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#deadlock-detection" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Transactional Entry Processor</td>
-                    <td>
-                        <p>
-                            Ignite transactional entry processor allows executing collocated user logic on the server
-                            side within a transaction:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/affinity-collocation#ignitecompute-vs-entryprocessor" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Cross-Partition Transactions</td>
-                    <td>
-                        <p>
-                            In Ignite, transactions can be performed on all partitions of a cache across the whole
-                            cluster:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#ignitetransactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left" width="35%">Locks</td>
-                    <td>
-                        <p>
-                            Ignite allows developers to define explicit locks enforcing mutual exclusion on cached objects:
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/distributed-locks" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                <tr>
-                    <td class="left">XA/JTA</td>
-                    <td>
-                        <p>
-                            Ignite can be configured with a Java Transaction API (JTA) transaction manager lookup class.
-                        </p>
-                        <div  class="page-links">
-                            <a href="https://apacheignite.readme.io/docs/transactions#integration-with-jta" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                        </div>
-                    </td>
-                </tr>
-                </tbody>
-            </table>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/images/digital-hub.png b/images/digital-hub.png
new file mode 100644
index 0000000..670ecf6
--- /dev/null
+++ b/images/digital-hub.png
Binary files differ
diff --git a/images/gg-iso-70x80.png b/images/gg-iso-70x80.png
new file mode 100644
index 0000000..9393215
--- /dev/null
+++ b/images/gg-iso-70x80.png
Binary files differ
diff --git a/images/ggwc-dashboard.png b/images/ggwc-dashboard.png
new file mode 100644
index 0000000..8745098
--- /dev/null
+++ b/images/ggwc-dashboard.png
Binary files differ
diff --git a/images/hadoop-acceleration.png b/images/hadoop-acceleration.png
new file mode 100644
index 0000000..ff4dae7
--- /dev/null
+++ b/images/hadoop-acceleration.png
Binary files differ
diff --git a/includes/footer.html b/includes/footer.html
index 5bbe2f0..7f70c2c 100644
--- a/includes/footer.html
+++ b/includes/footer.html
@@ -10,7 +10,6 @@
                 <!--<ul class="list-unstyled">-->
                     <!--<li><a href="/index.html#overview">Overview</a></li>-->
                     <!--<li><a href="/features.html">Features</a></li>-->
-                    <!--<li><a href="/usecases.html">Use Cases</a></li>-->
                     <!--<li><a href="http://apacheignite.readme.io/docs">Documentation</a></li>-->
                     <!--<li><a href="http://apache-ignite-users.70518.x6.nabble.com/">Ask Question</a></li>-->
                     <!--<li><a href="/community/resources.html">Community</a></li>-->
diff --git a/includes/header.html b/includes/header.html
index 11808eb..83fda2e 100644
--- a/includes/header.html
+++ b/includes/header.html
@@ -10,44 +10,8 @@
     </div>
     <div class="container">
         <div class="row">
-            <div class="col-md-12 col-sm-12 col-xs-12">
-                <nav id="top-nav" class="navbar navbar-default" role="navigation">
-                    <div class="container-fluid">
-                        <!--<div class="navbar-header">-->
-                            <!--<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#top-navbar">-->
-                                <!--<span class="sr-only">Toggle navigation</span>-->
-                                <!--<span class="icon-bar"></span>-->
-                                <!--<span class="icon-bar"></span>-->
-                                <!--<span class="icon-bar"></span>-->
-                            <!--</button>-->
-                        <!--</div>-->
-                        <div class="collapse navbar-collapse" id="top-navbar">
-                            <ul class="nav navbar-nav">
-                                <li><a href="http://apache-ignite-users.70518.x6.nabble.com/" target="_blank" rel="noopener"
-                                       onclick="ga('send', 'event', 'community', 'top_menu_click', 'user_forum');">
-                                    <i class="fa fa-users" aria-hidden="true"></i> User Forum</a>
-                                </li>
-                                <li><a href="http://stackoverflow.com/questions/tagged/ignite" target="_blank" rel="noopener"
-                                       onclick="ga('send', 'event', 'community', 'top_menu_click', 'stack_overflow');">
-                                    <i class="fa fa-stack-overflow" aria-hidden="true"></i> Stack Overflow</i></a>
-                                </li>
-                                <li><a href="/events.html"
-                                       onclick="ga('send', 'event', 'community', 'top_menu_click', 'ignite_events');">
-                                    <i class="fa fa-calendar" aria-hidden="true"></i> Events</a>
-                                </li>
-                                <!--li><a href="/screencasts.html"
-                                       onclick="ga('send', 'event', 'community', 'top_menu_click', 'screencasts');">
-                                    <i class="fa fa-video-camera" aria-hidden="true"></i> Screencasts</a>
-                                </li-->
-                            </ul>
-                        </div>
-                    </div>
-                </nav>
-            </div>
-        </div>
-        <div class="row">
             <div class="col-md-2 col-sm-2 col-xs-6">
-                <div class="logo" style="width:150px;"><a href="/index.html"><img src="/images/ignite_logo_inv.svg" alt="Apache Ignite Logo"></a></div>
+                <div class="logo" style="width:150px;"><a href="/index.html" aria-label="Ignite Homepage"><img src="/images/ignite_logo_inv.svg" alt="Apache Ignite Logo"></a></div>
             </div>
 
             <div class="col-md-10 col-sm-10 col-xs-6">
@@ -70,54 +34,54 @@
                                 </li>
                                 <!--to here...-->
                                 <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown">Features<span class="caret"></span></a>
+                                    <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Features">Features<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Overview</li>
-                                        <li><a href="/whatisignite.html"
+                                        <li role="presentation" class="submenu-header" >Overview</li>
+                                        <li><a href="/whatisignite.html" aria-label="Overview"
                                                onclick="ga('send', 'event', 'whatisignite', 'menu_click', 'whatisignite_page');">
                                             What is Apache Ignite&reg;?</a>
                                         </li>
                                         <li class="divider">
 
-                                        <!-- Ignite main features. -->
+                                            <!-- Ignite main features. -->
                                         <li role="presentation" class="submenu-header">Features</li>
-                                        <li><a href="/arch/memorycentric.html"
+                                        <li><a href="/arch/memorycentric.html" aria-label="Memory Centric Storage"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'memory_centric');">
                                             Memory-Centric Storage</a>
                                         </li>
-                                        <li><a href="/features/sql.html"
+                                        <li><a href="/features/sql.html" aria-label="Features"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_sql');">
                                             Distributed SQL</a>
                                         </li>
-                                        <li><a href="/features/datagrid.html"
+                                        <li><a href="/use-cases/key-value-store.html" aria-label="DataGrid"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'distributed_key_value');">
                                             Distributed Key-Value</a>
                                         </li>
-                                        <!--<li><a href="/arch/persistence.html"-->
-                                               <!--onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">-->
-                                            <!--Distributed Persistence</a>-->
-                                        <!--</li>-->
-                                        <li><a href="/features/transactions.html"
+                                        <li><a href="/arch/persistence.html"
+                                        onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'persistence');">
+                                        Native Persistence</a>
+                                        </li>
+                                        <li><a href="/features/transactions.html" aria-label="Transactions"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'acid_transactions');">
                                             ACID Transactions</a>
                                         </li>
-                                        <li><a href="/features/collocatedprocessing.html"
+                                        <li><a href="/features/collocatedprocessing.html" aria-label="Collocated Processing"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'collocated_processing');">
                                             Collocated Processing</a>
                                         </li>
-                                        <li><a href="/features/machinelearning.html"
+                                        <li><a href="/features/machinelearning.html" aria-label="Machine Learning"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'machine_learning');">
                                             Machine Learning</a>
                                         </li>
-                                        <li><a href="/features/tensorflow.html"
+                                        <li><a href="/features/tensorflow.html" aria-label="Tensor Flow"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'tensorflow');">
                                             TensorFlow Integration</a>
                                         </li>
-                                        <li><a href="/features/multilanguage.html"
+                                        <li><a href="/features/multilanguage.html" aria-label="Multilanguage"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'multi_language');">
                                             Multi-Language</a>
                                         </li>
-                                        <li><a href="/arch/clustering.html"
+                                        <li><a href="/arch/clustering.html" aria-label="Clustering"
                                                onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'clustering');">
                                             Deploy Anywhere</a>
                                         </li>
@@ -125,161 +89,129 @@
 
                                         <li class="divider">
 
-                                        <!-- Ignite tooling. -->
+                                            <!-- Ignite tooling. -->
                                         <li role="presentation" class="submenu-header">Tooling</li>
-                                        <li><a href="/features/datavisualization.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'data_visualization');">
-                                            Data Visualization and Analysis</a>
+                                        <li><a href="/features/manageandmonitor.html" aria-label="Ignite Management & Monitoring"
+                                               onclick="ga('send', 'event', 'apache_ignite_features', 'menu_click', 'ignite_manage_monitor');">
+                                            Management & Monitoring</a>
                                         </li>
-                                   </ul>
+                                    </ul>
                                 </li>
+
                                 <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown">Use Cases<span class="caret"></span></a>
+                                    <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Use Cases">Use Cases<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Proven by</li>
-                                        <li><a href="/provenusecases.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
-                                            Ignite in Production</a>
-                                        </li>
 
-                                        <li class="divider">
-
-                                        <!--Database-->
-                                        <li role="presentation" class="submenu-header">Data Store</li>
-                                        <li><a href="/use-cases/database/distributed-database.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
-                                            Distributed Database</a>
+                                        <li role="presentation" class="submenu-header">Caching & Database</li>
+                                        <li><a href="/use-cases/in-memory-cache.html"
+                                               aria-label="In-Memory Cache"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'in_memory_cache');">
+                                            In-Memory Cache</a>
                                         </li>
-                                        <li><a href="/use-cases/database/in-memory-database.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
-                                            In-Memory Database</a>
-                                        </li>
-                                        <li><a href="/features/datagrid.html"
+                                        <li><a href="/features/datagrid.html" aria-label="In-Memory Data Grid"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'data_grid');">
                                             In-Memory Data Grid</a>
                                         </li>
-                                        <li><a href="/use-cases/database/key-value-store.html"
+                                        <li><a href="/use-cases/in-memory-database.html" aria-label="In-Memory Database"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'distributed-database');">
+                                            In-Memory Database</a>
+                                        </li>
+                                        <li><a href="/use-cases/key-value-store.html" aria-label="Key-Value Store"
                                                onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'key_value_store');">
                                             Key-Value Store</a>
                                         </li>
                                         <li class="divider">
 
-                                            <!--In-Memory Caching-->
-                                        <li role="presentation" class="submenu-header">In-Memory Cache</li>
-                                        <li><a href="/use-cases/caching/database-caching.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'database-caching');">
-                                            Database Caching</a>
+                                        <li role="presentation" class="submenu-header">Data & Compute Hubs</li>
+                                        <li><a href="/use-cases/hpc.html" aria-label="High-Performance Computing"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'massive_parallel_processing');">
+                                            High-Performance Computing</a>
                                         </li>
-                                        <li><a href="/use-cases/caching/jcache-provider.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'jcache-provider');">
-                                            JCache Provider</a>
+                                        <li><a href="/use-cases/dih.html" aria-label="Digital Integration Hub"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'digital_integration_hub');">
+                                            Digital Integration Hub</a>
                                         </li>
-                                        <li><a href="/use-cases/caching/hibernate-l2-cache.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hibernate-l2-cache');">
-                                            Hibernate L2 Cache</a>
-                                        </li>
-                                        <li><a href="/use-cases/caching/web-session-clustering.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'web-session-clustering');">
-                                            Web Session Clustering</a>
-                                        </li>
+
                                         <li class="divider">
 
-                                        <!-- Comparison -->
-                                        <li role="presentation" class="submenu-header">Comparison</li>
-                                        <li><a href="/use-cases/comparison/ignite-for-nosql.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'ignite-for-nosql');">
-                                            Ignite for NoSQL Users</a>
+                                        <li role="presentation" class="submenu-header">Faster Analytics</li>
+                                        <li><a href="/use-cases/spark-acceleration.html"
+                                               aria-label="Apache Spark Acceleration"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'apache_spark_acceleration');">
+                                            Apache Spark Acceleration</a>
                                         </li>
-                                        <li><a href="/use-cases/comparison/ignite-for-rdbms.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'ignite-for-rdbms');">
-                                            Ignite for RDBMS Users</a>
+                                        <li><a href="/use-cases/hadoop-acceleration.html"
+                                               aria-label="Hadoop Acceleration"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'hadoop_acceleration');">
+                                            Apache Hadoop Acceleration</a>
                                         </li>
+
                                         <li class="divider">
 
-                                        <!--Ignite with Spark-->
-                                        <li role="presentation" class="submenu-header">Ignite with Spark</li>
-                                        <li><a href="/use-cases/spark/shared-memory-layer.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'shared-memory-layer');">
-                                            In-Memory Store for Spark</a>
-                                        </li>
-                                        <li><a href="/use-cases/spark/sql-queries.html"
-                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'sql-queries');">
-                                            Faster Sql for Spark</a>
+                                        <li role="presentation" class="submenu-header">Ignite in Production</li>
+                                        <li><a href="/use-cases/provenusecases.html" aria-label="Powered by Ignite"
+                                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'menu_click', 'proven_usecases');">
+                                            Powered by Ignite</a>
                                         </li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown">Docs<span class="caret"></span></a>
+                                    <a class="dropdown-toggle" data-toggle="dropdown" aria-label="Resources">Resources
+                                        <span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Technical Documentation</li>
-                                        <li><a href="http://apacheignite.readme.io/docs" target="_blank" rel="noopener">Ignite <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <!-- <li><a href="http://apacheignite-sql.readme.io/docs" target="_blank" rel="noopener">Ignite SQL<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li> -->
-                                        <li><a href="https://liyuj.gitee.io" target="_blank" rel="noopener">Ignite (Chinese) <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-net.readme.io/docs/" target="_blank" rel="noopener">Ignite.NET <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-cpp.readme.io/" target="_blank" rel="noopener">Ignite.C++ <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/java-thin-client" target="_blank" rel="noopener">Java Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-net.readme.io/docs/thin-client" target="_blank" rel="noopener">.NET Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite-cpp.readme.io/docs/thin-client" target="_blank" rel="noopener">C++ Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/nodejs-thin-client" target="_blank" rel="noopener">Node.js Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/python-thin-client" target="_blank" rel="noopener">Python Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://apacheignite.readme.io/docs/php-thin-client" target="_blank" rel="noopener">PHP Thin Client <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Docs & APIs</li>
+                                        <li><a href="#">APIs</a></li>
+                                        <li><a href="http://apacheignite.readme.io/docs" target="_blank"
+                                               rel="noopener">Technical Docs<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="https://liyuj.gitee.io" target="_blank"
+                                               rel="noopener">Technical Docs (Chinese)<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+
                                         <li class="divider">
-                                        <li role="presentation" class="submenu-header">APIs</li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/javadoc/index.html" target="_blank" rel="noopener">Javadoc <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/dotnetdoc/index.html" target="_blank" rel="noopener">.NET API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/cppdoc/index.html" target="_blank" rel="noopener">C++ API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://ignite.apache.org/releases/latest/scaladoc/scalar/index.html" target="_blank" rel="noopener">Scala API <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://github.com/apache/ignite/tree/master/examples" target="_blank" rel="noopener">Examples <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Learning Ignite</li>
+                                        <li><a href="/blogs.html">Blogs</a></li>
+                                        <li><a href="https://github.com/apache/ignite/tree/master/examples" target="_blank" rel="noopener">
+                                            Examples <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="/screencasts.html">Videos & Presentations</a></li>
+                                        <li><a href="/events.html">Upcoming Events</a></li>
+                                        <li><a href="https://www.pluralsight.com/courses/apache-ignite-getting-started" target="_blank" rel="noopener">
+                                            Getting Started Course<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+
+
                                         <li class="divider">
                                         <li role="presentation" class="submenu-header">Ignite Book</li>
                                         <li><a href="http://a.co/h4MBi1v" target="_blank" rel="noopener">Amazon <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li><a href="https://leanpub.com/ignite" target="_blank" rel="noopener">Leanpub <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li class="divider">
-                                        <li role="presentation" class="submenu-header">Ignite Course</li>
-                                        <li><a href="https://www.pluralsight.com/courses/apache-ignite-getting-started" target="_blank" rel="noopener">Getting Started Course<i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                     </ul>
                                 </li>
                                 <li class="dropdown" style="cursor: pointer;">
                                     <a class="dropdown-toggle" data-toggle="dropdown">Community<span class="caret"></span></a>
                                     <ul class="dropdown-menu" role="menu">
-                                        <li role="presentation" class="submenu-header">Contribute</li>
-                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
-                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
-                                        <li class="divider"></li>
-
-                                        <li role="presentation" class="submenu-header">Resources</li>
-                                        <li><a href="/community/resources.html#ask">Ask a Question</a></li>
-                                        <li><a href="/community/resources.html#mail-lists">Mailing Lists</a></li>
-                                        <!--<li><a href="https://gitter.im/apacheignite/ignite" target="_blank" rel="noopener">Chat-->
-                                            <!--<img src="/images/gitter-small.png" alt="Join the chat at https://gitter.im/apacheignite/ignite" style="padding-left:5px; padding-bottom:3px;"/></a>-->
-                                        <!--</li>-->
-                                        <li><a href="https://twitter.com/ApacheIgnite" target="_blank" rel="noopener">Twitter <i class="fa fa-twitter-square fa-lg" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="/screencasts.html">Screencasts</a></li>
-                                        <li><a href="/blogs.html">Blogs</a></li>
-                                        <li><a href="/community/resources.html#git">Github Repo <i class="fa fa-github fa-lg" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://issues.apache.org/jira/browse/IGNITE" target="_blank" rel="noopener">Ignite Jira <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
-                                        <li><a href="https://cwiki.apache.org/confluence/display/IGNITE/" target="_blank" rel="noopener">Ignite Wiki <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li role="presentation" class="submenu-header">Questions & Issues</li>
+                                        <li><a href="/community/resources.html">Mailing Lists & Forums</a></li>
+                                        <li><a href="https://issues.apache.org/jira/browse/IGNITE" target="_blank" rel="noopener">
+                                            Ignite Jira <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
                                         <li>
                                             <a href="https://cwiki.apache.org/confluence/display/IGNITE/Third+Party+Support+and+Employment" target="_blank" rel="noopener">
-                                            Production Support <i class="fa fa-external-link" style="padding-left:5px;"></i></a>
+                                                Production Support <i class="fa fa-external-link" style="padding-left:5px;"></i></a>
                                         </li>
+                                        <li class="divider"></li>
+
+                                        <li role="presentation" class="submenu-header">Contributions</li>
+                                        <li><a href="/community/contribute.html">Start Contributing</a></li>
+                                        <li><a href="/community/resources.html#people">Committers and PMC</a></li>
+                                        <li><a href="https://cwiki.apache.org/confluence/display/IGNITE/" target="_blank" rel="noopener">
+                                            Ignite Wiki <i class="fa fa-external-link" style="padding-left:5px;"></i></a></li>
+                                        <li><a href="/community/resources.html#git">Github Repo <i class="fa fa-github fa-lg" style="padding-left:5px;"></i></a></li>
+
 
                                         <li class="divider"></li>
-                                        <li role="presentation" class="submenu-header">Events &amp; Groups</li>
-                                        <li><a href="/events.html">Apache Ignite Events</a></li>
-                                        <li><a href="/meetup-groups.html">Community Groups</a></li>
-                                    </ul>
-                                </li>
-                                <li class="dropdown" style="cursor: pointer;">
-                                    <a class="dropdown-toggle" data-toggle="dropdown">Manage<span class="caret"></span></a>
-                                    <ul class="dropdown-menu" role="menu">
-                                        <li><a href="/addons.html#web-console">Ignite Web Console</a></li>
-                                        <li><a href="/addons.html#aiex">Apache Ignite Extensions</a></li>
-                                        <li><a href="/managedservices.html">Managed Services</a></li>
+                                        <li role="presentation" class="submenu-header">Meetups & Events</li>
+                                        <li><a href="/meetup-groups.html">Ignite Meetups</a></li>
+                                        <li><a href="/events.html">Upcoming Events</a></li>
                                     </ul>
                                 </li>
                                 <li>
-									<a class="download-button-dropdown" href="/download.cgi">Download</a>
+                                    <a class="download-button-dropdown" href="/download.cgi">Download</a>
                                 </li>
                             </ul>
                         </div>
diff --git a/test.php b/test.php
deleted file mode 100644
index 61ace19..0000000
--- a/test.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-phpinfo();
diff --git a/use-cases/caching/database-caching.html b/use-cases/caching/database-caching.html
deleted file mode 100644
index 3bb96bb..0000000
--- a/use-cases/caching/database-caching.html
+++ /dev/null
@@ -1,102 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/caching/database-caching.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Database Caching Use Case - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="database-caching" class="page-section">
-            <h1 class="first">Database Caching</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0;">
-                    <p>
-                        Ignite <code>database caching</code> is implemented in the
-                        <nobr><a href="/features/datagrid.html">data grid</a></nobr>
-                        component. It enables users to keep the most frequently accessed data in memory, by either
-                        partitioning or replicating it across a cluster of computers.
-                    </p>
-                    <div class="page-heading">Write-Through & Read-Through</div>
-                    <p>
-                        Whenever an update happens in the in-memory cache, Ignite can optionally propagate it
-                        to the underlying database. Also, whenever the data is requested from cache and is not
-                        there, Ignite can automatically load it from the underlying database. Such behavior
-                        is called <code class="text-nowrap">write-through</code> and
-                        <code class="text-nowrap">read-through</code> correspondingly.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/in_memory_data.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="page-heading">Write-Behind</div>
-            <p>
-                In a simple write-through mode each cache put and remove operation will involve a
-                corresponding request to the persistent storage and therefore the overall duration of
-                the cache update might be relatively long. To mitigate such cases, Ignite offers an
-                option to perform an asynchronous persistent store update also known as
-                <code class="text-nowrap">write-behind</code>.
-            </p>
-            <div class="page-heading">Automatic Persistence</div>
-            <p>
-                Ignite ships with its own database schema mapping wizard which provides automatic support for
-                integrating with persistence stores. This utility automatically connects to the underlying database
-                and generates all the required XML OR-mapping configuration and Java domain model POJOs.
-            </p>
-            <div class="page-heading">In-Memory Data Grid</div>
-            <p>
-                See <a href="/features/datagrid.html" class="text-nowrap" target="_blank" rel="noopener"><b>in-memory data grid</b></a>
-                for more information.
-            </p>
-
-            <p>
-
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/comparison/ignite-for-nosql.html b/use-cases/comparison/ignite-for-nosql.html
deleted file mode 100644
index 04651ab..0000000
--- a/use-cases/comparison/ignite-for-nosql.html
+++ /dev/null
@@ -1,198 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/comparison/ignite-for-nosql.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Apache Ignite and NoSQL</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="sql-queries" class="page-section">
-            <h1 class="first">Ignite for NoSQL Users</h1>
-            <div style="padding:0 0 20px 0;">
-                <p>
-                    Apache Ignite as many other NoSQL databases is horizontally scalable, highly available and
-                    fault-tolerant. Ignite acts as a distributed partitioned hash map making sure that every cluster
-                    node owns a portion of the overall data set. This way the more cluster nodes you add, the more data
-                    you can store in the cluster.
-                </p>
-                <p>
-                    Ignite can either partition or replicate the data. Unlike <code>REPLICATED</code> mode, where data is
-                    fully replicated across all nodes in the cluster, in <code>PARTITIONED</code> mode Ignite will
-                    equally split the data across multiple cluster nodes, allowing for storing TBs of data both in
-                    <i>memory</i> and on <i>disk</i>.
-                </p>
-            </div>
-
-            <section id="comparison-matrix-section" class="page-section" style="border: none">
-                <table class="comparison-matrix" name="comparison-matrix">
-                    <thead>
-                    <tr><th>Feature</th><th>NoSQL</th><th>Ignite</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>Scalability</td>
-                        <td><span class="check-mark">&#x2713;</span> horizontal</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> horizontal</b></td>
-                    </tr>
-                    <tr>
-                        <td>Availability</td>
-                        <td><span class="check-mark">&#x2713;</span> high</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> high</b></td>
-                    </tr>
-                    <tr>
-                        <td>Consistency</td>
-                        <td><span class="cross-mark">&#x2717;</span> eventual</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> strong</b></td>
-                    </tr>
-                    <tr>
-                        <td>In-Memory</td>
-                        <td><span class="cross-mark">&#x2717;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> in-memory store</b></td>
-                    </tr>
-                    <tr>
-                        <td>Persistence</td>
-                        <td><span class="check-mark">&#x2713;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>SQL</td>
-                        <td><span class="cross-mark">&#x2717;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>Key-Value</td>
-                        <td><span class="check-mark">&#x2713;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>Collocated Processing</td>
-                        <td><span class="cross-mark">&#x2717;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <table class="comparison-matrix-mobile" name="comparison-matrix-sm">
-                    <thead>
-                    <tr><th>Scalability</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="check-mark">&#x2713;</span> horizontal</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>horizontal</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Availability</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="check-mark">&#x2713;</span> high</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>high</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Consistency</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="cross-mark">&#x2717;</span> eventual</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>strong</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>In-Memory</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="cross-mark">&#x2717;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>in-memory store</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Persistence</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>SQL</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="cross-mark">&#x2717;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Key-Value</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Collocated-Processing</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">NoSQL</span><span class="right"><span class="cross-mark">&#x2717;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                </table>
-            </section>
-
-            <p>
-                Unlike eventually consistent NoSQL databases, Ignite can operate in a <i>strongly consistent</i> mode,
-                guaranteeing the data consistency across all cluster nodes. In addition, ignte supports
-                <a href="https://apacheignite.readme.io/docs/transactions">ACID transactions</a> that can span
-                multiple keys acrsoss multiple cluster ndoes and partitions.
-            </p>
-
-            <p>
-                The other difference between Ignite and NoSQL databases is that, first, the memory is
-                treated as a fully functional storage, not just as a caching layer, like most databases do. Second,
-                in addition to
-                <a href="/features/datagrid.html">key-value</a> APIs, Ignite supports
-                <a href="/features/sql.html">distributed SQL</a> and
-                <a href="/features/collocatedprocessing.html">collocated processing</a> approach.
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/comparison/ignite-for-rdbms.html b/use-cases/comparison/ignite-for-rdbms.html
deleted file mode 100644
index 8f476ee..0000000
--- a/use-cases/comparison/ignite-for-rdbms.html
+++ /dev/null
@@ -1,201 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/comparison/ignite-for-rdbms.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Ignite for RDBMS Users</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="sql-queries" class="page-section">
-            <h1 class="first">Ignite for RDBMS Users</h1>
-            <div style="padding:0 0 20px 0;">
-                <p>
-                    Apache Ignite does not require you as a skilled RDBMS user to learn new APIs if you want to
-                    start working with an Ignite cluster. All the data processing and SQL schema definition can
-                    be accomplished with a familiar SQL syntax. Ignite complies with SQL ANSI-99 standard supporting all
-                    <b>SQL</b> and <b>DML</b> commands, including SELECT, UPDATE, INSERT, MERGE, DELETE statements and
-                    distributed joins. It also provides support for a subset of <b>DDL</b> commands relevant for
-                    distributed SQL databases.
-                </p>
-                <p>
-                    Ignite can store data and indexes both in memory and on disk which allows executing distributed SQL
-                    queries across different memory layers achieving the performance and scale of in-memory computing
-                    together with the disk durability and strong consistency in one system. If the persistence is disabled,
-                    Ignite can act as a pure <a href="/use-cases/database/in-memory-database.html">
-                    in-memory database</a>.
-                </p>
-            </div>
-
-            <section id="comparison-matrix-section" class="page-section" style="border: none">
-                <table class="comparison-matrix" name="comparison-matrix">
-                    <thead>
-                    <tr><th>Feature</th><th>RDBMS</th><th>Ignite</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td>Scalability</td>
-                        <td><span class="cross-mark">&#x2717;</span> vertical</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> horizontal</b></td>
-                    </tr>
-                    <tr>
-                        <td>Availability</td>
-                        <td><span class="cross-mark">&#x2717;</span> failover only</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> high</b></td>
-                    </tr>
-                    <tr>
-                        <td>Consistency</td>
-                        <td><span class="check-mark">&#x2713;</span> strong</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> strong</b></td>
-                    </tr>
-                    <tr>
-                        <td>In-Memory</td>
-                        <td><span class="check-mark">&#x2713;</span> caching only</td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span> in-memory store</b></td>
-                    </tr>
-                    <tr>
-                        <td>Persistence</td>
-                        <td><span class="check-mark">&#x2713;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>SQL</td>
-                        <td><span class="check-mark">&#x2713;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>Key-Value</td>
-                        <td><span class="cross-mark">&#x2717;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    <tr>
-                        <td>Collocated Processing</td>
-                        <td><span class="cross-mark">&#x2717;</span></td>
-                        <td class="highlight-ignite-comparison"><span class="check-mark">&#x2713;</span></b></td>
-                    </tr>
-                    </tbody>
-                </table>
-
-                <table class="comparison-matrix-mobile" name="comparison-matrix-sm">
-                    <thead>
-                    <tr><th>Scalability</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="cross-mark">&#x2717;</span> vertical</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>horizontal</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Availability</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="cross-mark">&#x2717;</span> failover only</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>high</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Consistency</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="check-mark">&#x2713;</span> strong</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>strong</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>In-Memory</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="check-mark">&#x2713;</span> caching only</span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span> <b>in-memory store</b></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Persistence</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>SQL</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Key-Value</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="cross-mark">&#x2717;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                    <thead>
-                    <tr><th>Collocated-Processing</th></tr>
-                    </thead>
-                    <tbody>
-                    <tr><td><span class="left">RDBMS</span><span class="right"><span class="cross-mark">&#x2717;</span></span></td></tr>
-                    <tr class="ignite"><td><span class="left"><b>Ignite</b></span><span class="right"><span class="check-mark">&#x2713;</span></span></td></tr>
-                    </tbody>
-                </table>
-            </section>
-
-            <p>
-                The main difference between Ignite and traditional relational databases is that, first, the memory is
-                treated as a fully functional storage, not just as a caching layer, like most databases do. Second,
-                Ignite is horizontally scalable, highly available and supports both
-                <a href="/features/datagrid.html">key-value</a> APIs and
-                <a href="/features/collocatedprocessing.html">collocated processing</a> approach.
-            </p>
-
-            <p>
-                Check <a href="/features/sql.html">SQL</a> section for more details or start using
-                Ignite as a SQL database referring to
-                <a href="https://apacheignite-sql.readme.io/docs" target="_blank" rel="noopener">SQL Getting Started Guide</a>.
-                Also, learn how Ignite is used for <a href="/use-cases/caching/database-caching.html">
-                relational databases acceleration</a>.
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/distributed-database-2.html b/use-cases/database/distributed-database-2.html
deleted file mode 100644
index 71a9675..0000000
--- a/use-cases/database/distributed-database-2.html
+++ /dev/null
@@ -1,138 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/distributed-database.html"/>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Distributed Database - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="key-value-store" class="page-section">
-            <h1 class="first">Distributed Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Apache Ignite can be used as all-in-one distributed database that supports SQL, key-value,
-                        compute, machine learning and other data processing APIs.
-                    </p>
-                    <p>
-                        Regardless of the API you decide to use, the data is always stored off-heap in the cluster-aware
-                        page-based storage which tries to evenly distribute the data, guaranteeing that
-                        every cluster node will own a portion of the overall data set.
-                    </p>
-                    <p>
-                        The data and indexes can be stored both in RAM and, optionally, on disk if
-                        <a href="/arch/persistence.html">Ignite Native Persistence</a> is enabled.
-                    </p>
-                    <p>
-                        Ignite native persistent store utilizes disk to allow Ignite users store and process
-                        more data than can fit in memory. It also adds extra resiliency and crash recovery capabilities
-                        and supports full cluster restarts without loosing data. Moreover, when persistence is turned on,
-                        the cluster restarts are almost instantaneous, as Ignite becomes immediately operational from
-                        disk without having to preload all the data in memory.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">SQL</div>
-            <p>
-                Ignite is ANSI-99 compliant, supporting most <b>SQL</b> and <b>DML</b> commands,
-                including SELECT, UPDATE, INSERT, MERGE, DELETE statements and distributed joins. It also provides
-                support for a subset of <b>DDL</b> commands, including CREATE and ALTER commands for tables and indexes.
-                Ignite also supports SQL transactions by enabling Multiversion Concurrency Control (MVCC).
-            </p>
-
-            <div class="page-heading">Key-value</div>
-            <p>
-                Ignite can be used ad a distributed key-value store, supporting all map-like key-value operations, including
-                concurrent CAS operations. It also provides rich support for distributed ACID transactions, continuous
-                queries, collocated processing and more. Ignite key-value store is fully compliant with
-                <a href="/use-cases/caching/jcache-provider.html">JCache (JSR 107)</a> specification.
-            </p>
-            <div class="page-heading">Collocated Processing</div>
-            <p>
-                Most disk-centric databases, like RDBMS or NoSQL, generally utilize the classic client-server
-                approach, where the data is brought from the server to the client where it gets processed
-                and then discarded. This approach does not scale well as moving the data over the
-                network is the most expensive operation in a distributed system.
-            </p>
-            <p>
-                A much more scalable approach is <a href="/features/collocatedprocessing.html">
-                collocated processing</a> that reverses the flow by bringing the computations to the servers where
-                the data actually resides. This approach allows you to execute advanced logic or distributed SQL
-                with JOINs exactly where the data is stored, avoiding expensive serialization and network trips.
-            </p>
-            <div class="page-heading">Partitioning & Replication</div>
-            <p>
-                Depending on the configuration, Ignite can either partition or replicate data.
-                Unlike <code>REPLICATED</code> mode, where data is fully replicated across all nodes
-                in the cluster, in <code>PARTITIONED</code> mode Ignite will equally split the data across
-                multiple cluster nodes, allowing for storing Terabytes of data in memory and on disk.
-            </p>
-            <div class="page-heading">Redundancy</div>
-            <p>
-                Ignite also allows to configure multiple <b>backup copies</b> guaranteeing data resiliency
-                in case of individual node or server failures.
-            </p>
-            <div class="page-heading">Consistency</div>
-            <p>
-                Regardless of which replication scheme is used, Ignite guarantees data consistency across
-                all cluster members.
-            </p>
-            <p>
-                Check <a href="/features/sql.html">SQL</a>,
-                <a href="/features/datagrid.html" class="text-nowrap">Data Grid</a>, and
-                <a href="/features/computegrid.html" class="text-nowrap">Compute Grid</a>
-                features sections for more technical details.
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/distributed-database.html b/use-cases/database/distributed-database.html
deleted file mode 100644
index 147c8cc..0000000
--- a/use-cases/database/distributed-database.html
+++ /dev/null
@@ -1,137 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/distributed-database.html"/>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Distributed Database - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="key-value-store" class="page-section">
-            <h1 class="first">Distributed Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Apache Ignite can be used as all-in-one distributed database that supports SQL, key-value,
-                        compute, machine learning and other data processing APIs.
-                    </p>
-                    <p>
-                        Regardless of the API you decide to use, the data is always stored off-heap in the cluster-aware
-                        page-based storage which tries to evenly distribute the data, guaranteeing that
-                        every cluster node will own a portion of the overall data set.
-                    </p>
-                    <p>
-                        The data and indexes can be stored both in RAM and, optionally, on disk if
-                        <a href="/arch/persistence.html">Ignite Native Persistence</a> is enabled.
-                    </p>
-                    <p>
-                        Ignite native persistent store utilizes disk to allow Ignite users store and process
-                        more data than can fit in memory. It also adds extra resiliency and crash recovery capabilities
-                        and supports full cluster restarts without loosing data. Moreover, when persistence is turned on,
-                        the cluster restarts are almost instantaneous, as Ignite becomes immediately operational from
-                        disk without having to preload all the data in memory.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">SQL</div>
-            <p>
-                Ignite is ANSI-99 compliant, supporting most <b>SQL</b> and <b>DML</b> commands,
-                including SELECT, UPDATE, INSERT, MERGE, DELETE statements and distributed joins. It also provides
-                support for a subset of <b>DDL</b> commands, including CREATE and ALTER commands for tables and indexes.
-            </p>
-
-            <div class="page-heading">Key-value</div>
-            <p>
-                Ignite can be used ad a distributed key-value store, supporting all map-like key-value operations, including
-                concurrent CAS operations. It also provides rich support for distributed ACID transactions, continuous
-                queries, collocated processing and more. Ignite key-value store is fully compliant with
-                <a href="/use-cases/caching/jcache-provider.html">JCache (JSR 107)</a> specification.
-            </p>
-            <div class="page-heading">Collocated Processing</div>
-            <p>
-                Most disk-centric databases, like RDBMS or NoSQL, generally utilize the classic client-server
-                approach, where the data is brought from the server to the client where it gets processed
-                and then discarded. This approach does not scale well as moving the data over the
-                network is the most expensive operation in a distributed system.
-            </p>
-            <p>
-                A much more scalable approach is <a href="/features/collocatedprocessing.html">
-                collocated processing</a> that reverses the flow by bringing the computations to the servers where
-                the data actually resides. This approach allows you to execute advanced logic or distributed SQL
-                with JOINs exactly where the data is stored, avoiding expensive serialization and network trips.
-            </p>
-            <div class="page-heading">Partitioning & Replication</div>
-            <p>
-                Depending on the configuration, Ignite can either partition or replicate data.
-                Unlike <code>REPLICATED</code> mode, where data is fully replicated across all nodes
-                in the cluster, in <code>PARTITIONED</code> mode Ignite will equally split the data across
-                multiple cluster nodes, allowing for storing Terabytes of data in memory and on disk.
-            </p>
-            <div class="page-heading">Redundancy</div>
-            <p>
-                Ignite also allows to configure multiple <b>backup copies</b> guaranteeing data resiliency
-                in case of individual node or server failures.
-            </p>
-            <div class="page-heading">Consistency</div>
-            <p>
-                Regardless of which replication scheme is used, Ignite guarantees data consistency across
-                all cluster members.
-            </p>
-            <p>
-                Check <a href="/features/sql.html">SQL</a>,
-                <a href="/features/datagrid.html" class="text-nowrap">Data Grid</a>, and
-                <a href="/features/computegrid.html" class="text-nowrap">Compute Grid</a>
-                features sections for more technical details.
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/in-memory-database.html b/use-cases/database/in-memory-database.html
deleted file mode 100644
index bfae4a2..0000000
--- a/use-cases/database/in-memory-database.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/in-memory-database.html"/>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>In-Memory Database - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="key-value-store" class="page-section">
-            <h1 class="first">In-Memory Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Ignite can be used as a distributed and horizontally scalable
-                        <code>in-memory database</code> (IMDB) that supports ACID transactions and
-                        can be used with SQL, key-value, compute, machine learning and other data processing APIs.
-                    </p>
-                    <p>
-                        Ignite memory-centric storage allows to store data and indexes both, in memory and on disk.
-                        The disk persistence is optional. When persistence is turned on, Ignite can store more data
-                        than can fit in the available memory, and
-                        will act as a complete <a href="/use-cases/database/distributed-database.html">distributed SQL database</a>.
-                    </p>
-                    <p>
-                        In scenarios when the whole data set and indexes fit in memory, and the persistence is disabled,
-                        Ignite will function as an <code>in-memory database</code> supporting SQL, together with
-                        all the existing APIs for memory-only use cases.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-            <p>
-                One of the distinguishing characteristics of Ignite SQL is the support for
-                <nobr><a href="https://apacheignite-sql.readme.io/docs/distributed-joins" target="_blank" rel="noopener">distributed SQL JOINs</a></nobr>,
-                which works in both, collocated and non-collocated fashions. When collocated, the JOINs are
-                executed on the local data available on each node without having to move large data sets
-                across the network. Such collocated approach provides the best scalability and performance
-                in distributed clusters.
-            </p>
-            <p>
-                You should also check Ignite <a href="/features/sql.html">distributed SQL</a> and
-                <a href="/features/datagrid.html" class="text-nowrap">data grid</a> features.
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/key-value-store.html b/use-cases/database/key-value-store.html
deleted file mode 100644
index f72f86c..0000000
--- a/use-cases/database/key-value-store.html
+++ /dev/null
@@ -1,417 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/key-value-store.html"/>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Key-Value Store - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="key-value-store" class="page-section">
-            <h1 class="first">Key-Value Store</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Ignite can be accessed with simple key-value APIs and, thus, act as a distributed key-value store
-                        (aka. <a href="/features/datagrid.html">data grid</a>). In this scenario, you can think of Ignite as of a distributed partitioned
-                        hash map with every cluster node owning a portion of the overall data set. It's worth mentioning,
-                        that even if you see or use Ignite as a key-value store, you're not limited to the key-value operations
-                        and can always leverage from other available APIs such as SQL, collocated computations, machine
-                        learning, streaming.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md- col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/data_grid.png" width="500px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">JCache APIs</div>
-            <p>
-                Ignite key-value APIs comply with <a href="/use-cases/caching/jcache-provider.html">JCache (JSR 107)</a>
-                specification that supports the following:
-            </p>
-            <ul class="page-list">
-                <li>In-Memory Key Value Store</li>
-                <li>Basic Cache Operations</li>
-                <li>ConcurrentMap APIs</li>
-                <li>Collocated Processing (EntryProcessor)</li>
-                <li>Events and Metrics</li>
-                <li>Pluggable Persistence</li>
-            </ul>
-
-            <div class="page-heading">Extended Key-Value APIs</div>
-            <p>
-                In addition to the standard JCache API, Ignites supports distributed ACID transactions,
-                scan and continuous queries, collocated processing and more.
-            </p>
-
-            <div class="code-examples">
-                <div class="page-heading">Code Examples</div>
-                <!-- Nav tabs -->
-                <ul id="datagrid-examples" class="nav nav-tabs">
-                    <li class="active"><a href="#datagrid-example-basic" role="tab" data-toggle="tab">Put and Get</a></li>
-                    <li><a href="#datagrid-example-transactions" role="tab" data-toggle="tab">Transactions</a></li>
-                    <li><a href="#datagrid-example-locks" role="tab" data-toggle="tab">Locks</a></li>
-                </ul>
-
-                <!-- Tab panes -->
-                <div class="tab-content">
-                    <div role="tabpanel" class="tab-pane active" id="datagrid-example-basic">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final IgniteCache&lt;Integer, String&gt; cache = ignite.cache("cacheName");
-
-                            // Store keys in cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.put(i, Integer.toString(i));
-
-                            // Retrieve values from cache.
-                            for (int i = 0; i < 10; i++)
-                                System.out.println("Got [key=" + i + ", val=" + cache.get(i) + ']');
-
-                            // Remove objects from cache.
-                            for (int i = 0; i < 10; i++)
-                                cache.remove(i);
-
-                            // Atomic put-if-absent.
-                            cache.putIfAbsent(1, "1");
-
-                            // Atomic replace.
-                            cache.replace(1, "1", "2");
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-transactions">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Clone every object we get from cache, so we can freely update it.
-                            IgniteCache&lt;Integer, Account&gt; cache = ignite.cache("cacheName");
-
-                            try (IgniteTx tx = Ignition.ignite().transactions().txStart()) {
-                                Account acct = cache.get(acctId);
-
-                                assert acct != null;
-
-                                // Deposit $20 into account.
-                                acct.setBalance(acct.getBalance() + 20);
-
-                                // Store updated account in cache.
-                                cache.put(acctId, acct);
-
-                                tx.commit();
-                            }
-                        </pre>
-                    </div>
-                    <div role="tabpanel" class="tab-pane" id="datagrid-example-locks">
-                        <pre class="brush:java">
-                            Ignite ignite = Ignition.ignite();
-
-                            // Get an instance of named cache.
-                            final GridCache&lt;String, Integer&gt; cache = ignite.cache("cacheName");
-
-                            // Lock cache key "Hello".
-                            Lock lock = cache.lock("Hello");
-
-                            lock.lock();
-
-                            try {
-                                cache.put("Hello", 11);
-                                cache.put("World", 22);
-                            }
-                            finally {
-                                lock.unlock();
-                            }
-                        </pre>
-                    </div>
-                </div>
-            </div>
-
-            <section id="key-features" class="page-section">
-                <h2>More on Key-Value APIs</h2>
-                <table class="formatted" name="key-value-apis">
-                    <thead>
-                    <tr>
-                        <th width="35%" class="left">Feature</th>
-                        <th>Description</th>
-                    </tr>
-                    </thead>
-                    <tbody>
-                    <tr>
-                        <td class="left">Data Grid</td>
-                        <td>
-                            <p>
-                                Ignite data grid is a <code>key-value store</code> which can store data both, in-memory
-                                and on-disk. It can be viewed as a distributed partitioned hash map, with every cluster
-                                node owning a portion of the overall data. This way the more cluster nodes we add,
-                                the more data we can store:
-                            </p>
-
-                            <div class="page-links">
-                                <a href="/features/datagrid.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Durable Memory</td>
-                        <td>
-                            <p>
-                                Ignite <code>Durable Memory</code> allows storing and processing data and indexes
-                                both, in memory and on disk. The in-memory data, including indexes, is always
-                                stored and managed <code>off-heap</code>, completely removing any type of Garbage
-                                Collection overhead.
-                            </p>
-                            <div class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/durable-memory" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">JCache (JSR 107)</td>
-                        <td>
-                            <p>
-                                Ignite is a 100% compliant implementation of <span style="white-space: nowrap">JCache (JSR 107)</span> specification.
-                                JCache provides a very simple to use, yet very powerful API for data caching:
-                            </p>
-                            <div class="page-links">
-                                <a href="/use-cases/caching/jcache-provider.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Memory-Centric Storage</td>
-                        <td>
-                            <p>
-                                Apache Ignite is based on distributed <i>memory-centric architecture</i> that combines the
-                                performance and scale of in-memory computing together with the disk durability and strong
-                                consistency in one system:
-                            </p>
-                            <div class="page-links">
-                                <a href="/arch/memorycentric.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Collocated Processing</td>
-                        <td>
-                            <p>
-                                Ignite allows executing any native Java, C++, and .NET/C# code directly on the server-side,
-                                close to the data, in collocated fashion:
-                            </p>
-                            <div  class="page-links">
-                                <a href="/features/collocatedprocessing.html" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Client-side Near Caches</td>
-                        <td>
-                            <p>
-                                Near cache is local client-side cache that stores the most recently and most frequently accessed data.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite.readme.io/docs/near-caches" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">ACID Transactions</td>
-                        <td>
-                            <p>
-                                Ignite provides fully ACID compliant distributed transactions that ensure guaranteed consistency.
-                            </p>
-                            <div class="page-links">
-                                <a href="/features/transactions.html">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Deadlock-Free Transactions</td>
-                        <td>
-                            <p>
-                                Ignite supports deadlock-free, optimistic transactions, which do not acquire any locks,
-                                and free users from worrying about the lock order.
-                                Such transactions also provide much better performance:
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/transactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Transactional Entry Processor</td>
-                        <td>
-                            <p>
-                                Ignite transactional entry processor allows executing collocated user logic on the server
-                                side within a transaction:
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/affinity-collocation#ignitecompute-vs-entryprocessor" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Cross-Partition Transactions</td>
-                        <td>
-                            <p>
-                                In Ignite, transactions can be performed on all partitions of a cache across the whole
-                                cluster:
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/transactions#ignitetransactions" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Locks</td>
-                        <td>
-                            <p>
-                                Ignite allows developers to define explicit locks enforcing mutual exclusion on cached objects:
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/distributed-locks" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Continuous Queries</td>
-                        <td>
-                            <p>
-                                Continuous queries are useful for cases when you want to execute a query and then
-                                continue to get notified about the data changes that fall into your query filter:
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/continuous-queries" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left" width="35%">Write-Through</td>
-                        <td>
-                            <p>
-                                Write-Through mode allows updating the data in the database.
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Read-Through</td>
-                        <td>
-                            <p>
-                                Read-Through mode allows reading the data from the database.
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/3rd-party-store#read-through-and-write-through" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Write-Behind Caching</td>
-                        <td>
-                            <p>
-                                Ignite provides an option to asynchronously perform updates to the database via Write-Behind Caching.
-                            </p>
-                            <div  class="page-links">
-                                <a href="https://apacheignite.readme.io/docs/3rd-party-store#section-write-behind-caching" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Hibernate L2 Caching</td>
-                        <td>
-                            <p>
-                                Ignite data grid can be used as <code>Hibernate Second-Level Cache</code> (or L2 cache),
-                                which can significantly speed-up the persistence layer of your application.
-                            </p>
-                            <div class="page-links">
-                                <a href="https://apacheignite-mix.readme.io/docs/hibernate-l2-cache" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Spring Caching</td>
-                        <td>
-                            <p>
-                                Ignite provides Spring-annotation-based way to enable caching for Java methods so that
-                                the result of a method execution is stored in the Ignite cache. If later the same
-                                method is called with the same set of parameters, the result will be retrieved from
-                                the cache instead of actually executing the method.
-                            </p>
-                            <div class="page-links">
-                                <a href="http://apacheignite-mix.readme.io/docs/spring-caching" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">Spring Data</td>
-                        <td>
-                            <p>
-                                Apache Ignite implements Spring Data <code>CrudRepository</code> interface that not only supports basic CRUD operations but also provides access to the Apache Ignite SQL capabilities via the unified Spring Data API.
-                            </p>
-                            <div class="page-links">
-                                <a href="https://apacheignite-mix.readme.io/docs/spring-data" target="docs">Docs for this Feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="left">OSGI Support</td>
-                        <td>
-                            <p></p> &nbsp;
-                            <div  class="page-links">
-                                <a href="https://apacheignite-mix.readme.io/docs/starting-inside-an-osgi-container" target="docs">Docs for this feature <i class="fa fa-angle-double-right"></i></a>
-                            </div>
-                        </td>
-                    </tr>
-                    </tbody>
-                </table>
-            </section>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/sql-database-2.html b/use-cases/database/sql-database-2.html
deleted file mode 100644
index a159259..0000000
--- a/use-cases/database/sql-database-2.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/sql-database.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>SQL Database - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="sql-queries" class="page-section">
-            <h1 class="first">SQL Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0;">
-                    <p>
-                        SQL is still considered to be a mainstream language for non trivial data processing. Nowadays,
-                        the language is no longer a prerogative of relational databases and being supported by
-                        databases and platforms of architectures different from the relational one.
-                    </p>
-                    <p>
-                        Apache Ignite's SQL level of support is so extensive that the platform is widely used as a
-                        full-fledged <b>SQL database</b>. Combining Ignite's SQL capabilities together with its
-                        distributed core you get a horizontally scalable, fault tolerant and always available SQL database.
-                    </p>
-
-                    <div class="page-heading">Performance and Durability</div>
-                    <p>
-                        With Ignite <a href="/arch/durablememory.html">Durable Memory</a>
-                        architecture, data as well as indexes can be stored both in memory and, optionally, on disk.
-                        This allows executing distributed SQL operations across different memory layers
-                        achieving in-memory performance with the durability of disk.
-                        If the <a href="/arch/persistence.html">disk layer</a>
-                        is disabled Apache Ignite can be utilized as an
-                        <a href="/use-cases/database/in-memory-database.html"><b>in-memory</b> database</a>.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">SQL ANSI-99 Compliance</div>
-            <p>
-                Ignite complies with SQL ANSI-99 standard supporting all <b>SQL</b> and <b>DML</b> commands,
-                including SELECT, UPDATE, INSERT, MERGE, DELETE statements and distributed joins. It also provides
-                support for a subset of <b>DDL</b> commands relevant for distributed SQL databases.
-            </p>
-
-            <div class="page-heading">SQL Transactions</div>
-            <p>
-                Ignite supports <a href="https://apacheignite-sql.readme.io/v2.6/docs/multiversion-concurrency-control">SQL transactions</a>
-                by enabling <a href="https://apacheignite.readme.io/v2.6/docs/multiversion-concurrency-control">multiversion concurrency control</a>
-                (MVCC) - a method of controlling consistency of data accessed by multiple users concurrently. MVCC implements the snapshot
-                isolation guarantee which ensures that each transaction always sees a consistent snapshot of data.
-            </p>
-
-            <div class="page-heading">Languages and Tools</div>
-            <p>
-                You can interact with Apache Ignite using the SQL language via natively developed APIs for Java,
-                .NET and C++, or via the Ignite <b>JDBC</b> or <b>ODBC</b> drivers. This provides a true
-                cross-platform connectivity from an endless number of SQL tools and programming languages.
-            </p>
-
-
-            <p>
-                Check <a href="/features/sql.html">SQL</a> section for more details or start using
-                Ignite as a SQL database referring to
-                <a href="https://apacheignite.readme.io/docs/getting-started-sql" target="_blank" rel="noopener">SQL Getting Started Guide</a>
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/database/sql-database.html b/use-cases/database/sql-database.html
deleted file mode 100644
index 21d87f4..0000000
--- a/use-cases/database/sql-database.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/sql-database.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>SQL Database - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-
-    <main id="main" role="main" class="container">
-        <section id="sql-queries" class="page-section">
-            <h1 class="first">SQL Database</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-7 col-xs-12" style="padding-left:0;">
-                    <p>
-                        SQL is still considered to be a mainstream language for non trivial data processing. Nowadays,
-                        the language is no longer a prerogative of relational databases and being supported by
-                        databases and platforms of architectures different from the relational one.
-                    </p>
-                    <p>
-                        Apache Ignite's SQL level of support is so extensive that the platform is widely used as a
-                        full-fledged <b>SQL database</b>. Combining Ignite's SQL capabilities together with its
-                        distributed core you get a horizontally scalable, fault tolerant and always available SQL database.
-                    </p>
-
-                    <div class="page-heading">Performance and Durability</div>
-                    <p>
-                        With Ignite <a href="/arch/durablememory.html">Durable Memory</a>
-                        architecture, data as well as indexes can be stored both in memory and, optionally, on disk.
-                        This allows executing distributed SQL operations across different memory layers
-                        achieving in-memory performance with the durability of disk.
-                        If the <a href="/arch/persistence.html">disk layer</a>
-                        is disabled Apache Ignite can be utilized as an
-                        <a href="/use-cases/database/in-memory-database.html"><b>in-memory</b> database</a>.
-                    </p>
-                </div>
-                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">SQL ANSI-99 Compliance</div>
-            <p>
-                Ignite complies with SQL ANSI-99 standard supporting all <b>SQL</b> and <b>DML</b> commands,
-                including SELECT, UPDATE, INSERT, MERGE, DELETE statements and distributed joins. It also provides
-                support for a subset of <b>DDL</b> commands relevant for distributed SQL databases.
-            </p>
-
-            <div class="page-heading">Languages and Tools</div>
-            <p>
-                You can interact with Apache Ignite using the SQL language via natively developed APIs for Java,
-                .NET and C++, or via the Ignite <b>JDBC</b> or <b>ODBC</b> drivers. This provides a true
-                cross-platform connectivity from an endless number of SQL tools and programming languages.
-            </p>
-
-
-            <p>
-                Check <a href="/features/sql.html">SQL</a> section for more details or start using
-                Ignite as a SQL database referring to
-                <a href="https://apacheignite.readme.io/docs/getting-started-sql" target="_blank" rel="noopener">SQL Getting Started Guide</a>
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/datagrid.html b/use-cases/datagrid.html
new file mode 100644
index 0000000..831dde9
--- /dev/null
+++ b/use-cases/datagrid.html
@@ -0,0 +1,180 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/datagrid.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite as an In-Memory Data Grid accelerates and scales your databases, services, and APIs
+          with support of ANSI SQL, ACID transactions, co-located compute, and machine learning."/>
+
+    <title>In-Memory Data Grid - Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="datagrid" class="page-section">
+            <h1 class="first">In-Memory Data Grid With SQL, ACID Transactions and Compute APIs</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
+                <p>
+                    Apache Ignite provides an extensive set of APIs to act as an in-memory data grid that integrates into
+                    your existing architecture and accelerates databases, services, or custom APIs.
+                </p>
+                <p>
+                    An in-memory data grid type of deployment is also known as a read-through/write-through caching
+                    strategy. With this strategy, Ignite plugs into your existing architecture seamlessly, and the
+                    application layer starts treating it as a primary store. Your application layer writes to and reads
+                    from Ignite, while the latter ensures that any underlying external databases stay updated and
+                    consistent with in-memory data.
+                </p>
+                <p>
+                    As an in-memory data grid, Ignite provides all the essential developer APIs needed to simplify its
+                    adoption. The APIs include distributed key-value and ANSI SQL queries, ACID transactions,
+                    co-located computations, and machine learning models. While key-value and SQL calls let you request,
+                    join, and group distributed data sets, the compute and machine learning components help to eliminate
+                    data shuffling over the network, thus, boosting compute and data-intensive calculations.
+                </p>
+                <p>
+                    Ignite is capable of storing data both in memory and on disk with two options for data persistence
+                    -- you can persist changes in an external database or let Ignite keep data in its native persistence.
+                    Let's review two of them.
+                </p>
+
+                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
+                    <div class="page-heading">Ignite and External Databases</div>
+                    <p>
+                        Ignite as an in-memory data grid can improve performance and scalability of existing external
+                        databases such as RDBMS, NoSQL or Hadoop, by sliding in as an in-memory cache between the application
+                        and database layers. Ignite will automatically write-through or write-behind all the changes to
+                        an external store. It also includes ACID transactions - Ignite coordinates and commits a
+                        transaction across its in-memory cluster as well as a relational database.
+                    </p>
+                    <p>
+                        In addition to that, Ignite can be deployed as a shared and unified in-memory layer that stores
+                        data sets originating from disjointed databases. Your applications can consume all the data from
+                        Ignite as a single store while Ignite can keep the original databases in sync whenever in-memory
+                        data gets updated.
+                    </p>
+                    <p>
+                        However, there are some limitations if an external database is used as a persistence layer for
+                        Ignite deployments. For instance, if you run Ignite SQL or scan queries, you need to ensure
+                        that all the data has already been preloaded to the in-memory cluster. Note that Ignite SQL or
+                        scan queries can read data from disk only if it's stored in Ignite native persistence.
+                    </p>
+                </div>
+
+                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/IMDG.png" width="300px" style="float:right;"/>
+                </div>
+            </div>
+
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
+                <div class="col-sm-8 col-md-8 col-xs-12" style="padding-left:0; padding-right:0">
+                    <div class="page-heading">Ignite Native Persistence</div>
+                    <p>
+                        Ignite native persistence is a distributed ACID and SQL-compliant disk store that transparently
+                        integrates with Ignite in-memory layer. When native persistence is enabled, Ignite stores
+                        both data and indexes on disk.
+                        The native persistence lets eliminate time-consuming data reloading
+                        phase from external databases as well as a cache warm-up step. Furthermore, since the native
+                        persistence always keeps a full copy of data on disk, you are free to cache a subset of
+                        records in memory. If Ignite finds that a record is missing in memory, then it will read it from
+                        disk automatically regardless of the API you use -- let it be SQL, key-value, or scan queries.
+                    </p>
+                </div>
+
+                <div class="col-sm-4 col-md-4 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/native_persistence_key_value.png" width="300px"
+                         style="float:right;"/>
+                </div>
+            </div>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/transactions.html">
+                    <b>ACID Transactions <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/persistence.html">
+                    <b>Native Persistence <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/use-cases/in-memory-database.html">
+                    <b>Ignite as an In-Memory Database <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="TODO">
+                    <b>Ignite as a Digital Integration Hub <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/dih.html b/use-cases/dih.html
new file mode 100644
index 0000000..491a266
--- /dev/null
+++ b/use-cases/dih.html
@@ -0,0 +1,152 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/dih.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite functions as a low-latency and shared store of the digital integration hub architecture
+           that caches and persists data sets scattered across many disjointed back-end databases and systems."/>
+
+    <title>Digital Integration Hub - Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="shared-memory-layer" class="page-section">
+            <h1 class="first">Building Digital Integration Hub With Apache Ignite</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
+                    <p>
+                        A digital integration hub (DIH) is an advanced platform architecture that aggregates
+                        multiple back-end systems and databases into a low-latency and shared data store. Apache
+                        Ignite can function as this high-performance shared store by caching and persisting data sets
+                        dispersed across many disjointed external databases and systems.
+                    </p>
+
+                    <p>
+                        Applications typically access Ignite via an API services layer and get substantial
+                        performance growth by requesting data from this only distributed store that, in its turn,
+                        keeps all the records in memory and offloads the back-end systems.
+                    </p>
+                </div>
+
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/digital-hub.png" width="440px"
+                         style="float:right;"/>
+                </div>
+            </div>
+
+            <p>
+                The primary purpose of Ignite as of a DIH component is to enable implementations of large-scale and
+                high-throughput architectures that prevent the back-end systems from being overwhelmed with excessive
+                workloads and to avoid complex integrations between the back-end databases and front-end API services.
+            </p>
+
+            <div class="page-heading">Synchronization of Apache Ignite and Back-End Systems</div>
+            <p>
+                Ignite, as the high-performance data store, needs to be synchronized with the back-end databases via
+                streaming, event-based, change data capture (CDC), or other techniques.
+            </p>
+
+            <p>
+                Ignite provides a <code>CacheStore</code> interface for one-way synchronization between an Ignite
+                cluster and an external store supporting relational databases and some NoSQL stores out-of-the-box.
+                The interface allows Ignite to write-through or write-behind all the changes to the backend-systems
+                automatically. It also includes transactions - Ignite coordinates and commits a transaction across its
+                in-memory cluster as well as an external transactional database.
+            </p>
+
+            <p>
+                For bi-directional synchronization, you can consider various streaming, CDC, and event-based
+                technologies. For instance, Kafka, Spark, Debezium are widely used to keep Ignite in sync with other
+                databases.
+            </p>
+
+            <div class="page-heading">Real-Time Analytics</div>
+
+            <p>
+                Although real-time analytics is not a defining characteristic of digital integration hub architectures,
+                in some situations, you can end up consolidating operational and analytical data silos in Apache Ignite.
+                If this happens, you can tap into Ignite SQL, compute and machine learning capabilities for real-time
+                analytics needs.
+            </p>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="https://apacheignite-mix.readme.io/docs/overview" target="docs">
+                    <b>Ignite and Streaming Technologies <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="https://apacheignite-fs.readme.io/docs/overview" target="docs">
+                    <b>Ignite and Spark Integration <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="http://localhost/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/memorycentric.html">
+                    <b>Memory-Centric Storage <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/hadoop-acceleration.html b/use-cases/hadoop-acceleration.html
new file mode 100644
index 0000000..e194441
--- /dev/null
+++ b/use-cases/hadoop-acceleration.html
@@ -0,0 +1,182 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<link rel="canonical" href="https://ignite.apache.org/use-cases/hadoop-acceleration.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite enables real-time analytics across operational and historical silos for existing
+          Apache Hadoop deployments. Ignite serves as an in-memory computing platform designated for low-latency and
+          real-time operations while Hadoop continues to be used for long-running OLAP workloads."/>
+
+    <title>Apache Hadoop Performance Acceleration With Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="shared-memory-layer" class="page-section">
+            <h1 class="first">Apache Hadoop Performance Acceleration With Apache Ignite</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
+                    <p>
+                        Apache Ignite enables real-time analytics across operational and historical silos for
+                        existing Apache Hadoop deployments. It does this by serving as an in-memory computing
+                        platform designated for low-latency and high-throughput operations while Hadoop continues to
+                        be used for long-running OLAP workloads.
+                    </p>
+
+                    <p>
+                        As the architecture diagram to the right suggests, you can achieve the performance acceleration
+                        of Hadoop-based systems by deploying Ignite as a separate distributed storage that keeps data
+                        sets needed for your low-latency operations or real-time reports.
+                    </p>
+
+                </div>
+
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/hadoop-acceleration.png" width="440px"
+                         style="float:right;"/>
+                </div>
+            </div>
+
+            <p>
+                Depending on the data volume and available memory capacity, you can enable Ignite native persistence to
+                store historical data sets on disk while dedicating a memory space for operational records. Continue
+                using Hadoop as storage for less frequently used data or for long-running and ad-hoc analytical queries.
+            </p>
+
+            <p>
+                Next, as the architecture suggests, your applications and services should use Ignite native APIs to
+                process the data residing in the in-memory cluster. Ignite provides SQL, compute (aka. map-reduce),
+                and machine learning APIs for various data processing needs.
+            </p>
+
+            <p>
+                Finally, consider using Apache Spark DataFrames APIs if an application needs to run federated or
+                cross-database across Ignite and Hadoop clusters. Ignite is integrated with Spark, which natively
+                supports Hive/Hadoop. Cross-database queries should be considered only for a limited number of
+                scenarios when neither Ignite nor Hadoop contains the entire data set.
+            </p>
+
+            <div class="page-heading">How to split data and operations between Ignite and Hadoop?</div>
+            <p>
+                Consider using this approach:
+            </p>
+            <ul class="page-list">
+                <li>
+                    Use Apache Ignite for tasks that require low-latency response time (microseconds,
+                    milliseconds, seconds), high throughput operations (thousands and millions of
+                    operations per second), and real-time processing.
+                </li>
+                <li>
+                    Continue using Apache Hadoop for high-latency operations (dozens of seconds, minutes, hours) and
+                    batch processing.
+                </li>
+            </ul>
+
+            <div class="page-heading">Getting Started Checklist</div>
+            <p>
+                Follow the steps below to implement the discussed architecture in practice:
+            </p>
+            <ul class="page-list">
+                <li>
+                    Download and install Apache Ignite in your system.
+                </li>
+                <li>
+                    Select a list of operations/reports to be executed against Ignite. The best candidates are
+                    operations for which low-latency response time, high-throughput, and real-time analytics.
+                </li>
+                <li>
+                    Depending on the data volume and available memory space, consider using Ignite native
+                    persistence. Alternatively, you can use Ignite as a pure in-memory cache or in-memory data grid
+                    that persists changes to Hadoop or another external database.
+                </li>
+                <li>
+                    Update your applications to ensure they use Ignite native APIs to process Ignite data and Spark
+                    for federated queries.
+                </li>
+            </ul>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="/arch/memorycentric.html">
+                    <b>Memory-Centric Storage <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/persistence.html">
+                    <b>Native Persistence <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="https://apacheignite-fs.readme.io/docs/installation-deployment" target="docs">
+                    <b>Ignite and Spark Installation and Deployment <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="https://apacheignite-fs.readme.io/docs/ignite-data-frame" target="docs">
+                    <b>Ignite DataFrames in Details <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/hadoop/hdfs-cache.html b/use-cases/hadoop/hdfs-cache.html
deleted file mode 100644
index 8063709..0000000
--- a/use-cases/hadoop/hdfs-cache.html
+++ /dev/null
@@ -1,94 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/hadoop/hdfs-cache.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>HDFS Cache - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="hdfs-cache" class="page-section">
-            <h1 class="first">HDFS Cache Using the In-Memory File System</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0;">
-                    <p>
-                        Ignite File System (IGFS) is a plug-and-play in-memory file system,
-                        compatible with Hadoop Distributed File System (HDFS) and In-Memory Map Reduce.
-                    </p>
-                    <div class="page-heading">Dual Mode</div>
-                    <p>
-                        IGFS supports dual-mode that allows it to work as either a standalone file system in Hadoop cluster,
-                        or work in tandem with HDFS, providing a primary caching layer for the secondary HDFS.
-                        As a caching layer it provides highly configurable <em>read-through</em> and <em>write-through</em> behaviour.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0;">
-                    <img class="img-responsive" src="/images/ignite_filesystem.png" width="440px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="page-heading">Write-Through & Read-Through</div>
-            <p>
-                Ignite In-Memory File System can be configured with a Hadoop native <code>Secondary File System</code>.
-                Such implementation allows for <em>read-through</em> and <em>write-through</em> behavior over any
-                other Hadoop FileSystem implementation (e.g. HDFS).
-            </p>
-            <p>
-                This allows IGFS serve as an in-memory caching layer over disk-based HDFS or any other
-                Hadoop-compliant file system.
-            </p>
-            <p>
-                <a href="https://apacheignite-fs.readme.io/docs/secondary-file-system" target="docs">
-                    <b>Configure HDFS Cache <i class="fa fa-angle-double-right"></i></b>
-                </a>
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/hadoop/mapreduce.html b/use-cases/hadoop/mapreduce.html
deleted file mode 100644
index 8d4c88b..0000000
--- a/use-cases/hadoop/mapreduce.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/hadoop/mapreduce.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>In-Memory MapReduce - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="mapreduce" class="page-section">
-            <h1 class="first">Fast In-Memory MapReduce</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0;">
-                    <p>
-                        Apache Ignite In-Memory MapReduce allows to effectively parallelize the processing of data stored in
-                        any Hadoop file system, including the In-Memory File System provided by Ignite.
-                    </p>
-                    <p>
-                        It eliminates the overhead associated with name-node, job tracker, and task trackers in a
-                        standard Hadoop architecture while providing low-latency distributed processing.
-                    </p>
-
-                    <div class="page-heading">Faster Scheduling</div>
-                    <p>
-                        Ignite MapReduce performs much better than Hadoop due to push-based resource allocation
-                        (vs. pull-based in Hadoop), as well as in-process collocation of computations with data.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0;">
-                    <img class="img-responsive" src="/images/hadoop_sequence-1.png"  style="float:right;"/>
-                </div>
-            </div>
-
-            <div class="page-heading">Data Locality</div>
-            <p>
-                In HDFS, <i>NameNode</i> stores all the metadata and can be a single point of failure. In Ignite, every client
-                can determine which node a key belongs to by plugging it into a hashing function, without a need for any special mapping servers or name nodes.
-            </p>
-
-            <div class="page-heading">Reduced Network Overhead</div>
-            <p>
-                Since <a href="/features/igfs.html">Ignite File System (IGFS)</a> does not need a
-                <i>NameNode</i>, when used with <i>IGFS</i>, Ignite MapReduce jobs go directly to the
-                IGFS data nodes in a single <span style="white-space: nowrap">round-trip</span>.
-            </p>
-
-            <p>
-                <a href="https://apacheignite-fs.readme.io/docs/map-reduce" target="docs">
-                    <b>Configure In-Memory MapReduce <i class="fa fa-angle-double-right"></i></b>
-                </a>
-            </p>
-        </section>
-
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/use-cases/hpc.html b/use-cases/hpc.html
new file mode 100644
index 0000000..7ac6e89
--- /dev/null
+++ b/use-cases/hpc.html
@@ -0,0 +1,149 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/hpc.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite enables high-performance computing by providing APIs for data and
+           compute-intensive calculations. Turn your commodity hardware or cloud environment into a distributed supercomputer."/>
+
+    <title>High-Performance Computing With Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="shared-memory-layer" class="page-section">
+            <h1 class="first">High-Performance Computing With Apache Ignite</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
+                    <p>
+                        High-performance computing (HPC) is the ability to process data and perform complex
+                        calculations at high speeds. Apache Ignite enables HPC by providing APIs for compute- and
+                        data-intensive calculations. The APIs implement the MapReduce paradigm and let you run
+                        arbitrary tasks across the cluster of Ignite nodes.
+                    </p>
+                    <p>
+                        Having Ignite as a high-performance compute cluster, you can turn a group of commodity
+                        machines or a cloud environment into a distributed supercomputer of interconnected Ignite
+                        nodes.
+                    </p>
+                    <p>
+                        Ignite enables speed and scale for HPC scenarios by processing records in memory with the
+                        elimination of data shuffling and network utilization.
+                    </p>
+                </div>
+
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/collocated_processing.png" width="440px"
+                         style="float:right;"/>
+                </div>
+
+            </div>
+
+            <div class="page-heading">Co-located Processing</div>
+            <p>
+                Ignite uses the notion of co-located processing to guide HPC workloads implementations in distributed
+                in-memory environments. The primary aim of this type of processing is to increase the performance of
+                your complex calculations by running them straight on the Ignite cluster nodes. In such a case, the
+                calculations process only local data sets of the cluster nodes, thus, avoiding records shuffling over
+                the network. It results in minimal network utilization, and an order of magnitude performance increase
+                depending on the data volume.
+            </p>
+
+            <p>
+                To exploit the co-located processing in practice, first, you need to co-locate data by storing related
+                records on the same cluster node. Consider your bank account and transactions posted to it as an example
+                of related or co-located data. Once you set <code>accountID</code> as an affinity
+                key for <code>Transactions</code> table, then you'll instruct Ignite to store all the transactions with
+                the same <code>accountId</code> on a single cluster node that keeps the record of your account in
+                <code>Accounts</code> table.
+            </p>
+
+            <p>
+                As soon as data is co-located, Ignite can execute compute- and data-intensive logic on the cluster nodes
+                that store the records required for the calculation. For instance, a payment processing system can send
+                a compute task for previous transactions verification to a specific Ignite node that stores your account
+                record with all completed transactions and finish fraud-detection verifications locally on that machine.
+                Thus, instead of pulling all the transactions back to the application over the network, the processing
+                system eliminates network utilization by running verifications on the nodes that store actual data.
+                The effect is even more significant when the system needs to process millions of transactions per second,
+                verifying billions of previously completed payments.
+            </p>
+
+            <div class="page-heading">Compute APIs</div>
+
+            <p>
+                Ignite provides compute APIs (also known as compute grid in Ignite) for creation and scheduling custom
+                tasks of arbitrary complexity. The APIs implement MapReduce paradigm and presently available for Java,
+                C# and C++ programming languages.
+            </p>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="http://localhost/features/collocatedprocessing.html">
+                    <b>Co-located processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="https://apacheignite.readme.io/docs/compute-grid" target="docs">
+                    <b>Compute APIs <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/memorycentric.html">
+                    <b>Memory-Centric Storage <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/in-memory-cache.html b/use-cases/in-memory-cache.html
new file mode 100644
index 0000000..b65942c
--- /dev/null
+++ b/use-cases/in-memory-cache.html
@@ -0,0 +1,178 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<link rel="canonical" href="https://ignite.apache.org/use-cases/in-memory-cache.html" />
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite as an In-Memory Cache accelerates and scales your databases, services, and APIs
+          with support of ANSI SQL, ACID transactions, co-located compute, and machine learning."/>
+
+    <title>In-Memory Cache - Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="database-caching" class="page-section">
+            <h1 class="first">In-Memory Cache With SQL, ACID Transactions and Compute APIs</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0;">
+                    <p>
+                        Distributed in-memory cache that supports ANSI SQL, ACID transactions, and co-located
+                        computations is one of the usage scenarios Apache Ignite is selected for. From sessions and
+                        APIs caching to databases and microservices acceleration, Ignite provides all essential
+                        components needed to speed things up.
+                    </p>
+                </div>
+                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/in_memory_data.png" width="400px" style="float:right;"/>
+                </div>
+            </div>
+
+            <p>
+                As with classic distributed caches, you would span an Ignite cluster across several interconnected
+                physical or virtual machines letting it utilize all the available memory and CPU resources. However,
+                the difference comes in a way you can use the cluster once it's up and running. In addition to
+                standard key-value APIs, you can run distributed SQL queries joining and grouping various data sets.
+                If strong consistency is required, you can execute multi-records and cross-cache ACID transactions in
+                both pessimistic and optimistic modes. Next, if an application runs compute or data-intensive logic,
+                you can minimize data shuffling with network utilization by running co-located computations and
+                distributed machine learning APIs right on the cluster nodes that store your data.
+            </p>
+
+            <p>
+                There are two primary deployment strategies for Ignite as an in-memory cache -- the cache-aside one and
+                read-through/write-through caching. Let's review two of them.
+            </p>
+
+            <div class="page-heading">Cache-Aside Deployment</div>
+            <p>
+                With the cache-aside deployment strategy, a cache is deployed separately from a primary data store and
+                might not even know that the latter exists. An application or change-data-capture process (CDC) becomes
+                responsible for data synchronization between these two storage locations. For instance, if any record
+                gets updated in the primary store, then its new value needs to be replicated to the cache.
+            </p>
+            <p>
+                This strategy works well when the cached data is rather static and not updated frequently, or
+                temporary data lag/inconsistency is allowed between the two storage locations. It's usually assumed
+                that the cache and the primary store will become consistent eventually as soon as changes are replicated
+                in full.
+            </p>
+            <p>
+                If Apache Ignite is deployed in a cache-aside configuration, then its native persistence can be used as
+                a disk store for Ignite data sets. The native persistence lets eliminate time-consuming data reloading
+                phase from the primary store as well as a cache warm-up step. Furthermore, since the native persistence
+                always keeps a full copy of data on disk, you are free to cache a subset of records in memory. If Ignite
+                finds that a record is missing in memory, then it will read it from disk automatically regardless of the
+                API you use -- let it be SQL, key-value, or scan queries.
+            </p>
+
+            <div class="page-heading">Read-Through/Write-Through Caching</div>
+            <p>
+                The read-through/write-through caching strategy can also be classified as an in-memory data grid type of
+                deployment. When Apache Ignite is deployed as a data grid, the application layer starts treating Ignite
+                as the primary store. The applications write to and read from Ignite while the latter ensures that any
+                underlying external databases stay updated and consistent with the in-memory data.
+            </p>
+
+            <p>
+                This strategy is favorable for architectures that need to accelerate existing disk-based databases or
+                create a shared caching layer across many disconnected data sources. Ignite integrates with many
+                databases out-of-the box and can write-through or write-behind all the changes to them. This also
+                includes ACID transactions - Ignite will coordinate and commit a transaction across its own in-memory
+                cluster as well as to a relational database.
+            </p>
+            <p>
+                The read-through capability implies that a cache can read data from an external database if a record is
+                missing in memory. Ignite fully supports this capability for key-value APIs. However, if Ignite SQL is
+                at use then you have to preload an entire data set in memory first. (Note, that Ignite SQL can query
+                data on disk only if it's located in its native persistence).
+            </p>
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/transactions.html">
+                    <b>ACID Transactions <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/persistence.html">
+                    <b>Native Persistence <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/datagrid.html">
+                    <b>Ignite as an In-Memory Data Grid <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/use-cases/in-memory-database.html">
+                    <b>Ignite as an In-Memory Database <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="TODO">
+                    <b>Ignite as a Digital Integration Hub <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/in-memory-database.html b/use-cases/in-memory-database.html
new file mode 100644
index 0000000..145db9f
--- /dev/null
+++ b/use-cases/in-memory-database.html
@@ -0,0 +1,186 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/in-memory-database.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite, as an In-Memory Database, is a high-performant system-of-records that is capable of
+          storing and querying much larger data sets from disk with no need for memory warm-ups on restarts."/>
+
+    <title>In-Memory Database - Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="key-value-store" class="page-section">
+            <h1 class="first">In-Memory Database With Transactional Persistence</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
+                    <p>
+                        Apache Ignite, as an in-memory database, is a high-performant system-of-records that is capable
+                        of storing and querying much larger data sets from disk with no need for memory warm-ups on
+                        restarts.
+                    </p>
+                    <p>
+                        That's a distributed database that scales horizontally across memory and disk tiers and supports
+                        ACID transactions, ANSI SQL, key-value, compute, machine learning, and other data processing
+                        APIs.
+                    </p>
+                </div>
+                <div class="col-sm-6 col-md-5 col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/sql_database.png" width="400px" style="float:right;"/>
+                </div>
+            </div>
+
+            <div class="page-heading">Memory-Centric Architecture</div>
+            <p>
+                Apache Ignite memory management system is memory-centric in the sense that most of the processing takes
+                place in-memory on cached data with a superset of data persisted to disk. Such an architecture lets
+                combine advantages of in-memory computing with the disk durability and strong consistency in one system.
+            </p>
+            <p>
+                When the native persistence is enabled, Ignite allows you to control how much memory space is to be
+                consumed by Ignite. Depending on the memory space available, Ignite either caches a full data set in
+                memory, thus, performing as fast as it can or keeps only the most frequently data there, pulling
+                missing records from disk. For instance, if there are 100 records and your memory capacity allows to
+                cache only 20 of them, then all 100 will be stored on disk, and only 20 will be cached in memory for
+                better performance.
+            </p>
+
+            <p>
+                Overall, these are the primary advantages of Ignite memory-centric architecture:
+            </p>
+            <ul class="page-list" style="margin-bottom: 20px;">
+                <li>
+                    Flexible configuration of available memory and disk resources as long as Ignite allows storing a
+                    superset of data on disk and only the most frequently used subsets in memory.
+                </li>
+                <li>
+                    Ignite SQL queries and all other APIs can query both cached data sets as well as other data that
+                    is kept on disk only.
+                </li>
+                <li>
+                    Instantaneous cluster restarts. Ignite becomes fully operational from disk immediately upon cluster
+                    startup or restarts. There is no need to preload or warm up the in-memory caches.
+                </li>
+            </ul>
+
+            <div class="page-heading">Better High-Availability With Instantaneous Cluster Restarts</div>
+
+            <p>
+                If you enable Ignite native persistence for your deployments, then there is no need to worry about
+                time-consuming memory warm-ups on cluster restarts. As long as Ignite persistence always keeps a
+                superset of data on disk and treats it as one of the storage layers, Ignite starts reading data from
+                the persistence as soon as the cluster becomes active. The memory tier is warmed up in the background
+                with the data Ignite accesses on disk for you.
+            </p>
+
+            <div class="page-heading">Avoiding Network Impact on Performance With Co-located Processing</div>
+
+            <p>
+                The disk-centric systems, like RDBMS or NoSQL, generally utilize the classic client-server approach,
+                when the data is transferred from the server to the client-side where it gets processed and then usually
+                discarded. This approach does not scale well as moving the data over the network is the most expensive
+                operation in a distributed system.
+            </p>
+            <p>
+                Many distributed databases, including Apache Ignite, support another more scalable approach called
+                co-located processing that eliminates or reduces network traffic significantly by running application
+                logic right on the cluster nodes. This approach executes data or compute-intensive logic, including
+                distributed SQL with JOINs, exactly where the data resides, thus, reducing data shuffling over the network.
+            </p>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="/arch/memorycentric.html">
+                    <b>Memory-Centric Storage <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/persistence.html">
+                    <b>Native Persistence <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/transactions.html">
+                    <b>ACID Transactions <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/datagrid.html">
+                    <b>Ignite as an In-Memory Data Grid <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/use-cases/in-memory-cache.html">
+                    <b>Ignite as an In-Memory Cache <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="TODO">
+                    <b>Ignite as a Digital Integration Hub <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/key-value-store.html b/use-cases/key-value-store.html
new file mode 100644
index 0000000..a12973d
--- /dev/null
+++ b/use-cases/key-value-store.html
@@ -0,0 +1,168 @@
+<!--
+ ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
+▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
+▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
+░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
+ ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
+ ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
+  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
+  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
+      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
+-->
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+"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.
+-->
+
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/database/key-value-store.html"/>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <meta name="description"
+          content="Apache Ignite operates as a distributed key-value store that stores data both in memory and on disk
+          with support of key-value, SQL, ACID transactions, compute and machine learning APIs."/>
+
+    <title>Distributed Key-Value Store - Apache Ignite</title>
+
+    <!--#include virtual="/includes/styles.html" -->
+
+    <!--#include virtual="/includes/sh.html" -->
+</head>
+<body>
+<div id="wrapper">
+    <!--#include virtual="/includes/header.html" -->
+
+    <main id="main" role="main" class="container">
+        <section id="key-value-store" class="page-section">
+            <h1 class="first">Distributed Key-Value Store</h1>
+            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
+                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
+                    <p>
+                        Apache Ignite can operate as a distributed key-value store that stores data both in memory
+                        and on disk. In this deployment mode, you can think of Ignite as of a distributed partitioned
+                        hash map with every cluster node owning a portion of the overall data set. As with
+                        standard key-value stores, you can access the cluster with key-value requests or take
+                        advantage of APIs available exclusively in Ignite - distributed ACID transactions, SQL,
+                        co-located computations, and machine learning.
+                    </p>
+                </div>
+                <div class="col-sm-6 col-md- col-xs-12" style="padding-right:0">
+                    <img class="img-responsive" src="/images/data_grid.png" width="500px" style="float:right;"/>
+                </div>
+            </div>
+
+            <div class="page-heading">JCache and Extended Key-Value APIs</div>
+            <p>
+                Ignite key-value APIs comply with JCache (JSR 107) specification supporting the following:
+            </p>
+
+            <ul class="page-list">
+                <li>Basic Cache Put/Get Operations</li>
+                <li>ConcurrentMap APIs</li>
+                <li>EntryProcessor and CacheInterceptor APIs</li>
+                <li>Events and Metrics</li>
+            </ul>
+
+            <p>
+                In addition to that, Ignite extends JCache specification supporting distributed key-value ACID
+                transactions, scan and continuous queries, co-located computations, and much more. For instance,
+                continuous queries are handy for cases when you want an application to be notified whenever any record
+                gets updated on the server nodes. While ACID transactions let you update a set of records stored in
+                different caches/tables consistently.
+            </p>
+
+            <div class="page-heading">Near Cache</div>
+
+            <p>
+                Near cache is a local client-side cache that stores the most frequently used data on the application end.
+                This caching technique is supported for key-value APIs only and can be considered for applications that
+                require a consistent response time withing a low microseconds range. The near cache is invalidated and
+                updated by Ignite automatically. Whenever a primary copy of a record gets updated on a server node,
+                the change will be propogated to all the nodes that store its backup copy as well as to your applications
+                that keep a record's copy in their near caches.
+            </p>
+
+            <div class="page-heading">Read-through and Write-Through/Behind</div>
+
+            <p>
+                If Ignite is deployed as a key-value store on top of an external database, then it can automatically
+                write-through or write-behind all the changes to that external store for every key-value request
+                issued by your applications. It also includes key-value ACID transactions - Ignite coordinates and
+                commits a transaction across its in-memory cluster as well as a relational database.
+            </p>
+
+            <p>
+                The read-through capability implies that Ignite can read data from an external database if a record is
+                missing in memory. This feature is fully supported for both JCache and extended key-value APIs.
+            </p>
+
+            <div class="page-heading">Ignite Native Persistence</div>
+
+            <p>
+                If you want Ignite to function as a key-value store that caches data in memory and persists it to
+                disk, then, alternatively to an external database, you can enable Ignite native persistence. Ignite
+                persistence lets eliminate time-consuming data reloading phase from external databases as well as a
+                cache warm-up step. Furthermore, since the native persistence always keeps a full copy of data on disk,
+                you are free to cache a subset of records in memory. If Ignite finds that a record is missing in memory,
+                then it will read it from disk automatically
+                regardless of the API you use.
+            </p>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="/arch/memorycentric.html">
+                    <b>Memory-Centric Storage <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/arch/persistence.html">
+                    <b>Native Persistence <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/transactions.html">
+                    <b>ACID Transactions <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/collocatedprocessing.html">
+                    <b>Co-located Processing <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/sql.html">
+                    <b>Distributed SQL <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="/features/machinelearning.html">
+                    <b>Machine and Deep Learning <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+        </section>
+    </main>
+
+    <!--#include virtual="/includes/footer.html" -->
+</div>
+<!--#include virtual="/includes/scripts.html" -->
+</body>
+</html>
diff --git a/use-cases/platforms/dotnet.html b/use-cases/platforms/dotnet.html
deleted file mode 100644
index 83c9a50..0000000
--- a/use-cases/platforms/dotnet.html
+++ /dev/null
@@ -1,105 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/platforms/dotnet.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>.NET Data Grid - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="mapreduce" class="page-section">
-            <h1 class="first">Apache Ignite as .NET Data Grid</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 20px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0;">
-                    <p>
-                        The Ignite In-Memory Data Fabric provides a unified API that spans
-                        JVM-based languages like Java, Scala and Groovy as well as first class support for
-                        Microsoft CLR (.NET/C#) and  C++. It connects them with multiple data stores containing structured,
-                        semi-structured and unstructured data (SQL, NoSQL, Hadoop). It offers a secure, highly available and
-                        manageable data environment that allows to process full ACID transactions and generate
-                        valuable insights from real-time, interactive and batch queries.
-                    </p>
-
-                    <p>
-                        Ignites's In-Memory Data Fabric for .NET is designed to deliver uncompromised
-                        performance for a wide set of in-memory computing use cases on top of .NET platform -
-                        from high performance computing, to the industry most advanced data grid, CEP, and data streaming - all through native, optimized .NET APIs.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0;">
-                    <!--<img class="first img-responsive" src="/images/hadoop_sequence.png"  style="float:right;"/>-->
-                </div>
-            </div>
-
-            <p>
-                One of the key technology behind .NET In-Memory Data Fabric is Portable Object that allows Ignite code access and exchange objects between multiple platforms:
-                <ul class="page-list">
-                    <li>Seamlessly interoperate between Java and .NET.</li>
-                    <li>Make any object portable with zero code change to your existing code.</li>
-                    <li>Nest portable objects within each other.</li>
-                    <li>Automatically handle circular or null references.</li>
-                    <li>Automatically convert collections and maps between Java, .NET, and C++.</li>
-                    <li>Optionally avoid deserialization of objects on the server side.</li>
-                    <li>Avoid need to have concrete class definitions on the server side.</li>
-                    <li>Dynamically change structure of the classes without having to restart the cluster.</li>
-                    <li>Index into portable objects for querying purposes.</li>
-                </ul>
-            </p>
-
-            <!--<p>-->
-                <!--<a href="https://apacheignite.readme.io/docs/map-reduce">-->
-                    <!--<b>Configure In-Memory MapReduce <i class="fa fa-angle-double-right"></i></b>-->
-                <!--</a>-->
-            <!--</p>-->
-        </section>
-
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/provenusecases.html b/use-cases/provenusecases.html
similarity index 99%
rename from provenusecases.html
rename to use-cases/provenusecases.html
index a3f8c51..1aaf991 100644
--- a/provenusecases.html
+++ b/use-cases/provenusecases.html
@@ -33,7 +33,7 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <link rel="canonical" href="https://ignite.apache.org/provenusecases.html" />
+    <link rel="canonical" href="https://ignite.apache.org/use-cases/provenusecases.html" />
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
diff --git a/use-cases/spark/shared-memory-layer.html b/use-cases/spark-acceleration.html
similarity index 65%
rename from use-cases/spark/shared-memory-layer.html
rename to use-cases/spark-acceleration.html
index 4619fbf..6abc316 100644
--- a/use-cases/spark/shared-memory-layer.html
+++ b/use-cases/spark-acceleration.html
@@ -33,10 +33,16 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/spark/shared-memory-layer.html" />
+<link rel="canonical" href="https://ignite.apache.org/use-cases/spark-acceleration.html"/>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Apache Spark Shared Memory Layer - Apache Ignite</title>
+
+    <meta name="description"
+          content="Apache Ignite integrates with Apache Spark to accelerate the performance of Spark applications
+          and APIs by keeping data in a shared in-memory cluster."/>
+
+    <title>Apache Spark Performance Acceleration With Apache Ignite</title>
+
     <!--#include virtual="/includes/styles.html" -->
 
     <!--#include virtual="/includes/sh.html" -->
@@ -47,38 +53,47 @@
 
     <main id="main" role="main" class="container">
         <section id="shared-memory-layer" class="page-section">
-            <h1 class="first">Shared Memory Layer for Apache Spark</h1>
+            <h1 class="first">Apache Spark Performance Acceleration With Apache Ignite</h1>
             <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
                 <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
                     <p>
-                        Apache Ignite is a distributed memory-centric database and caching platform that is
-                        used by Apache Spark users to:
-                        <ul class="page-list" style="margin-bottom: 20px;">
-                            <li>
-                                Achieve true in-memory performance at scale and avoid data movement from a data source
-                                to Spark workers and applications.
-                            </li>
-                            <li>
-                                Boost DataFrame and SQL performance.
-                            </li>
-                            <li>
-                                More easily share state and data among Spark jobs.
-                            </li>
-                        </ul>
+                        Apache Ignite integrates with Apache Spark to accelerate the performance of Spark applications
+                        and APIs by keeping data in a shared in-memory cluster. Spark users can use Ignite as a data
+                        source in a way similar to Hadoop or a relational database. Just start an Ignite cluster, set
+                        it as a data source for Spark workers, and keep using Spark RDDs or DataFrames APIs or gain
+                        even more speed by running Ignite SQL or compute APIs directly.
                     </p>
+
+                    <p>
+                        In addition to the performance acceleration of Spark applications, Ignite is used as a shared
+                        in-memory layer by those Spark workers that need to share both data and state.
+                    </p>
+
                 </div>
 
                 <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
                     <img class="img-responsive" src="/images/spark_integration.png" width="440px" style="float:right;"/>
                 </div>
+
             </div>
 
+            <p>
+                The performance increase is achievable for several reasons. First, Ignite is designed to store data sets
+                in memory across a cluster of nodes reducing latency of Spark operations that usually need to pull date
+                from disk-based systems. Second, Ignite tries to minimize data shuffling over the network between its
+                store and Spark applications by running certain Spark tasks, produced by RDDs or DataFrames APIs,
+                in-place on Ignite nodes. This optimization helps to reduce the effect of the network latency on
+                performance of Spark calls. Finally, the network impact can be minimized even greatly if native
+                Ignite APIs such as SQL are called from Spark applications directly. By doing that, you will completely
+                eliminate data shuffling between Spark and Ignite as long as Ignite SQL queries are always executed on
+                Ignite nodes returning a much smaller final result set to an application layer.
+            </p>
+
             <div class="page-heading">Ignite Shared RDDs</div>
             <p>
                 Apache Ignite provides an implementation of the Spark RDD which allows any data and state to be shared
                 in memory as RDDs across Spark jobs. The Ignite RDD provides a shared, mutable view of the same data
-                in-memory in Ignite across different Spark jobs, workers, or applications. Native Spark RDDs cannot be
-                shared across Spark jobs or applications.
+                in-memory in Ignite across different Spark jobs, workers, or applications.
             </p>
 
             <p>
@@ -88,18 +103,6 @@
                 state may either exist only during the lifespan of a Spark application (embedded mode), or it may
                 out-survive the Spark application (standalone mode).
             </p>
-            <p>
-                While Apache SparkSQL supports a fairly rich SQL syntax, it doesn't implement any indexing. As a result,
-                Spark queries may take minutes even on moderately small data sets because they have to do full data
-                scans. With Ignite, Spark users can configure primary and secondary indexes that can bring up to 1000x
-                performance gains.
-            </p>
-
-            <p>
-                <a href="https://apacheignite-fs.readme.io/docs/ignitecontext-igniterdd" target="docs">
-                    <b>Ignite RDDs in Details <i class="fa fa-angle-double-right"></i></b>
-                </a>
-            </p>
 
             <div class="page-heading">Ignite DataFrames</div>
             <p>
@@ -108,26 +111,32 @@
                 a DataFrame is a distributed collection of data organized into named columns. It is conceptually
                 equivalent to a table in a relational database and allows Spark to leverage the Catalyst query
                 optimizer to produce much more efficient query execution plans in comparison to RDDs, which are
-                just collections of elements partitioned across the nodes of the cluster.
+                collections of elements partitioned across the nodes of the cluster.
             </p>
             <p>
-                Ignite expands DataFrame, simplifying development and improving data access times whenever
-                Ignite is used as memory-centric storage for Spark. Benefits include:
-                <ul class="page-list" style="margin-bottom: 20px;">
-                <li>
-                    Ability to share data and state across Spark jobs by writing and reading DataFrames to/from Ignite.
-                </li>
-                <li>
-                    Faster SparkSQL queries by optimizing Spark query execution plans with Ignite SQL engine which
-                    include​ advanced indexing and avoid data movement across the network from Ignite to Spark.
-                </li>
-                </ul>
+                Ignite supports DataFrame APIs letting Spark to write to and read from Ignite through that interface.
+                Even more, Ignite analyses execution plans produced by Spark's Catalyst engine and can execute
+                parts of the plan on Ignite nodes directly, reducing data shuffling. All that will make your SparkSQL
+                more performant.
+            </p>
+
+            <div class="page-heading">Learn More</div>
+            <p>
+                <a href="https://apacheignite-fs.readme.io/docs/installation-deployment" target="docs">
+                    <b>Ignite and Spark Installation and Deployment <i class="fa fa-angle-double-right"></i></b>
+                </a>
+            </p>
+            <p>
+                <a href="https://apacheignite-fs.readme.io/docs/ignitecontext-igniterdd" target="docs">
+                    <b>Ignite RDDs in Details <i class="fa fa-angle-double-right"></i></b>
+                </a>
             </p>
             <p>
                 <a href="https://apacheignite-fs.readme.io/docs/ignite-data-frame" target="docs">
                     <b>Ignite DataFrames in Details <i class="fa fa-angle-double-right"></i></b>
                 </a>
             </p>
+
         </section>
     </main>
 
diff --git a/use-cases/spark/sql-queries.html b/use-cases/spark/sql-queries.html
deleted file mode 100644
index 135ec7d..0000000
--- a/use-cases/spark/sql-queries.html
+++ /dev/null
@@ -1,95 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/use-cases/spark/sql-queries.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Fast Apache Spark SQL Queries - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="spark-sqlqueries" class="page-section">
-            <h1 class="first">Accelerate Apache Spark SQL Queries</h1>
-            <div class="col-sm-12 col-md-12 col-xs-12" style="padding:0 0 10px 0;">
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-left:0; padding-right:0">
-                    <p>
-                        Running SQL queries using Ignite shared RDDs or DataFrames is much faster than running Spark SQL
-                        via native RDDs or Data Frame implementations.
-                    </p>
-                    <div class="page-heading">In-Memory Indexes</div>
-                    <p>
-                        Spark does not support SQL indexes, resulting in slow SQL queries due to full scans across
-                        the whole data set. Such full-scan queries in spark can take minutes and introduce significant
-                        wait times, especially when running many queries within the same Spark application.
-                    <p>
-                        Apache Ignite, on the other hand, supports SQL with <span style="white-space: nowrap;"><code>in-memory indexing</code>.</span>
-                        Because of advanced in-memory indexing capabilities, IgniteRDD executes SQL
-                        queries 100s of times faster than Spark native RDDs or Data Frames.
-                    </p>
-                </div>
-
-                <div class="col-sm-6 col-md-6 col-xs-12" style="padding-right:0">
-                    <img class="img-responsive" src="/images/spark_integration.png" width="440px" style="float:right;"/>
-                </div>
-            </div>
-            <div class="page-heading">Off-Heap Memory</div>
-            <p>
-                Ignite stores data and indexes in an off-heap memory that allows holding petabytes of data in Ignite
-                and process them from Spark without worrying about JVM garbage collection overhead.
-            </p>
-            <p>
-                <a href="https://apacheignite-fs.readme.io/docs/ignitecontext-igniterdd#section-running-sql-queries-against-ignite-cache" target="docs">
-                    <b>Run SQL Queries against Ignite cluster <i class="fa fa-angle-double-right"></i></b>
-                </a>
-            </p>
-            <p>
-                <a href="https://apacheignite-fs.readme.io/docs/ignite-data-frame" target="docs">
-                    <b>Speeding up DataFrames access with Ignite <i class="fa fa-angle-double-right"></i></b>
-                </a>
-            </p>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/usecases.html b/usecases.html
deleted file mode 100644
index 195cba3..0000000
--- a/usecases.html
+++ /dev/null
@@ -1,147 +0,0 @@
-<!--
- ▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
- ▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
- ▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
-  ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
-  ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-      ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/html">
-<head>
-<link rel="canonical" href="https://ignite.apache.org/usecases.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>Use Cases - Apache Ignite</title>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="use-cases" class="page-section">
-            <h1 class="first">Apache Ignite Use Cases</h1>
-            <p>As a platform, Apache Ignite is used for a variety of use cases some of which are listed below:</p>
-            <div class="col-sm-12 col-md-12 col-xs-12 page-menu">
-                <div class="col-sm-3 col-md-3 col-xs-12">
-                    <h3>Database</h3>
-                    <ul>
-                        <li><a href="/use-cases/database/distributed-database.html" aria-label="Distributed Database"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'distributed-database');">
-                            Distributed Database</a>
-                        </li>
-                        <li><a href="/use-cases/database/in-memory-database.html" aria-label="In-Memory Database"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'distributed-database');">
-                            In-Memory Database</a>
-                        </li>
-                        <!--<li><a href="/use-cases/database/sql-database.html">SQL Database</a></li>-->
-                        <li><a href="/features/datagrid.html" aria-label="In-Memory Data Grid"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'data_grid');">
-                            In-Memory Data Grid</a>
-                        </li>
-                        <li><a href="/use-cases/database/key-value-store.html" aria-label="Key-Value Store"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'key_value_store');">
-                            Key-Value Store</a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 col-md-3 col-xs-12">
-                    <h3>Comparison</h3>
-                    <ul>
-                        <li><a href="/use-cases/comparison/ignite-for-nosql.html" aria-label="Ignite for NoSQL Users"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'ignite-for-nosql');">
-                            Ignite for NoSQL Users</a>
-                        </li>
-                        <li><a href="/use-cases/comparison/ignite-for-rdbms.html" aria-label="Ignite for RDBMS Users"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'ignite-for-rdbms');">
-                            Ignite for RDBMS Users</a>
-                        </li>
-                        <li class="empty"></li>
-                        <li class="empty"></li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 col-md-3 col-xs-12">
-                    <h3>In-Memory Caching</h3>
-                    <ul>
-                        <li><a href="/use-cases/caching/database-caching.html" aria-label="Database Caching"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'database-caching');">
-                            Database Caching</a>
-                        </li>
-                        <li><a href="/use-cases/caching/jcache-provider.html" aria-label="JCache Provider"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'jcache-provider');">
-                            JCache Provider</a>
-                        </li>
-                        <li><a href="/use-cases/caching/hibernate-l2-cache.html" aria-label="Hibernate L2 Cache"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'hibernate-l2-cache');">
-                            Hibernate L2 Cache</a>
-                        </li>
-                        <li><a href="/use-cases/caching/web-session-clustering.html"  aria-label="Web Session Clustering"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'web-session-clustering');">
-                            Web Session Clustering</a>
-                        </li>
-                    </ul>
-                </div>
-                <div class="col-sm-3 col-md-3 col-xs-12">
-                    <h3 class="last">Spark & Hadoop</h3>
-                    <ul class="last">
-                        <li><a href="/use-cases/spark/shared-memory-layer.html" aria-label="Spark Shared RDDs"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'shared-memory-layer');">
-                            Spark Shared RDDs</a>
-                        </li>
-                        <li><a href="/use-cases/spark/sql-queries.html" aria-label="Faster SQL for Spark"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'sql-queries');">
-                            Faster Sql for Spark</a>
-                        </li>
-                        <li><a href="/use-cases/hadoop/hdfs-cache.html" aria-label="IGFS as HDFS Cache"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'hdfs-cache');">
-                            IGFS as HDFS Cache</a>
-                        </li>
-                        <li><a href="/use-cases/hadoop/mapreduce.html" aria-label="Faster MapReduce"
-                               onclick="ga('send', 'event', 'apache_ignite_usecases', 'usecases_page_click', 'mapreduce');">
-                            Faster MapReduce</a>
-                        </li>
-                        <li class="empty"></li>
-                    </ul>
-                </div>
-            </div>
-            <div class="page-links">
-                <a href="features.html" aria-label="Features">Features <i class="fa fa-angle-double-right"></i></a>
-            </div>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>
diff --git a/whatisignite-bk.html b/whatisignite-bk.html
deleted file mode 100644
index 96a6761..0000000
--- a/whatisignite-bk.html
+++ /dev/null
@@ -1,226 +0,0 @@
-<!--
-▄▄▄       ██▓███   ▄▄▄       ▄████▄   ██░ ██ ▓█████     ██▓  ▄████  ███▄    █  ██▓▄▄▄█████▓▓█████
-▒████▄    ▓██░  ██▒▒████▄    ▒██▀ ▀█  ▓██░ ██▒▓█   ▀    ▓██▒ ██▒ ▀█▒ ██ ▀█   █ ▓██▒▓  ██▒ ▓▒▓█   ▀
-▒██  ▀█▄  ▓██░ ██▓▒▒██  ▀█▄  ▒▓█    ▄ ▒██▀▀██░▒███      ▒██▒▒██░▄▄▄░▓██  ▀█ ██▒▒██▒▒ ▓██░ ▒░▒███
-░██▄▄▄▄██ ▒██▄█▓▒ ▒░██▄▄▄▄██ ▒▓▓▄ ▄██▒░▓█ ░██ ▒▓█  ▄    ░██░░▓█  ██▓▓██▒  ▐▌██▒░██░░ ▓██▓ ░ ▒▓█  ▄
-▓█   ▓██▒▒██▒ ░  ░ ▓█   ▓██▒▒ ▓███▀ ░░▓█▒░██▓░▒████▒   ░██░░▒▓███▀▒▒██░   ▓██░░██░  ▒██▒ ░ ░▒████▒
-▒▒   ▓▒█░▒▓▒░ ░  ░ ▒▒   ▓▒█░░ ░▒ ▒  ░ ▒ ░░▒░▒░░ ▒░ ░   ░▓   ░▒   ▒ ░ ▒░   ▒ ▒ ░▓    ▒ ░░   ░░ ▒░ ░
- ▒   ▒▒ ░░▒ ░       ▒   ▒▒ ░  ░  ▒    ▒ ░▒░ ░ ░ ░  ░    ▒ ░  ░   ░ ░ ░░   ░ ▒░ ▒ ░    ░     ░ ░  ░
- ░   ▒   ░░         ░   ▒   ░         ░  ░░ ░   ░       ▒ ░░ ░   ░    ░   ░ ░  ▒ ░  ░         ░
-     ░  ░               ░  ░░ ░       ░  ░  ░   ░  ░    ░        ░          ░  ░              ░  ░
--->
-
-<!--
-Licensed to the Apache Software Foundation (ASF) under one
-or more contributor license agreements.  See the NOTICE file
-distributed with this work for additional information
-regarding copyright ownership.  The ASF licenses this file
-to you under the Apache License, Version 2.0 (the
-"License"); you may not use this file except in compliance
-with the License.  You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing,
-software distributed under the License is distributed on an
-"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-"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.
--->
-
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <link rel="canonical" href="https://ignite.apache.org/whatisignite.html" />
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
-    <meta http-equiv="Pragma" content="no-cache" />
-    <meta http-equiv="Expires" content="0" />
-    <title>What is Apache Ignite</title>
-    <meta name="description" content="Apache Ignite components and facts: in-memory and persistent modes, distributed SQL database, in-memory data grid, in-memory database, ACID transactions, collocated processing, and more..."/>
-    <!--#include virtual="/includes/styles.html" -->
-
-    <!--#include virtual="/includes/sh.html" -->
-</head>
-<body>
-<div id="wrapper">
-    <!--#include virtual="/includes/header.html" -->
-
-    <main id="main" role="main" class="container">
-        <section id="whatisignite" class="page-section" style="border: none;">
-            <h1 class="first heading" style="text-align: center;"><span>Apache Ignite&reg; is ...</span></h1>
-            <div class="col-sm-12 col-md-12 col-xs-12 description-block">
-                <p style="text-align: center;"><i>memory-centric distributed
-                    <strong>database</strong>, <strong>caching</strong>, and <strong>processing</strong> platform for
-                    transactional, analytical, and streaming workloads,<br/>
-                    delivering <nobr>in-memory</nobr> speeds at petabyte scale</i>
-                </p>
-            </div>
-            <div class="col-sm-12 col-md-12 col-xs-12 img-holder">
-                <a href="/images/durable-memory.png"><img class="img-responsive" src="/images/durable-memory.png" alt="Apache Ignite - Durable Memory" width="900px;"/></a>
-            </div>
-        </section>
-
-        <section id="whatisignite-feature-desc" class="page-section" style="border: none;">
-            <div class="col-sm-12 col-md-12 col-xs-12">
-                <h3>Durable Memory</h3>
-                <p>
-                    Ignite's durable memory component treats RAM not just as a caching layer but as a complete fully functional storage layer.
-                    This means that users can turn the persistence on and off as needed. If the persistence is off, then Ignite
-                    can act as a distributed <nobr><i><a href="/use-cases/database/in-memory-database.html" aria-label="In-Memory Database">in-memory database</a></i></nobr>
-                    or <nobr><i><a href="/features/datagrid.html" aria-label="In-Memory Data Grid">in-memory data grid</a></i></nobr>,
-                    depending on whether you prefer to use SQL or key-value APIs. If the persistence is turned on, then Ignite becomes a distributed,
-                    <nobr><i><a href="/features/sql.html" aria-label="SQL">horizontally scalable database</a></i></nobr> that guarantees full data consistency and is
-                    resilient to full cluster failures.
-                </p>
-                <h3>Ignite Persistence</h3>
-                <p>
-                    Ignite <a href="/features/persistence.html" aria-label="Persistence">native persistence</a> is a distributed,
-                    strongly consistent disk store that transparently integrates with Ignite's <i>durable memory</i>.
-                </p>
-                <h3>ACID Compliance</h3>
-                <p>
-                    Data stored in Ignite is ACID-compliant both in memory and on disk, making Ignite a <i><strong>strongly consistent</strong></i> system.
-                    Ignite transactions work across the network and can span multiple servers.
-                </p>
-
-                <h3>Complete SQL Support</h3>
-                <p>
-                    Ignite provides full support for SQL, DDL and DML, allowing users to interact with Ignite using pure SQL without writing any code.
-                    This means that users can create tables and indexes as well as insert, update, and query data using only SQL. Having such complete SQL support makes Ignite a one-of-a-kind
-                    <i><a href="/features/sql.html" aria-label="SQL">distributed SQL database</a></i>.
-                </p>
-
-                <h3>Key-Value</h3>
-                <p>
-                    The in-memory data grid component in Ignite is a fully transactional <i><a href="/use-cases/database/key-value-store.html" aria-label="Key Value Store">distributed key-value store</a></i> that can scale horizontally
-                    across 100s of servers in the cluster. When persistence is enabled, Ignite can also store more data than fits in memory and survive full cluster restarts.
-                </p>
-
-                <h3>Collocated Processing</h3>
-                <p>
-                    Most traditional databases work in a client-server fashion, meaning that data must be brought to the client side for processing. This approach requires
-                    lots of data movement from servers to clients and generally does not scale. Ignite, on the other hand, allows for sending light-weight computations to the data,
-                    i.e. <nobr><i><a href="/features/collocatedprocessing.html" aria-label="Collocated Processing">collocating computations with data</a></i></nobr>. As a result, Ignite scales better and minimizes data movement.
-                </p>
-
-                <h3>Scalability and Durability</h3>
-                <p>
-                    Ignite is an elastic, horizontally scalable distributed system that supports adding and removing cluster nodes on demand. Ignite also allows for
-                    storing multiple copies of the data, making it resilient to partial cluster failures. If the persistence is enabled, then data stored in Ignite
-                    will also survive full cluster failures. Cluster restarts in Ignite can be very fast, as the data becomes operational instantaneously directly from disk.
-                    As a result, the data does not need to be preloaded in-memory to begin processing, and Ignite caches will lazily warm up resuming the in memory performance.
-                </p>
-            </div>
-        </section>
-
-        <section id="ignite-faq" class="page-section">
-            <div class="col-sm-12 col-md-12 col-xs-12" style="margin-top: 20px;">
-                <h2 style="text-align: center; color: #e50000;">Ignite Facts</h2>
-                <hr><br/><br/><br/>
-
-                <h3>Is Ignite a persistent or memory-only storage?</h3>
-                <p>
-                    <strong>Both</strong>. Native persistence in Ignite can be turned on and off. This allows Ignite to store
-                    data sets bigger than can fit in the available memory. Essentially, smaller operational data sets
-                    can be stored in-memory only, and larger data sets that do not fit in memory can be stored on disk,
-                    using memory as a caching layer for better performance.
-
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite an in-memory database (IMDB)?</h3>
-                <p>
-                    <strong>Yes</strong>. Even though Ignite durable memory works well in-memory and on-disk, the disk
-                    persistence can be disabled and Ignite can act as a distributed in-memory database, with
-                    support for SQL and distributed joins.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite an in-memory data grid (IMDG)?</h3>
-                <p>
-                    <strong>Yes</strong>. Ignite is a full-featured distributed key-value data grid, which can be used either in
-                    memory-only mode or with Ignite native persistence. It can also automatically integrate with any 3rd party databases,
-                    including any RDBMS or NoSQL stores.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a distributed cache?</h3>
-                <p>
-                    <strong>Yes</strong>. When native persistence is disabled, Ignite becomes a distributed cache.
-                    Ignite implements JCache specification (JSR 107) and provides
-                    a lot more functionality than required by the specification, including partitioned and replicated
-                    distribution modes, distributed ACID transactions, SQL queries, native persistence, and more.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a distributed database?</h3>
-                <p>
-                    <strong>Yes</strong>. Data in Ignite is either partitioned or replicated across a cluster of
-                    multiple nodes. This provides scalability and adds resiliency to the system. Ignite automatically
-                    controls how data is partitioned, however, users can plugin their own distribution (affinity) functions
-                    and collocate various pieces of data together for efficiency.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite an SQL database?</h3>
-                <p>
-                    <strong>Not fully</strong>. Although Ignite aims to behave like any other relational SQL database,
-                    there are differences in how Ignite handles constraints and indexes. Ignite supports primary and
-                    secondary indexes, however, the uniqueness can only be enforced for the primary indexes.
-                    Ignite also does not support foreign key constraints.
-                </p>
-                <p>
-                    Essentially, Ignite purposely does not support any constraints that would entail a cluster-wide broadcast
-                    message for each update and significantly hurt performance and scalability of the system.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a NoSQL database?</h3>
-                <p>
-                    <strong>Not exactly</strong>. Just like other NoSQL databases, Ignite is highly available and
-                    horizontally scalable. However, unlike other NoSQL databases, Ignite supports SQL and ACID transactions.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a transactional database?</h3>
-                <p>
-                    <strong>Not fully</strong>. ACID Transactions are supported, but only at key-value API level.
-                    Ignite also supports cross-partition transactions, which means that transactions can span keys
-                    residing in different partitions on different servers.
-                </p>
-
-                <p>
-                    At SQL level Ignite supports atomic, but not yet transactional consistency. Ignite community plans
-                    to implement SQL transactions in version 2.5.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a multi-model database?</h3>
-                <p>
-                    <strong>Yes</strong>. Ignite supports both, key-value and SQL for modelling and accessing data.
-                    In addition, Ignite provides strong processing APIs for computing on distributed data.
-                </p>
-                <br/><br/>
-
-                <h3>Is Ignite a key-value store?</h3>
-                <p>
-                    <strong>Yes</strong>. Ignite provides a feature rich key-value API, that is JCache (JSR-107) compliant
-                    and supports Java, C++, <nobr>and .NET.</nobr>
-                </p>
-                <p><a href="https://apacheignite.readme.io/docs/data-grid" aria-label="Data Grid"></a></p><br/><br/>
-
-                <h3>Book</h3>
-                <p>Learn even more from <a href="http://a.co/h4MBi1v" target="_blank" rel="noopener" aria-label="High Performance in-Memory Computing with Apache Ignite">High-Performance in-memory computing with Apache Ignite</a> book.</p>
-            </div>
-        </section>
-    </main>
-
-    <!--#include virtual="/includes/footer.html" -->
-</div>
-<!--#include virtual="/includes/scripts.html" -->
-</body>
-</html>