[incubator-spot] 18/45: Replacing PHP index files with regular HTML due compatibility of extension on ASF

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leahy pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/incubator-spot.git

commit 7bb4a30158479db2c1bad819b5bbf3e755808cea
Author: Cesar <ce...@apache.org>
AuthorDate: Wed Jan 18 01:18:50 2017 -0600

    Replacing PHP index files with regular HTML due compatibility of extension on ASF
---
 .DS_Store                                          | Bin 10244 -> 10244 bytes
 2016/03/index.html                                 | 211 +++++
 2016/03/index.php                                  |  60 --
 2016/08/index.html                                 | 239 ++++++
 2016/08/index.php                                  |  88 ---
 2016/09/index.html                                 | 208 +++++
 2016/09/index.php                                  |  57 --
 2016/10/index.html                                 | 210 +++++
 2016/10/index.php                                  |  60 --
 tag/index.php => 2016/index.html                   |   0
 blog/apache-spot-3-most-asked-questions/index.html | 245 ++++++
 blog/apache-spot-3-most-asked-questions/index.php  |  94 ---
 .../index.html                                     | 250 ++++++
 .../index.php                                      |  98 ---
 .../index.html                                     | 232 ++++++
 .../index.php                                      |  80 --
 blog/{index.php => index.html}                     | 175 ++++-
 .../{index.php => index.html}                      | 176 ++++-
 .../index.html                                     | 221 ++++++
 .../index.php                                      |  69 --
 category/cybersecurity/index.html                  | 210 +++++
 category/cybersecurity/index.php                   |  59 --
 category/data-science/index.html                   | 211 +++++
 category/data-science/index.php                    |  59 --
 .../index.php => category/index.html               |   0
 category/ipython-notebooks/index.html              | 209 +++++
 category/ipython-notebooks/index.php               |  56 --
 category/security-analytics/index.html             | 210 +++++
 category/security-analytics/index.php              |  58 --
 category/threat-analysis-tools/index.html          | 210 +++++
 category/threat-analysis-tools/index.php           |  58 --
 category/uncategorized/index.html                  | 237 ++++++
 category/uncategorized/index.php                   |  85 --
 contribute/index.html                              | 224 ++++++
 contribute/index.php                               |  86 --
 doc/index.html                                     |  16 +-
 index.html                                         | 867 ++++++++++-----------
 index.php                                          | 283 -------
 .../index.php => project-components/index.html     |   0
 project-components/ingestion/index.html            | 205 +++++
 project-components/ingestion/index.php             |  67 --
 project-components/machine-learning/index.html     | 183 +++++
 project-components/machine-learning/index.php      |  47 --
 project-components/open-data-models/index.html     | 188 +++++
 project-components/open-data-models/index.php      |  60 --
 project-components/visualization/index.html        | 204 +++++
 project-components/visualization/index.php         |  79 --
 tag/github/index.html                              | 211 +++++
 tag/github/index.php                               |  57 --
 2016/index.php => tag/index.html                   |   0
 tag/open-network-insight/index.html                | 211 +++++
 tag/open-network-insight/index.php                 |  59 --
 tag/open-source/index.html                         | 211 +++++
 tag/open-source/index.php                          |  59 --
 54 files changed, 5493 insertions(+), 2259 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index e14de31..8dcc55c 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/2016/03/index.html b/2016/03/index.html
new file mode 100755
index 0000000..fb685ff
--- /dev/null
+++ b/2016/03/index.html
@@ -0,0 +1,211 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>March 2016 - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive date">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Month: March 2016</h1>
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-open-network-insight tag-open-source" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+				<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+				
+					<div id="recent-posts-2" class="widget widget_recent_entries">
+						<h4 class="widgettitle">Recent Posts</h4>
+						<ul>
+							<li>
+								<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+							</li>
+							<li>
+								<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+							</li>
+							<li>
+								<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+							</li>
+							<li>
+								<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+							</li>
+							<li>
+								<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+							</li>
+						</ul>
+					</div>
+					<div id="archives-2" class="widget widget_archive">
+						<h4 class="widgettitle">Archives</h4>
+						<ul>
+							<li>
+								<a href='../../2016/10/'>October 2016</a>
+							</li>
+							<li>
+								<a href='../../2016/09/'>September 2016</a>
+							</li>
+							<li>
+								<a href='../../2016/08/'>August 2016</a>
+							</li>
+							<li>
+								<a href='../../2016/03/'>March 2016</a>
+							</li>
+						</ul>
+					</div>
+				
+				</div>
+
+                </div>
+
+            </div>
+            	
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/2016/03/index.php b/2016/03/index.php
deleted file mode 100755
index 943d6c9..0000000
--- a/2016/03/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-
-<?php
-$bodyclass = "archive date";
-$pageTitle = "March 2016 - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Month: March 2016</h1>
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-open-network-insight tag-open-source" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-            	
-			<?php include '../../includes/footer.php'; ?>
-
-
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/2016/08/index.html b/2016/08/index.html
new file mode 100755
index 0000000..32a8afb
--- /dev/null
+++ b/2016/08/index.html
@@ -0,0 +1,239 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>August 2016 - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive date">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Month: August 2016</h1>
+
+                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/" rel="bookmark" title="Apache Spot and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-thre [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/" rel="bookmark" title="How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services&#8230; <a class="excerpt-read-more" href="../../blog/how-apache-spot-helps-create-well-stocke [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/2016/08/index.php b/2016/08/index.php
deleted file mode 100755
index f3fd605..0000000
--- a/2016/08/index.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-
-<?php
-$bodyclass = "archive date";
-$pageTitle = "August 2016 - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Month: August 2016</h1>
-
-                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/" rel="bookmark" title="Apache Spot and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-thre [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/" rel="bookmark" title="How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services&#8230; <a class="excerpt-read-more" href="../../blog/how-apache-spot-helps-create-well-stocke [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/2016/09/index.html b/2016/09/index.html
new file mode 100755
index 0000000..8c55c1e
--- /dev/null
+++ b/2016/09/index.html
@@ -0,0 +1,208 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>September 2016 - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive date">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Month: September 2016</h1>
+
+                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-uncategorized" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
+                                        September 22, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot needs to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read mor [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+                </div>
+
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/2016/09/index.php b/2016/09/index.php
deleted file mode 100755
index 5ec7cb5..0000000
--- a/2016/09/index.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-
-<?php
-$bodyclass = "archive date";
-$pageTitle = "September 2016 - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Month: September 2016</h1>
-
-                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-uncategorized" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
-                                        September 22, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot needs to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read mor [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-                </div>
-
-            </div>
-			
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/2016/10/index.html b/2016/10/index.html
new file mode 100755
index 0000000..d10d2d5
--- /dev/null
+++ b/2016/10/index.html
@@ -0,0 +1,210 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>October 2016 - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive date">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Month: October 2016</h1>
+
+                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/" rel="bookmark" title="Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
+                                        October 21, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    By Rob Kent, Vice President of Marketing at Cybraics Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology&#8230;. <a class="excerpt-read-more" href="../../blog/strength-in-numbers-why-consider-open-source-cy [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/2016/10/index.php b/2016/10/index.php
deleted file mode 100755
index 27ce039..0000000
--- a/2016/10/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-
-<?php
-$bodyclass = "archive date";
-$pageTitle = "October 2016 - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Month: October 2016</h1>
-
-                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/" rel="bookmark" title="Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
-                                        October 21, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    By Rob Kent, Vice President of Marketing at Cybraics Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology&#8230;. <a class="excerpt-read-more" href="../../blog/strength-in-numbers-why-consider-open-source-cy [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-            
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/tag/index.php b/2016/index.html
similarity index 100%
rename from tag/index.php
rename to 2016/index.html
diff --git a/blog/apache-spot-3-most-asked-questions/index.html b/blog/apache-spot-3-most-asked-questions/index.html
new file mode 100755
index 0000000..fd2e424
--- /dev/null
+++ b/blog/apache-spot-3-most-asked-questions/index.html
@@ -0,0 +1,245 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Apache Spot (Incubating): Three Most-Asked Questions - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="single single-post">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-open-network-insight tag-open-source" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
+
+                            <header class="article-header entry-header">
+
+                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Apache Spot (Incubating): Three Most-Asked Questions</h1>
+
+                                <p class="byline entry-meta vcard">
+
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+                            <section class="entry-content cf" itemprop="articleBody">
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that effort, came Apache Spot. Since we started talking about the project, these are the three questions I am asked the most.
+                                </p>
+                                <p>
+                                    <strong>What Is Apache Spot?</strong>
+                                    <br />
+                                    Apache Spot is an open source, flow and packet analytics solution built on Hadoop. It combines big data processing, at-scale machine learning, and unique security analytics to put potential threats in front of defenders. While I am a data scientist today, I was a security investigator just a few years ago. I wanted to develop a solution that would put new tools and technology in play for defenders, but without requiring them to walk away from security  [...]
+                                </p>
+                                <p>
+                                    We wanted to start with the hard problems, so we looked at the emerging need to analyze data that was produced at a scale outside what a lot of security solutions could handle. The data is being created today, and lack of visibility into that data gives attackers a profound advantage. Also, in this new era of security, many defenders (public and private sector) have to answer to their citizens and customers when these threats occur. In other words, an  [...]
+                                    <br />
+                                    <a href="../../library/images/FloCon2015.png" rel="attachment wp-att-66"><img class="aligncenter size-full wp-image-66" src="../../library/images/FloCon2015.png" alt="open source packet and flow analytics" /></a>
+                                </p>
+                                <p>
+                                    The gist is that while processing is a challenge at higher scales, the amount of insight gained is higher when analyzing flows and packets from key protocols (like DNS). And that&#8217;s how we got here.
+                                </p>
+                                <p>
+                                    <strong>Why Intel?</strong>
+                                </p>
+                                <p>
+                                    At Intel, I have worked in IT, for a security product company (McAfee), and in the Data Center Group. Intel IT was an early pioneer of the concept of proactive investigations to protect intellectual property. McAfee (now Intel Security Group) has a broad customer base in the realms of network, endpoint, and content security, to name only a few. And the Intel Data Center group has strategic partnerships with Cloudera and Accenture, as well as some prett [...]
+                                </p>
+                                <p>
+                                    <strong>Why Open Source?</strong>
+                                </p>
+                                <p>
+                                    I learned from my earlier efforts in security analytics, that to invite collaboration from academia, the public sector, and the private sector, open source software is an excellent choice. We are now seeking to build a community of developers, data scientists, and security enthusiasts to grow Apache Spot into something we can all be proud of. We have also chosen an Apache software license, so that it can enrich commercial software offerings as well.
+                                </p>
+                                <p>
+                                    The greatest thing for me since we announced at RSA is to hear OTHER people talk about Apache Spot (formerly Open Network Insight or ONI), here are some of my favorites, from <a href="http://vision.cloudera.com/open-network-insight-changing-infosec-data-science-forever/" target="_blank">a Data Scientist @ eBay </a>, <a href="https://newsroom.accenture.com/news/accenture-introduces-the-accenture-cyber-intelligence-platform-to-help-organizations-continuo [...]
+                                </p>
+                                <p>
+                                    Fork us on Github!
+                                </p>
+                                <p>
+                                    Grant Babb
+                                </p>
+                            </section>
+                            <footer class="article-footer">
+
+                                filed under: <a href="../../category/security-analytics/" rel="category tag">Security Analytics</a>
+                                <p class="tags">
+                                    <span class="tags-title">Tags:</span><a href="../../tag/github/" rel="tag">github</a>, <a href="../../tag/open-network-insight/" rel="tag">open network insight</a>, <a href="../../tag/open-source/" rel="tag">open source</a>
+                                </p>
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/blog/apache-spot-3-most-asked-questions/index.php b/blog/apache-spot-3-most-asked-questions/index.php
deleted file mode 100755
index f09a92e..0000000
--- a/blog/apache-spot-3-most-asked-questions/index.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "single single-post";
-$pageTitle = "Apache Spot (Incubating): Three Most-Asked Questions - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-open-network-insight tag-open-source" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
-
-                            <header class="article-header entry-header">
-
-                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Apache Spot (Incubating): Three Most-Asked Questions</h1>
-
-                                <p class="byline entry-meta vcard">
-
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-                            <section class="entry-content cf" itemprop="articleBody">
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that effort, came Apache Spot. Since we started talking about the project, these are the three questions I am asked the most.
-                                </p>
-                                <p>
-                                    <strong>What Is Apache Spot?</strong>
-                                    <br />
-                                    Apache Spot is an open source, flow and packet analytics solution built on Hadoop. It combines big data processing, at-scale machine learning, and unique security analytics to put potential threats in front of defenders. While I am a data scientist today, I was a security investigator just a few years ago. I wanted to develop a solution that would put new tools and technology in play for defenders, but without requiring them to walk away from security  [...]
-                                </p>
-                                <p>
-                                    We wanted to start with the hard problems, so we looked at the emerging need to analyze data that was produced at a scale outside what a lot of security solutions could handle. The data is being created today, and lack of visibility into that data gives attackers a profound advantage. Also, in this new era of security, many defenders (public and private sector) have to answer to their citizens and customers when these threats occur. In other words, an  [...]
-                                    <br />
-                                    <a href="<?php echo BASE_URL; ?>/library/images/FloCon2015.png" rel="attachment wp-att-66"><img class="aligncenter size-full wp-image-66" src="<?php echo BASE_URL; ?>/library/images/FloCon2015.png" alt="open source packet and flow analytics" /></a>
-                                </p>
-                                <p>
-                                    The gist is that while processing is a challenge at higher scales, the amount of insight gained is higher when analyzing flows and packets from key protocols (like DNS). And that&#8217;s how we got here.
-                                </p>
-                                <p>
-                                    <strong>Why Intel?</strong>
-                                </p>
-                                <p>
-                                    At Intel, I have worked in IT, for a security product company (McAfee), and in the Data Center Group. Intel IT was an early pioneer of the concept of proactive investigations to protect intellectual property. McAfee (now Intel Security Group) has a broad customer base in the realms of network, endpoint, and content security, to name only a few. And the Intel Data Center group has strategic partnerships with Cloudera and Accenture, as well as some prett [...]
-                                </p>
-                                <p>
-                                    <strong>Why Open Source?</strong>
-                                </p>
-                                <p>
-                                    I learned from my earlier efforts in security analytics, that to invite collaboration from academia, the public sector, and the private sector, open source software is an excellent choice. We are now seeking to build a community of developers, data scientists, and security enthusiasts to grow Apache Spot into something we can all be proud of. We have also chosen an Apache software license, so that it can enrich commercial software offerings as well.
-                                </p>
-                                <p>
-                                    The greatest thing for me since we announced at RSA is to hear OTHER people talk about Apache Spot (formerly Open Network Insight or ONI), here are some of my favorites, from <a href="http://vision.cloudera.com/open-network-insight-changing-infosec-data-science-forever/" target="_blank">a Data Scientist @ eBay </a>, <a href="https://newsroom.accenture.com/news/accenture-introduces-the-accenture-cyber-intelligence-platform-to-help-organizations-continuo [...]
-                                </p>
-                                <p>
-                                    Fork us on Github!
-                                </p>
-                                <p>
-                                    Grant Babb
-                                </p>
-                            </section>
-                            <footer class="article-footer">
-
-                                filed under: <a href="../../category/security-analytics/" rel="category tag">Security Analytics</a>
-                                <p class="tags">
-                                    <span class="tags-title">Tags:</span><a href="../../tag/github/" rel="tag">github</a>, <a href="../../tag/open-network-insight/" rel="tag">open network insight</a>, <a href="../../tag/open-source/" rel="tag">open source</a>
-                                </p>
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-            
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.html b/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.html
new file mode 100755
index 0000000..8eafd08
--- /dev/null
+++ b/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.html
@@ -0,0 +1,250 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to Critical Infrastructure - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="single single-post">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
+
+                            <header class="article-header entry-header">
+
+                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</h1>
+
+                                <p class="byline entry-meta vcard">
+
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+                            <section class="entry-content cf" itemprop="articleBody">
+                                <p>
+                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls along with APTs such as Aurora, Zeus, Red October and Stuxnet. What happened with our security controls on each attack?
+                                </p>
+                                <p>
+                                    Despite heroic efforts, internal and external security controls, no matter if they are preventive, detective or corrective, can be bypassed by different situations or misconfigurations. Capabilities to detect bugs or vulnerabilities in code, protocol, etc. are still limited. When we consider how to close these gaps, we have two options:
+                                </p>
+                                <ol>
+                                    <li>
+                                        Collect information from each device that is part of the environment.
+                                    </li>
+                                    <li>
+                                        Collect information from the critical infrastructure that is used for most, if not all, of the systems.
+                                    </li>
+                                </ol>
+                                <p>
+                                    This blog will describe the second approach.
+                                </p>
+                                <p>
+                                    Critical infrastructure, including nationally significant infrastructure, can be broadly defined as the systems, assets, facilities and networks that provide essential services. For nations, this means protecting the national security, economic security and prosperity as well as the health and safety of their citizenry. If we extrapolate this definition on the IT enterprise environments, we can define the critical infrastructure as the service, or serv [...]
+                                </p>
+                                <p>
+                                    Effectively protecting critical infrastructure means that millions, if not billions, of different scenarios must be identified and monitored. To do this, the cybersecurity problem must be broken into small pieces.
+                                </p>
+                                <p>
+                                    Let’s consider DNS — your communications to the Web. How can you know which communications are being established by your critical servers? And, what if you want to do it for most of your infrastructure?
+                                </p>
+                                <p>
+                                    First idea: Use NetFlow, which is a network protocol that helps us collect IP traffic information and monitor network traffic. NetFlow has the details on the communications of all of your network traffic. However, the normal data on an enterprise environment includes billions of NetFlow events per day. To use this data to identify issues, it must be stored and analyzed. Storage alone is costly. Analyzing what amount Big Data stores is an entire other c [...]
+                                </p>
+                                <p>
+                                    Apache Spot offers a solution. It was designed to gather, store and analyze Big Data. In fact, Apache Spot is an ideal solution for this cybersecurity challenge. Apache Spot can integrate many different data sources in a data lake then add operational context to the data by linking configuration, inventory, service databases and other data stores. This helps you to prioritize the actions to take under different attack, malware, APT and hacking scenario [...]
+                                </p>
+                                <p>
+                                    Not only can Apache Spot collect, store and analyze billions of NetFlow packets, but it can also be adapted to meet the unique requirements of your organization. How? Apache Spot is an open-source project.
+                                </p>
+                                <p>
+                                    <strong>But Wait, There’s More</strong>
+                                </p>
+                                <p>
+                                    Check out “<a href="../how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/"><u>How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</u></a>” to learn more about the underlying Apache Spot architecture.
+                                </p>
+                                <p>
+                                    This is the first of a series of blogs that we will be writing about cybersecurity, so check back to read more.
+                                </p>
+                            </section>
+                            <footer class="article-footer">
+
+                                filed under: <a href="../../category/cybersecurity/" rel="category tag">Cybersecurity</a>
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+            
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.php b/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.php
deleted file mode 100755
index d32442d..0000000
--- a/blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/index.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "single single-post";
-$pageTitle = "Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to Critical Infrastructure - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
-
-                            <header class="article-header entry-header">
-
-                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</h1>
-
-                                <p class="byline entry-meta vcard">
-
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-                            <section class="entry-content cf" itemprop="articleBody">
-                                <p>
-                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls along with APTs such as Aurora, Zeus, Red October and Stuxnet. What happened with our security controls on each attack?
-                                </p>
-                                <p>
-                                    Despite heroic efforts, internal and external security controls, no matter if they are preventive, detective or corrective, can be bypassed by different situations or misconfigurations. Capabilities to detect bugs or vulnerabilities in code, protocol, etc. are still limited. When we consider how to close these gaps, we have two options:
-                                </p>
-                                <ol>
-                                    <li>
-                                        Collect information from each device that is part of the environment.
-                                    </li>
-                                    <li>
-                                        Collect information from the critical infrastructure that is used for most, if not all, of the systems.
-                                    </li>
-                                </ol>
-                                <p>
-                                    This blog will describe the second approach.
-                                </p>
-                                <p>
-                                    Critical infrastructure, including nationally significant infrastructure, can be broadly defined as the systems, assets, facilities and networks that provide essential services. For nations, this means protecting the national security, economic security and prosperity as well as the health and safety of their citizenry. If we extrapolate this definition on the IT enterprise environments, we can define the critical infrastructure as the service, or serv [...]
-                                </p>
-                                <p>
-                                    Effectively protecting critical infrastructure means that millions, if not billions, of different scenarios must be identified and monitored. To do this, the cybersecurity problem must be broken into small pieces.
-                                </p>
-                                <p>
-                                    Let’s consider DNS — your communications to the Web. How can you know which communications are being established by your critical servers? And, what if you want to do it for most of your infrastructure?
-                                </p>
-                                <p>
-                                    First idea: Use NetFlow, which is a network protocol that helps us collect IP traffic information and monitor network traffic. NetFlow has the details on the communications of all of your network traffic. However, the normal data on an enterprise environment includes billions of NetFlow events per day. To use this data to identify issues, it must be stored and analyzed. Storage alone is costly. Analyzing what amount Big Data stores is an entire other c [...]
-                                </p>
-                                <p>
-                                    Apache Spot offers a solution. It was designed to gather, store and analyze Big Data. In fact, Apache Spot is an ideal solution for this cybersecurity challenge. Apache Spot can integrate many different data sources in a data lake then add operational context to the data by linking configuration, inventory, service databases and other data stores. This helps you to prioritize the actions to take under different attack, malware, APT and hacking scenario [...]
-                                </p>
-                                <p>
-                                    Not only can Apache Spot collect, store and analyze billions of NetFlow packets, but it can also be adapted to meet the unique requirements of your organization. How? Apache Spot is an open-source project.
-                                </p>
-                                <p>
-                                    <strong>But Wait, There’s More</strong>
-                                </p>
-                                <p>
-                                    Check out “<a href="../how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/"><u>How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</u></a>” to learn more about the underlying Apache Spot architecture.
-                                </p>
-                                <p>
-                                    This is the first of a series of blogs that we will be writing about cybersecurity, so check back to read more.
-                                </p>
-                            </section>
-                            <footer class="article-footer">
-
-                                filed under: <a href="../../category/cybersecurity/" rel="category tag">Cybersecurity</a>
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-            
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.html b/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.html
new file mode 100755
index 0000000..79a8523
--- /dev/null
+++ b/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.html
@@ -0,0 +1,232 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="single single-post">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
+
+                            <header class="article-header entry-header">
+
+                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</h1>
+
+                                <p class="byline entry-meta vcard">
+
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+                            <section class="entry-content cf" itemprop="articleBody">
+                                <p>
+                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services company can more accurately determine what other products to offer a customer, and in what or [...]
+                                </p>
+                                <p>
+                                    Apache Spot can help to solve most of these issues. Following is a description of the Apache Spot, which is designed to facilitate Big Data analytics scenarios like the financial services company’s question about the right product to offer customers.
+                                </p>
+                                <a href="../../library/images/ONI_Architecture-Diagram_1300_v4.png"><img src="../../library/images/ONI_Architecture-Diagram_1300_v4.png" alt="oni_architecture-diagram_1300_v4" /></a>
+                                <h3><strong>Apache Spot Core Components</strong></h3>
+                                <p>
+                                    The Apache Spot Core is composed of three main components — data integration (collectors), data store (HDFS here, but can also be a non-SQL database) and machine learning.
+                                </p>
+                                <p>
+                                    In this diagram, the top left shows Apache Spot Data Sources, which include the collection of the information that will be used to create a data lake. The process is simple. Define a pull or push from the source of information then capture this information on Apache Spot’s “collectors.” The collectors are processes that interpret the information that is sent, then write it to the HDFS system in the Apache Spot cluster. The HDFS stores the data lake and [...]
+                                </p>
+                                <h3><strong>Operational Analytics</strong></h3>
+                                <p>
+                                    As part of operational analytics, Apache Spot executes different batch processes that add information to machine learning results to provide meaning and context. Using the financial services product example, basic customer data could be augmented with information about other customers in the same region along with information about which products those customers recommended or complained about. Basically, the data scientists can “play” with the data us [...]
+                                </p>
+                                <h3><strong>Visualizing Results</strong></h3>
+                                <p>
+                                    The Apache Spot GUI displays the results that the machine learning algorithms generate. Results are represented such that it is easy to identify both the most common things as well as find the most suspicious or uncommon information that is part of the data lake.
+                                </p>
+                                <h3><strong>Customizable Open Source</strong></h3>
+                                <p>
+                                    Because Apache Spot is an open-source project, most of the components depicted here can be modified by the end user.
+                                </p>
+                            </section>
+                            <footer class="article-footer">
+
+                                filed under: <a href="../../category/uncategorized/" rel="category tag">Uncategorized</a>
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.php b/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.php
deleted file mode 100755
index 571915c..0000000
--- a/blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/index.php
+++ /dev/null
@@ -1,80 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "single single-post";
-$pageTitle = "How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
-
-                            <header class="article-header entry-header">
-
-                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</h1>
-
-                                <p class="byline entry-meta vcard">
-
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-                            <section class="entry-content cf" itemprop="articleBody">
-                                <p>
-                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services company can more accurately determine what other products to offer a customer, and in what or [...]
-                                </p>
-                                <p>
-                                    Apache Spot can help to solve most of these issues. Following is a description of the Apache Spot, which is designed to facilitate Big Data analytics scenarios like the financial services company’s question about the right product to offer customers.
-                                </p>
-                                <a href="<?php echo BASE_URL; ?>/library/images/ONI_Architecture-Diagram_1300_v4.png"><img src="<?php echo BASE_URL; ?>/library/images/ONI_Architecture-Diagram_1300_v4.png" alt="oni_architecture-diagram_1300_v4" /></a>
-                                <h3><strong>Apache Spot Core Components</strong></h3>
-                                <p>
-                                    The Apache Spot Core is composed of three main components — data integration (collectors), data store (HDFS here, but can also be a non-SQL database) and machine learning.
-                                </p>
-                                <p>
-                                    In this diagram, the top left shows Apache Spot Data Sources, which include the collection of the information that will be used to create a data lake. The process is simple. Define a pull or push from the source of information then capture this information on Apache Spot’s “collectors.” The collectors are processes that interpret the information that is sent, then write it to the HDFS system in the Apache Spot cluster. The HDFS stores the data lake and [...]
-                                </p>
-                                <h3><strong>Operational Analytics</strong></h3>
-                                <p>
-                                    As part of operational analytics, Apache Spot executes different batch processes that add information to machine learning results to provide meaning and context. Using the financial services product example, basic customer data could be augmented with information about other customers in the same region along with information about which products those customers recommended or complained about. Basically, the data scientists can “play” with the data us [...]
-                                </p>
-                                <h3><strong>Visualizing Results</strong></h3>
-                                <p>
-                                    The Apache Spot GUI displays the results that the machine learning algorithms generate. Results are represented such that it is easy to identify both the most common things as well as find the most suspicious or uncommon information that is part of the data lake.
-                                </p>
-                                <h3><strong>Customizable Open Source</strong></h3>
-                                <p>
-                                    Because Apache Spot is an open-source project, most of the components depicted here can be modified by the end user.
-                                </p>
-                            </section>
-                            <footer class="article-footer">
-
-                                filed under: <a href="../../category/uncategorized/" rel="category tag">Uncategorized</a>
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/blog/index.php b/blog/index.html
similarity index 54%
rename from blog/index.php
rename to blog/index.html
index 4537ac3..b875c52 100755
--- a/blog/index.php
+++ b/blog/index.html
@@ -1,11 +1,109 @@
-<?php include '../includes/config.php'; ?>
-<?php
-$bodyclass = "blog";
-$pageTitle = "Apache Spot Blog";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../includes/header.php'; ?>
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Apache Spot Blog</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="blog">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="http://spot.incubator.apache.org/doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
 
             <div id="content">
 
@@ -139,15 +237,68 @@ $currentPage = 'blog';
 
                     </main>
 
-				<?php include '../includes/sidebar.php'; ?>
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
 
                 </div>
 
             </div>
-            
-			<?php include '../includes/footer.php'; ?>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../library/js/scripts.js'></script>
 
     </body>
 
 </html>
-<!-- end of site. what a ride! -->
diff --git a/blog/jupyter-notebooks-for-data-analysis/index.php b/blog/jupyter-notebooks-for-data-analysis/index.html
similarity index 55%
rename from blog/jupyter-notebooks-for-data-analysis/index.php
rename to blog/jupyter-notebooks-for-data-analysis/index.html
index 1931779..d750307 100755
--- a/blog/jupyter-notebooks-for-data-analysis/index.php
+++ b/blog/jupyter-notebooks-for-data-analysis/index.html
@@ -1,11 +1,109 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "single single-post";
-$pageTitle = "Jupyter Notebooks for Data Analysis - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Jupyter Notebooks for Data Analysis - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="single single-post">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
 
             <div id="content">
 
@@ -41,7 +139,7 @@ $currentPage = 'blog';
                                 <p>
                                     Starting on version 4.0, most notebook functionalities are now part of the Project Jupyter, while iPython remains as the kernel to work with Python code in the notebooks.
                                 </p>
-                                <img src="<?php echo BASE_URL;?>/library/images/iPython-1.png" alt="ipython" class="aligncenter size-full wp-image-140" />
+                                <img src="../../library/images/iPython-1.png" alt="ipython" class="aligncenter size-full wp-image-140" />
                                 <p>
                                     <strong>IPython with Apache Spot for Network Threat Detection</strong>
                                 </p>
@@ -114,15 +212,69 @@ $currentPage = 'blog';
 
                     </main>
 
-					<?php include '../../includes/sidebar.php'; ?>
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
 
                 </div>
 
             </div>
 
-			<?php include '../../includes/footer.php'; ?>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
 
     </body>
 
 </html>
-<!-- end of site. what a ride! -->
diff --git a/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.html b/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.html
new file mode 100755
index 0000000..7aef5e4
--- /dev/null
+++ b/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.html
@@ -0,0 +1,221 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Strength in Numbers: Why Consider Open Source Cybersecurity Analytics - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="single single-post">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
+
+                            <header class="article-header entry-header">
+
+                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</h1>
+
+                                <p class="byline entry-meta vcard">
+
+                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
+                                        October 21, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+                            <section class="entry-content cf" itemprop="articleBody">
+                                <p>
+                                    By Rob Kent, Vice President of Marketing at Cybraics
+                                </p>
+                                <p>
+                                    Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology. The problem is, with so much competition, are we losing sight of the real goal: protecting our customers against the adversary? With so much focus on com [...]
+                                </p>
+                                <p>
+                                    This, of course, is not new information. People have been pointing this out for years. What is encouraging is that a few organizations are finally stepping up to the plate to try and change this paradigm in cybersecurity.  When it comes to cybersecurity, many have touted big data analytics as one of the key initiatives to combat adversaries. The problem is that big data in itself has its own set of challenges, one of the issues is that it is often look [...]
+                                </p>
+                                <p>
+                                    By creating an open source community, the hope is that identifying security threats within large data sets will become a manageable task for all organizations, despite their size or scale. Organizations overwhelmed with their data or those that aren’t seeing results will have a community to turn to along with a common reference to compare results. By working together on Apache Spot, organizations will be able to share their experiences on how they’ve t [...]
+                                </p>
+                                <p>
+                                    By supporting Apache Spot, Cybraics is hoping to learn as much as we contribute while we collaborate and take part in this Open Source Initiative. With the end result a set of guidelines for organizations to deploy a data analytics platform to find threats within their ecosystem, and a community that will share their experiences with the next generation of data and security professionals, perhaps we can all start actually working together to start leve [...]
+                                </p>
+                            </section>
+                            <footer class="article-footer">
+
+                                filed under: <a href="../../category/uncategorized/" rel="category tag">Uncategorized</a>
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.php b/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.php
deleted file mode 100755
index c86b518..0000000
--- a/blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/index.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "single single-post";
-$pageTitle = "Strength in Numbers: Why Consider Open Source Cybersecurity Analytics - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article" itemscope itemprop="blogPost" itemtype="http://schema.org/BlogPosting">
-
-                            <header class="article-header entry-header">
-
-                                <h1 class="entry-title single-title" itemprop="headline" rel="bookmark">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</h1>
-
-                                <p class="byline entry-meta vcard">
-
-                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
-                                        October 21, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-                            <section class="entry-content cf" itemprop="articleBody">
-                                <p>
-                                    By Rob Kent, Vice President of Marketing at Cybraics
-                                </p>
-                                <p>
-                                    Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology. The problem is, with so much competition, are we losing sight of the real goal: protecting our customers against the adversary? With so much focus on com [...]
-                                </p>
-                                <p>
-                                    This, of course, is not new information. People have been pointing this out for years. What is encouraging is that a few organizations are finally stepping up to the plate to try and change this paradigm in cybersecurity.  When it comes to cybersecurity, many have touted big data analytics as one of the key initiatives to combat adversaries. The problem is that big data in itself has its own set of challenges, one of the issues is that it is often look [...]
-                                </p>
-                                <p>
-                                    By creating an open source community, the hope is that identifying security threats within large data sets will become a manageable task for all organizations, despite their size or scale. Organizations overwhelmed with their data or those that aren’t seeing results will have a community to turn to along with a common reference to compare results. By working together on Apache Spot, organizations will be able to share their experiences on how they’ve t [...]
-                                </p>
-                                <p>
-                                    By supporting Apache Spot, Cybraics is hoping to learn as much as we contribute while we collaborate and take part in this Open Source Initiative. With the end result a set of guidelines for organizations to deploy a data analytics platform to find threats within their ecosystem, and a community that will share their experiences with the next generation of data and security professionals, perhaps we can all start actually working together to start leve [...]
-                                </p>
-                            </section>
-                            <footer class="article-footer">
-
-                                filed under: <a href="../../category/uncategorized/" rel="category tag">Uncategorized</a>
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/category/cybersecurity/index.html b/category/cybersecurity/index.html
new file mode 100755
index 0000000..60493e9
--- /dev/null
+++ b/category/cybersecurity/index.html
@@ -0,0 +1,210 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Cybersecurity - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Cybersecurity</h1>
+
+                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/" rel="bookmark" title="Apache Spot and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-thre [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+					
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/category/cybersecurity/index.php b/category/cybersecurity/index.php
deleted file mode 100755
index 1021e91..0000000
--- a/category/cybersecurity/index.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Cybersecurity - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Cybersecurity</h1>
-
-                        <article id="post-117" class="cf post-117 post type-post status-publish format-standard hentry category-cybersecurity" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/" rel="bookmark" title="Apache Spot and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    The “first” documented cybersecurity case was the worm replication, which was initiated by Robert T. Morris on November 2, 1988. Wow! Here we are in 2016, 28 years later, with viruses and worms giving way to Trojan horses and polymorphic code. Nowadays, we are also fighting against DDoS, phishing, spear phishing attacks, command and controls&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-thre [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-					
-					<?php include '../../includes/sidebar.php';?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php';?>	
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/category/data-science/index.html b/category/data-science/index.html
new file mode 100755
index 0000000..4aea8b4
--- /dev/null
+++ b/category/data-science/index.html
@@ -0,0 +1,211 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Data Science - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Data Science</h1>
+
+                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
+                                        September 22, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/category/data-science/index.php b/category/data-science/index.php
deleted file mode 100755
index 5d57edb..0000000
--- a/category/data-science/index.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Data Science - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Data Science</h1>
-
-                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
-                                        September 22, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/project-components/index.php b/category/index.html
similarity index 100%
rename from project-components/index.php
rename to category/index.html
diff --git a/category/ipython-notebooks/index.html b/category/ipython-notebooks/index.html
new file mode 100755
index 0000000..193c5f1
--- /dev/null
+++ b/category/ipython-notebooks/index.html
@@ -0,0 +1,209 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Ipython Notebooks - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Ipython Notebooks</h1>
+
+                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
+                                        September 22, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+                    
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/category/ipython-notebooks/index.php b/category/ipython-notebooks/index.php
deleted file mode 100755
index 008751f..0000000
--- a/category/ipython-notebooks/index.php
+++ /dev/null
@@ -1,56 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Ipython Notebooks - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Ipython Notebooks</h1>
-
-                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
-                                        September 22, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-						
-					<?php include '../../includes/sidebar.php'; ?>
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php';?>
-
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/category/security-analytics/index.html b/category/security-analytics/index.html
new file mode 100755
index 0000000..d673813
--- /dev/null
+++ b/category/security-analytics/index.html
@@ -0,0 +1,210 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Security Analytics - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Security Analytics</h1>
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/category/security-analytics/index.php b/category/security-analytics/index.php
deleted file mode 100755
index fc4d27a..0000000
--- a/category/security-analytics/index.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Security Analytics - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Security Analytics</h1>
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php';?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php';?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/category/threat-analysis-tools/index.html b/category/threat-analysis-tools/index.html
new file mode 100755
index 0000000..d21b80c
--- /dev/null
+++ b/category/threat-analysis-tools/index.html
@@ -0,0 +1,210 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>hreat Analysis Tools - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Threat Analysis Tools</h1>
+
+                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
+                                        September 22, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
diff --git a/category/threat-analysis-tools/index.php b/category/threat-analysis-tools/index.php
deleted file mode 100755
index 738d0ff..0000000
--- a/category/threat-analysis-tools/index.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Threat Analysis Tools - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Threat Analysis Tools</h1>
-
-                        <article id="post-136" class="cf post-136 post type-post status-publish format-standard hentry category-data-science category-ipython-notebooks category-threat-analysis-tools" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/jupyter-notebooks-for-data-analysis/" rel="bookmark" title="Jupyter Notebooks for Data Analysis">Jupyter Notebooks for Data Analysis</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-09-22" itemprop="datePublished">
-                                        September 22, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    Why Does Apache Spot Include iPython notebooks? The project team wants Apache Spot to be a versatile tool that can be used by anyone. This means that data scientists and developers need to be able to query and handle the source data to find all the information they need for their decision making. The iPython&#8230; <a class="excerpt-read-more" href="../../blog/jupyter-notebooks-for-data-analysis/" title="Read Jupyter Notebooks for Data Analysis">Read m [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>	
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/category/uncategorized/index.html b/category/uncategorized/index.html
new file mode 100755
index 0000000..b2a13a5
--- /dev/null
+++ b/category/uncategorized/index.html
@@ -0,0 +1,237 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Uncategorized - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Category: Uncategorized</h1>
+
+                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/" rel="bookmark" title="Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
+                                        October 21, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    By Rob Kent, Vice President of Marketing at Cybraics Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology&#8230;. <a class="excerpt-read-more" href="../../blog/strength-in-numbers-why-consider-open-source-cy [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/" rel="bookmark" title="How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
+                                        August 8, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services&#8230; <a class="excerpt-read-more" href="../../blog/how-apache-spot-helps-create-well-stocke [...]
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/category/uncategorized/index.php b/category/uncategorized/index.php
deleted file mode 100755
index a727d75..0000000
--- a/category/uncategorized/index.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive category";
-$pageTitle = "Uncategorized - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Category: Uncategorized</h1>
-
-                        <article id="post-149" class="cf post-149 post type-post status-publish format-standard hentry category-uncategorized" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/" rel="bookmark" title="Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-10-21" itemprop="datePublished">
-                                        October 21, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    By Rob Kent, Vice President of Marketing at Cybraics Competition is widely considered to be a healthy and positive thing, traditionally viewed as providing options for customers and fueling innovation. In the world of cybersecurity there is no shortage of competition, in fact cybersecurity is one of the most crowded and fast-growing areas of technology&#8230;. <a class="excerpt-read-more" href="../../blog/strength-in-numbers-why-consider-open-source-cy [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                        <article id="post-113" class="cf post-113 post type-post status-publish format-standard hentry category-uncategorized" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/" rel="bookmark" title="How Apache Spot Helps Create Well-Stocked Data Lakes and Catch Powerful Insights">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-08-08" itemprop="datePublished">
-                                        August 8, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    About four years ago, the era of the Big Data analytics began. Paired with advanced analytics, massive volumes of data can be culled to not only inform critical decisions, but also to simulate sophisticated “what if” scenarios that allow companies to gain competitive advantages by generating and predicting different scenarios. For example, a financial services&#8230; <a class="excerpt-read-more" href="../../blog/how-apache-spot-helps-create-well-stocke [...]
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/contribute/index.html b/contribute/index.html
new file mode 100755
index 0000000..ee0cdaa
--- /dev/null
+++ b/contribute/index.html
@@ -0,0 +1,224 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Contribute - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="page">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130 active">
+                                <a href="../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            
+            <div id="content">
+            	
+            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
+            		<div class="main">
+            			<h1 class="page-title">Proposed Apache-Spot (incubating) Commit Workflow</h1>
+            			
+            			<p><strong>NOTE: Most of this guide is based on ASF Documentation.</strong></p>
+            			
+            			<p>This guide is meant to provide a workflow for committers of Apache Spot. The proposed workflow is for using git with apache-spot codebase.</p>
+            			
+            			<p>Depending the nature of the change two different approaches can be used to commit to Apache Spot: <strong>Individual Push</strong> or <strong>Topic Branding</strong>.</p>
+            			
+            			<h3 class="center" style="margin-top:35px;">Individual Push (most commonly used by the community):</h3>
+        			
+            			<p><img src="../library/images/individual-push.png" alt="" /></p>
+            			
+            			<p><strong>Steps:</strong></p>
+            			
+            			<ol>
+            				<li>For the Github repository at <a href="https://github.com/apache/incubator-spot" target="_blank">https://github.com/apache/incubator-spot</a> if you haven't already. For more information about Fork please go to: <a href="https://help.github.com/articles/fork-a-repo/" target="_blank">https://help.github.com/articles/fork-a-repo/</a></li>
+            				<li>Clone your fork, create a new branch named after a Jira issue (i.e. <strong>spot-100</strong>).</li>
+            				<li>Push commits to your local branch.</li>
+            				<li>Test it!!!</li>
+            				<li>Create a pull request (PR) against the upstream repo (master) of apache-spot. For more information about how to create a pull request please go to: <a href="https://help.github.com/articles/about-pull-requests/" target="_blank">https://help.github.com/articles/about-pull-requests/</a>.</li>
+            				<li>Wait for the maintainers to review your PR.</li>
+            			</ol>
+            			
+            			<h3 class="center" style="margin-top:35px;">Topic Branching (upstream)</h3>
+            			
+            			<p>What are a topic branches?</p>
+            			
+            			<blockquote>According to the git definition: "<em>A topic branch is a short-lived branch that you create and use for a single particular feature or related work.</em>" (<a href="https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#Topic-Branches" target="_blank">https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#Topic-Branches</a>)</blockquote>
+            			
+            			<p>Sometimes a new major feature will have dependencies between modules or developers that can't be separated into individual pushes, when this happens, a topic branch will be created to deliver the complete functionality before the merge with the upstream (encapsulated dev enviroment).</p>
+            			
+            			<p>In order to create a topic branch, three requirements are needed:</p>
+            			
+            			<ol>
+            				<li>A design document must be uploaded using Jira. This design must be approved by the maintainers.</li>
+            				<li>A voting process will be required to approve the topic branch creation, at least 3 maintainers need to approve it.</li>
+            				<li>A commitment to delete the branch after merging it into the upstream branch must be done. The topic branch should only exist while the work is still in progress.</li>
+            			</ol>
+            			
+            			<p>A meaningful name must be given to the branch. It is recommended to use JIRA issue created with the design document to link the branch.</p>
+            			
+            			<p><img src="../library/images/topic-branching.png" alt="" /></p>
+            			
+            			<p><strong>IMPORTANT: There shouldn't be a push without a Jira created previously</strong></p>
+            			
+            			<h3>Approvals and Voting Process:</h3>
+            			
+            			<blockquote>
+            				<p>For code-modification, +1 votes are in favor of the proposal, but -1 votes are <u>vetos</u> and kill the proposal dead until all vetoers withdraw their -1 votes.</p> 
+            				
+            				<p>Unless a vote has been declared as using <u>lazy consensus</u>, three +1 votes are required for a code-modification proposal to pass.</p>
+            				
+            				<p>Whole numbers are recommended for this type of vote, as the opinion being expressed is Boolean: 'I approve/do not approve of this change.'</p>
+            				
+            				<p><strong>Source: <a href="http://apache.org/foundation/voting.html" target="_blank">http://apache.org/foundation/voting.html</a></strong></p>
+        				</blockquote>
+        				
+        				<h3>Useful links:</h3>
+        				
+        				<ul>
+        					<li><a href="https://www.apache.org/foundation/glossary.html" target="_blank">https://www.apache.org/foundation/glossary.html</a></li>
+        					<li><a href="http://www.apache.org/dev/committers" target="_blank">http://www.apache.org/dev/committers</a></li>
+        					<li><a href="http://www.apache.org/dev/git.html" target="_blank">http://www.apache.org/dev/git.html</a></li>
+        					<li><a href="http://www.apache.org/dev/writable-git" target="_blank">http://www.apache.org/dev/writable-git</a></li>
+        				</ul>
+            		</div>
+            	</div>
+            	
+            </div>
+
+
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="../library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="../library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/contribute/index.php b/contribute/index.php
deleted file mode 100755
index aa92b45..0000000
--- a/contribute/index.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php include '../includes/config.php'; ?>
-<?php
-$bodyclass = "page";
-$pageTitle = "Contribute - Apache Spot";
-$description = "";
-$currentPage = 'contribute';
-?>
-<?php include '../includes/header.php'; ?>
-            
-            <div id="content">
-            	
-            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
-            		<div class="main">
-            			<h1 class="page-title">Proposed Apache-Spot (incubating) Commit Workflow</h1>
-            			
-            			<p><strong>NOTE: Most of this guide is based on ASF Documentation.</strong></p>
-            			
-            			<p>This guide is meant to provide a workflow for committers of Apache Spot. The proposed workflow is for using git with apache-spot codebase.</p>
-            			
-            			<p>Depending the nature of the change two different approaches can be used to commit to Apache Spot: <strong>Individual Push</strong> or <strong>Topic Branding</strong>.</p>
-            			
-            			<h3 class="center" style="margin-top:35px;">Individual Push (most commonly used by the community):</h3>
-        			
-            			<p><img src="<?php echo BASE_URL; ?>/library/images/individual-push.png" alt="" /></p>
-            			
-            			<p><strong>Steps:</strong></p>
-            			
-            			<ol>
-            				<li>For the Github repository at <a href="https://github.com/apache/incubator-spot" target="_blank">https://github.com/apache/incubator-spot</a> if you haven't already. For more information about Fork please go to: <a href="https://help.github.com/articles/fork-a-repo/" target="_blank">https://help.github.com/articles/fork-a-repo/</a></li>
-            				<li>Clone your fork, create a new branch named after a Jira issue (i.e. <strong>spot-100</strong>).</li>
-            				<li>Push commits to your local branch.</li>
-            				<li>Test it!!!</li>
-            				<li>Create a pull request (PR) against the upstream repo (master) of apache-spot. For more information about how to create a pull request please go to: <a href="https://help.github.com/articles/about-pull-requests/" target="_blank">https://help.github.com/articles/about-pull-requests/</a>.</li>
-            				<li>Wait for the maintainers to review your PR.</li>
-            			</ol>
-            			
-            			<h3 class="center" style="margin-top:35px;">Topic Branching (upstream)</h3>
-            			
-            			<p>What are a topic branches?</p>
-            			
-            			<blockquote>According to the git definition: "<em>A topic branch is a short-lived branch that you create and use for a single particular feature or related work.</em>" (<a href="https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#Topic-Branches" target="_blank">https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows#Topic-Branches</a>)</blockquote>
-            			
-            			<p>Sometimes a new major feature will have dependencies between modules or developers that can't be separated into individual pushes, when this happens, a topic branch will be created to deliver the complete functionality before the merge with the upstream (encapsulated dev enviroment).</p>
-            			
-            			<p>In order to create a topic branch, three requirements are needed:</p>
-            			
-            			<ol>
-            				<li>A design document must be uploaded using Jira. This design must be approved by the maintainers.</li>
-            				<li>A voting process will be required to approve the topic branch creation, at least 3 maintainers need to approve it.</li>
-            				<li>A commitment to delete the branch after merging it into the upstream branch must be done. The topic branch should only exist while the work is still in progress.</li>
-            			</ol>
-            			
-            			<p>A meaningful name must be given to the branch. It is recommended to use JIRA issue created with the design document to link the branch.</p>
-            			
-            			<p><img src="<?php echo BASE_URL; ?>/library/images/topic-branching.png" alt="" /></p>
-            			
-            			<p><strong>IMPORTANT: There shouldn't be a push without a Jira created previously</strong></p>
-            			
-            			<h3>Approvals and Voting Process:</h3>
-            			
-            			<blockquote>
-            				<p>For code-modification, +1 votes are in favor of the proposal, but -1 votes are <u>vetos</u> and kill the proposal dead until all vetoers withdraw their -1 votes.</p> 
-            				
-            				<p>Unless a vote has been declared as using <u>lazy consensus</u>, three +1 votes are required for a code-modification proposal to pass.</p>
-            				
-            				<p>Whole numbers are recommended for this type of vote, as the opinion being expressed is Boolean: 'I approve/do not approve of this change.'</p>
-            				
-            				<p><strong>Source: <a href="http://apache.org/foundation/voting.html" target="_blank">http://apache.org/foundation/voting.html</a></strong></p>
-        				</blockquote>
-        				
-        				<h3>Useful links:</h3>
-        				
-        				<ul>
-        					<li><a href="https://www.apache.org/foundation/glossary.html" target="_blank">https://www.apache.org/foundation/glossary.html</a></li>
-        					<li><a href="http://www.apache.org/dev/committers" target="_blank">http://www.apache.org/dev/committers</a></li>
-        					<li><a href="http://www.apache.org/dev/git.html" target="_blank">http://www.apache.org/dev/git.html</a></li>
-        					<li><a href="http://www.apache.org/dev/writable-git" target="_blank">http://www.apache.org/dev/writable-git</a></li>
-        				</ul>
-            		</div>
-            	</div>
-            	
-            </div>
-
-
-<?php include '../includes/prefooter.php'; ?>
-<?php include '../includes/footer.php'; ?>
\ No newline at end of file
diff --git a/doc/index.html b/doc/index.html
index 91799f3..c7280f2 100755
--- a/doc/index.html
+++ b/doc/index.html
@@ -59,22 +59,22 @@
 	                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
 	                            </li>
 	                            <li class="menu-item">
-	                                <a href="http://spot.incubator.apache.org/contribute">Contribute</a>
+	                                <a href="../contribute">Contribute</a>
 	                            </li>
-	                            <li class="menu-item">
-	                                <a href="http://spot.incubator.apache.org/doc/">Documentation</a>
+	                            <li class="menu-item active">
+	                                <a href="../doc/">Documentation</a>
 	                            </li>
 	                            <li class="menu-item menu-item-has-children">
 	                                <a href="#">Project Components</a>
 	                                <ul class="sub-menu">
-	                                	<li><a href="http://spot.incubator.apache.org/project-components/open-data-models">Open Data Models</a></li>
-	                                	<li><a href="http://spot.incubator.apache.org/project-components/ingestion">Ingestion</a></li>
-	                                	<li><a href="http://spot.incubator.apache.org/project-components/machine-learning">Machine Learning</a></li>
-	                                	<li><a href="http://spot.incubator.apache.org/project-components/visualization">Visualization</a></li>
+	                                	<li><a href="../project-components/open-data-models">Open Data Models</a></li>
+	                                	<li><a href="../project-components/ingestion">Ingestion</a></li>
+	                                	<li><a href="../project-components/machine-learning">Machine Learning</a></li>
+	                                	<li><a href="../project-components/visualization">Visualization</a></li>
 	                                </ul>
 	                            </li>
 	                            <li class="menu-item">
-	                                <a href="http://spot.incubator.apache.org/blog">Blog</a>
+	                                <a href="../blog">Blog</a>
 	                            </li>
 	                        </ul>
 	                    </nav>
diff --git a/index.html b/index.html
index 3b138ba..cc9d552 100755
--- a/index.html
+++ b/index.html
@@ -1,449 +1,418 @@
-<!doctype html>
-
-<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
-<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
-<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
-<!--[if gt IE 8]><!-->
-<html lang="en-US" class="no-js">
-    <!--<![endif]-->
-
-    <head>
-        <meta charset="utf-8">
-
-        <meta http-equiv="X-UA-Compatible" content="IE=edge">
-
-        <title>Apache Spot</title>
-
-        <meta name="HandheldFriendly" content="True">
-        <meta name="MobileOptimized" content="320">
-        <meta name="viewport" content="width=device-width, initial-scale=1"/>
-
-        <link rel="apple-touch-icon" href="wp-content/themes/oni/library/images/apple-touch-icon.png">
-        <link rel="icon" href="wp-content/themes/oni/favicon.png">
-        <!--[if IE]>
-        <link rel="shortcut icon" href="wp-content/themes/oni/favicon.ico">
-        <![endif]-->
-        <meta name="msapplication-TileColor" content="#f01d4f">
-        <meta name="msapplication-TileImage" content="wp-content/themes/oni/library/images/win8-tile-icon.png">
-        <meta name="theme-color" content="#121212">
-
-        <link rel="pingback" href="xmlrpc.php">
-
-        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
-        <link rel='dns-prefetch' href='//s.w.org' />
-        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="feed/" />
-        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Comments Feed" href="comments/feed/" />
-        <script type="text/javascript">
-			window._wpemojiSettings = {
-				"baseUrl" : "https:\/\/s.w.org\/images\/core\/emoji\/2\/72x72\/",
-				"ext" : ".png",
-				"svgUrl" : "https:\/\/s.w.org\/images\/core\/emoji\/2\/svg\/",
-				"svgExt" : ".svg",
-				"source" : {
-					"concatemoji" : "http:\/\/spot.incubator.apache.org\/wp-includes\/js\/wp-emoji-release.min.js"
-				}
-			};
-			! function(a, b, c) {
-				function d(a) {
-					var c,
-					    d,
-					    e,
-					    f,
-					    g,
-					    h = b.createElement("canvas"),
-					    i = h.getContext && h.getContext("2d"),
-					    j = String.fromCharCode;
-					if (!i || !i.fillText)
-						return !1;
-					switch(i.textBaseline="top",i.font="600 32px Arial",a) {
-					case"flag":
-						return i.fillText(j(55356, 56806, 55356, 56826), 0, 0), !(h.toDataURL().length < 3e3) && (i.clearRect(0, 0, h.width, h.height), i.fillText(j(55356, 57331, 65039, 8205, 55356, 57096), 0, 0),
-						c = h.toDataURL(), i.clearRect(0, 0, h.width, h.height), i.fillText(j(55356, 57331, 55356, 57096), 0, 0),
-						d = h.toDataURL(), c !== d);
-					case"diversity":
-						return i.fillText(j(55356, 57221), 0, 0),
-						e = i.getImageData(16, 16, 1, 1).data,
-						f = e[0] + "," + e[1] + "," + e[2] + "," + e[3], i.fillText(j(55356, 57221, 55356, 57343), 0, 0),
-						e = i.getImageData(16, 16, 1, 1).data,
-						g = e[0] + "," + e[1] + "," + e[2] + "," + e[3], f !== g;
-					case"simple":
-						return i.fillText(j(55357, 56835), 0, 0), 0 !== i.getImageData(16,16,1,1).data[0];
-					case"unicode8":
-						return i.fillText(j(55356, 57135), 0, 0), 0 !== i.getImageData(16,16,1,1).data[0];
-					case"unicode9":
-						return i.fillText(j(55358, 56631), 0, 0), 0 !== i.getImageData(16,16,1,1).data[0]
-					}
-					return !1
-				}
-
-				function e(a) {
-					var c = b.createElement("script");
-					c.src = a, c.type = "text/javascript", b.getElementsByTagName("head")[0].appendChild(c)
-				}
-
-				var f,
-				    g,
-				    h,
-				    i;
-				for ( i = Array("simple", "flag", "unicode8", "diversity", "unicode9"), c.supports = {
-					everything : !0,
-					everythingExceptFlag : !0
-				},
-				h = 0; h < i.length; h++)
-					c.supports[i[h]] = d(i[h]), c.supports.everything = c.supports.everything && c.supports[i[h]], "flag" !== i[h] && (c.supports.everythingExceptFlag = c.supports.everythingExceptFlag && c.supports[i[h]]);
-				c.supports.everythingExceptFlag = c.supports.everythingExceptFlag && !c.supports.flag, c.DOMReady = !1, c.readyCallback = function() {
-					c.DOMReady = !0
-				}, c.supports.everything || ( g = function() {
-					c.readyCallback()
-				}, b.addEventListener ? (b.addEventListener("DOMContentLoaded", g, !1), a.addEventListener("load", g, !1)) : (a.attachEvent("onload", g), b.attachEvent("onreadystatechange", function() {
-					"complete" === b.readyState && c.readyCallback()
-				})),
-				f = c.source || {}, f.concatemoji ? e(f.concatemoji) : f.wpemoji && f.twemoji && (e(f.twemoji), e(f.wpemoji)))
-			}(window, document, window._wpemojiSettings);
-        </script>
-        <style type="text/css">
-			img.wp-smiley, img.emoji {
-				display: inline !important;
-				border: none !important;
-				box-shadow: none !important;
-				height: 1em !important;
-				width: 1em !important;
-				margin: 0 .07em !important;
-				vertical-align: -0.1em !important;
-				background: none !important;
-				padding: 0 !important;
-			}
-        </style>
-        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
-        <link rel='stylesheet' id='bones-stylesheet-css'  href='wp-content/themes/oni/library/css/style.css' type='text/css' media='all' />
-        <!--[if lt IE 9]>
-        <link rel='stylesheet' id='bones-ie-only-css'  href='wp-content/themes/oni/library/css/ie.css' type='text/css' media='all' />
-        <![endif]-->
-        <link rel='stylesheet' id='mm-css-css'  href='wp-content/themes/oni/library/css/meanmenu.css' type='text/css' media='all' />
-        <script type='text/javascript' src='wp-content/themes/oni/library/js/libs/modernizr.custom.min.js'></script>
-        <script type='text/javascript' src='wp-includes/js/jquery/jquery.js'></script>
-        <script type='text/javascript' src='wp-includes/js/jquery/jquery-migrate.min.js'></script>
-        <script type='text/javascript' src='wp-content/themes/oni/library/js/jquery.meanmenu.js'></script>
-        <link rel='https://api.w.org/' href='wp-json/' />
-        <link rel="canonical" href="" />
-        <link rel='shortlink' href='' />
-        <link rel="alternate" type="application/json+oembed" href="wp-json/oembed/1.0/embed?url=http%3A%2F%2Fnolamarketing.com%2Fclient%2Foni%2F" />
-        <link rel="alternate" type="text/xml+oembed" href="wp-json/oembed/1.0/embed?url=http%3A%2F%2Fnolamarketing.com%2Fclient%2Foni%2F&#038;format=xml" />
-
-    </head>
-
-    <body class="home page page-id-8 page-template-default" itemscope itemtype="http://schema.org/WebPage">
-
-        <div id="container">
-
-            <header class="header" role="banner" itemscope itemtype="http://schema.org/WPHeader">
-
-                <div id="inner-header" class="wrap cf">
-
-                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
-                        <a href="http://spot.incubator.apache.org" rel="nofollow"><img src="wp-content/themes/oni/library/images/logo.png" alt="Open Network Insight" /></a>
-                    </p>
-
-                    <nav role="navigation" itemscope itemtype="http://schema.org/SiteNavigationElement">
-                        <ul id="menu-main-menu" class="nav top-nav cf">
-                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
-                                <a target="_blank" href="https://github.com/Open-Network-Insight/open-network-insight/tree/spot">Get Started</a>
-                            </li>
-                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
-                                <a target="_blank" href="https://github.com/Open-Network-Insight/open-network-insight/tree/spot#if-you-want-all-of-the-apache-spot-code-at-once-just-clone-it">Download</a>
-                            </li>
-                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
-                                <a target="_blank" href="https://github.com/Open-Network-Insight/open-network-insight/tree/spot#contributing-to-apache-spot">Contribute</a>
-                            </li>
-                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
-                                <a target="_blank" href="https://github.com/Open-Network-Insight/open-network-insight/wiki">Wiki</a>
-                            </li>
-                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
-                                <a href="blog/">Blog</a>
-                            </li>
-                        </ul>
-                    </nav>
-
-                </div>
-
-            </header>
-
-            <div id="mobile-nav"></div>
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all t-1of2 d-1of2 oni-guy">
-                        <img src="wp-content/uploads/2016/03/spot470.png" class="oniguy" alt="" />
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <h2>Apache Spot (Incubating)
-                        <br>
-                        at a Glance</h2>
-                        <p>
-                            For organizations with dynamic data centers and networks, Apache Spot is an advanced threat detection solution that uses big data analytics, that perform at cloud scale, to provide actionable insights into operational and security threats. Running on Apache Hadoop, Apache Spot can analyze billions of events in order to detect unknown threats, insider threats, and gain a new level of visibility into the network.
-                        </p>
-                        <p class="btn-margin">
-                            <a href="https://github.com/Open-Network-Insight" class="y-btn">More Info</a>
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div id="content">
-                <div id="inner-content" class="wrap cf">
-                    <main id="main" class="m-all t-all d-all cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-                        <h1 class="center">Apache Spot Advantages</h1>
-                        <p style="text-align: center;"><img src="wp-content/uploads/2016/03/advantages-1.png" alt="advantages" width="958" height="433" class="aligncenter size-full wp-image-139" srcset="wp-content/uploads/2016/03/advantages-1.png 958w, wp-content/uploads/2016/03/advantages-1-300x136.png 300w, wp-content/uploads/2016/03/advantages-1-768x347.png 768w" sizes="(max-width: 958px) 100vw, 958px" />
-                        </p>
-                    </main>
-                </div>
-            </div>
-
-            <div id="and">
-                <div class="wrap cf">
-                    <div class="and-row">
-                        <div class="and-cell">
-                            <img src="wp-content/themes/oni/library/images/and.png" alt="" />
-                        </div>
-                        <div class="and-cell">
-                            <p>
-                                Apache Spot is functional after just one day and just keeps improving through feedback and machine learning.
-                            </p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="how-it-works">
-                <div class="wrap cf">
-                    <div class="m-all t-1of3 d-1of3">
-                        <h1>How It Works</h1>
-                        <p>
-                            Apache Spot uses machine learning as a filter for separating bad traffic from benign and to characterize the unique behavior of network traffic. A proven process, of context enrichment, noise filtering, whitelisting and heuristics, is also applied to network data to produce a shortlist of most likely security threats.
-                        </p>
-                        <p class="btn-margin">
-                            <a href="https://github.com/Open-Network-Insight" class="y-btn">More Info</a>
-                        </p>
-                    </div>
-                    <div class="m-all t-2of3 d-2of3">
-                        <img src="wp-content/uploads/2016/03/how-it-works.png" alt="" />
-                    </div>
-                </div>
-            </div>
-
-            <div id="key-features">
-                <div class="wrap cf">
-                    <h1>Key Features</h1>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/magnify-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Suspicious DNS packets</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Apache Spot is capable of performing deep-packet inspection of DNS traffic to build a profile of probable and improbable DNS payloads. After visualizing, normalizing, and conducting pattern searches, the analyst has a shortlist of the most likely threats present in DNS traffic.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/threat-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Threat Incident and Response</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Given an IP address, Apache Spot gathers all the characteristics about the communication associated with it – the “social network” of that IP address.  Then Apache Spot builds a timeline of the conversations that originated with that IP.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/connects.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Suspicious Connects</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Apache Spot uses advanced machine learning to build a model of the machines on the network and their communication patterns.  The connections between the machines that are the lowest probability are then visualized, filtered for noise, and searched for known patterns.  The result is the most likely threat patterns in the data, a few hundred flows picked from billions.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/storyboard-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Storyboard</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            After an analyst has investigated a threat, the need still exists to communicate the event up and across the organization.  A “dashboard” gives quick answers to the questions you already know to ask.  What the analyst requires is a “storyboard,” something that tells who, what, where, and how of the story in words and interactive visualizations.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/SPOT_OpenDataModel-Icon_v1.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Open Data Models</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Spot provides common open data model for network, endpoint, and user – Open Data Models. These Open Data Models provide a standard format of enriched event data that makes it easier to integrate cross application data to gain complete enterprise visibility and develop net new analytic functionality.  Spot’s Open Data Models helps organizations quickly share new analytics with one another as new threats are discovered.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="wp-content/uploads/2016/03/SPOT_Collabration-Icon_v2.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Collaboration</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Spot’s Open Data Models help organizations quickly share new analytics with one another as new threats are discovered.  And, with Hadoop, organizations able to run these analytics against comprehensive historic data sets, helping organizations identify past threats that have slipped through the cracks. With this capability, Spot aims to give security professionals the ability to collaborate like cybercriminals do.
-                        </p>
-                    </div>
-
-                    <div class="cf"></div>
-                    <p class="btn-margin">
-                        <a href="https://github.com/Open-Network-Insight" class="y-btn">More Info</a>
-                    </p>
-                </div>
-            </div>
-
-            <div id="user-stories">
-                <div class="wrap cf">
-                    <h1>Spot Fosters a Rich Application Ecosystem</h1>
-                    <p class="btn-margin center">
-                        Spot accelerates the development of cybersecurity applications by providing a cybersecurity analytics framework.  This means more solutions can be created faster. This is because Spot allows organizations to focus developing the analytics and visualizations for applications that discover cybercrime rather than spending time building systems to ingest, integrate, store, and process myriad volumes or varieties of security data.
-                    </p>
-
-                </div>
-            </div>
-
-            <div id="use-case">
-                <div class="wrap cf">
-
-                    <h1>Use Case</h1>
-                    <div class="quotes">
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="wp-content/themes/oni/library/images/quote-person.png" alt="" />
-                                    <h3>Senior Analyst</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...that allows me to see and customize the data and scripts to my enviroment. I want control over how the solution works.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="wp-content/themes/oni/library/images/quote-person.png" alt="" />
-                                    <h3>Junior Analyst</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...that automatically alerts me to actionable suspicious events and ways to optimize my network in a timely fashion. Help me investigate these events and tell the story across stakeholders in my organization.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="wp-content/themes/oni/library/images/quote-person.png" alt="" />
-                                    <h3>Decision Maker</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...tells me the story of what happened in a way I can understand so I can make decisions as a result.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="arrow">
-                    <div class="wrap cf">
-                        <p>
-                            Identify the needle in the haystack with <strong>patterns</strong> that provide insight into potential threats.
-                        </p>
-                    </div>
-                </div>
-            </div>
-
-            <div id="more-info">
-                <div class="wrap cf">
-                    <p class="social-icons">
-                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="wp-content/themes/oni/library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
-                    </p>
-
-                    <p>
-                        <a href="https://github.com/Open-Network-Insight/open-network-insight" class="y-btn" target="_blank">More Info</a>
-                    </p>
-
-                    <p style="margin-top:50px;"><img src="wp-content/themes/oni/library/images/apache-incubator.png" alt="Apache Incubator" />
-                    </p>
-
-                    <p class="disclaimer">
-                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
-                    </p>
-
-                    <p class="disclaimer">
-                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
-                    </p>
-                </div>
-            </div>
-
-            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
-
-                <div id="inner-footer" class="wrap cf">
-
-                    <nav role="navigation"></nav>
-                    <p class="source-org copyright" style="text-align:center;">
-                        &copy; 2016 Apache Spot.
-                    </p>
-
-                </div>
-
-            </footer>
-
-        </div>
-
-        <script type='text/javascript' src='wp-content/themes/oni/library/js/scripts.js'></script>
-        <script type='text/javascript' src='wp-includes/js/wp-embed.min.js'></script>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="library/images/apple-touch-icon.png">
+        <link rel="icon" href="favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='/library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="home">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="masthead">
+                <div class="wrap cf">
+                    <div class="m-all t-1of2 d-1of2">
+                        <h1>Apache Spot (Incubating)</h1>
+                        <h1 class="thin">A Community Approach to Fighting Cyber Threats</h1>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2 contribute">
+                        <h3>Help Spot expand his hunting ground to see deeper into the darkness of cyber threats.</h3>
+                        <p class="btn-margin"><a href="contribute" class="y-btn">Become a Contributor</a></p>
+                    </div>
+                </div>
+            </div>
+            
+            <div id="at-a-glance">
+            	<div class="wrap cf">
+            		<h1>Apache Spot at a Glance</h1>
+            		<p>Apache Spot is a community-driven cybersecurity project, built from the ground up, to bring advanced analytics to all IT Telemetry data on an open, scalable platform. Spot expedites threat detection, investigation, and remediation via machine learning and consolidates all enterprise security data into a comprehensive IT telemetry hub based on open data models. Spot’s scalability and machine learning capabilities support an ecosystem of ML-based applications that can run  [...]
+            	</div>
+            </div>
+
+            <div id="content">
+                <div id="inner-content" class="wrap cf">
+                    <main id="main" class="m-all t-all d-all cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+                        <h1 class="center">Apache Spot Advantages</h1>
+                        <p style="text-align: center;"><img src="library/images/advantages-1.png" alt="advantages" width="958" height="433" class="aligncenter size-full" />
+                        </p>
+                    </main>
+                </div>
+            </div>
+
+            <div id="and">
+                <div class="wrap cf">
+                    <div class="and-row">
+                        <div class="and-cell">
+                            <img src="library/images/and.png" alt="" />
+                        </div>
+                        <div class="and-cell">
+                            <p>
+                                Apache Spot is functional after just one day and just keeps improving through feedback and machine learning.
+                            </p>
+                        </div>
+                    </div>
+                </div>
+            </div>
+
+            <div id="how-it-works">
+                <div class="wrap cf">
+                    <div class="m-all t-1of3 d-1of3">
+                        <h1>How It Works</h1>
+                        <p>
+                            Apache Spot uses machine learning as a filter for separating bad traffic from benign and to characterize the unique behavior of network traffic. A proven process, of context enrichment, noise filtering, whitelisting and heuristics, is also applied to network data to produce a shortlist of most likely security threats.
+                        </p>
+                        <p class="btn-margin">
+                            <a href="https://github.com/apache/incubator-spot" class="y-btn">More Info</a>
+                        </p>
+                    </div>
+                    <div class="m-all t-2of3 d-2of3">
+                        <img src="library/images/how-it-works.png" alt="" />
+                    </div>
+                </div>
+            </div>
+
+            <div id="key-features">
+                <div class="wrap cf">
+                    <h1>Key Features</h1>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/magnify-icon.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Suspicious DNS packets</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            Apache Spot is capable of performing deep-packet inspection of DNS traffic to build a profile of probable and improbable DNS payloads. After visualizing, normalizing, and conducting pattern searches, the analyst has a shortlist of the most likely threats present in DNS traffic.
+                        </p>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/threat-icon.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Threat Incident and Response</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            Given an IP address, Apache Spot gathers all the characteristics about the communication associated with it – the “social network” of that IP address.  Then Apache Spot builds a timeline of the conversations that originated with that IP.
+                        </p>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/connects.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Suspicious Connects</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            Apache Spot uses advanced machine learning to build a model of the machines on the network and their communication patterns.  The connections between the machines that are the lowest probability are then visualized, filtered for noise, and searched for known patterns.  The result is the most likely threat patterns in the data, a few hundred flows picked from billions.
+                        </p>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/storyboard-icon.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Storyboard</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            After an analyst has investigated a threat, the need still exists to communicate the event up and across the organization.  A “dashboard” gives quick answers to the questions you already know to ask.  What the analyst requires is a “storyboard,” something that tells who, what, where, and how of the story in words and interactive visualizations.
+                        </p>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/SPOT_OpenDataModel-Icon_v1.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Open Data Models</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            Spot provides common open data model for network, endpoint, and user – Open Data Models. These Open Data Models provide a standard format of enriched event data that makes it easier to integrate cross application data to gain complete enterprise visibility and develop net new analytic functionality.  Spot’s Open Data Models helps organizations quickly share new analytics with one another as new threats are discovered.
+                        </p>
+                    </div>
+                    <div class="m-all t-1of2 d-1of2">
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell">
+                                    <img src="library/images/SPOT_Collabration-Icon_v2.png" alt="" />
+                                </div>
+                                <div class="table-cell">
+                                    <h3>Collaboration</h3>
+                                </div>
+                            </div>
+                        </div>
+                        <p>
+                            Spot’s Open Data Models help organizations quickly share new analytics with one another as new threats are discovered.  And, with Hadoop, organizations able to run these analytics against comprehensive historic data sets, helping organizations identify past threats that have slipped through the cracks. With this capability, Spot aims to give security professionals the ability to collaborate like cybercriminals do.
+                        </p>
+                    </div>
+
+                    <div class="cf"></div>
+                    <p class="btn-margin">
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn">More Info</a>
+                    </p>
+                </div>
+            </div>
+            
+            <div id="open-data-models">
+            	<div class="wrap cf">
+            		<h1 class="center">Apache Spot Open Data Models (ODM)</h1>
+            		<div class="m-all t-1of2 d-1of2 center">
+            			<img src="library/images/odm.png" alt="Apache Spot Open Data Models">
+            		</div>
+            		<div class="m-all t-1of2 d-1of2">
+            			<p>The primary use case initially supported by Spot includes Network Traffic Analysis for network flows (Netflow, sflow, etc.), DNS and Proxy.  The Spot open data model strategy aims to extend Spot capabilities to support a broader set of cybersecurity use cases.</p>
+            			<h3>ODM at a Glance</h3>
+            			<ul>
+            				<li>Includes a growing catalog of packaged ingestion pipelines for common data sources</li>
+            				<li>Enriched events provide full context leading to better analytics and faster incident response</li>
+            				<li>Organizations maintain and control a single copy of their security data</li>
+            			</ul>
+            			<p class="btn-margin"><a href="project-components/open-data-models/" class="y-btn">Read More</a></p>
+            		</div>
+            	</div>
+            </div>
+
+            <div id="user-stories">
+                <div class="wrap cf">
+                    <h1>Spot Fosters a Rich Application Ecosystem</h1>
+                    <p class="btn-margin center">
+                        Spot accelerates the development of cybersecurity applications by providing a cybersecurity analytics framework.  This means more solutions can be created faster. This is because Spot allows organizations to focus developing the analytics and visualizations for applications that discover cybercrime rather than spending time building systems to ingest, integrate, store, and process myriad volumes or varieties of security data.
+                    </p>
+                    
+                    <p class="center">Join the Apache Spot community and collaborate with us using a common framework.</p>
+                    
+                    <div class="community">
+                    	<img src="library/images/community/endgame.png" alt="Endgame" />
+                    	<img src="library/images/community/intel.png" alt="Intel" />
+                    	<img src="library/images/community/webroot.png" alt="Webroot" />
+                    	<img src="library/images/community/jask.png" alt="Jask" />
+                    	<img src="library/images/community/cloudera.png" alt="Cloudera" />
+                    	<img src="library/images/community/cloudwick.png" alt="Cloudwick" />
+                    	<img src="library/images/community/cybraics.png" alt="Cybraics" />
+                    	<img src="library/images/community/centrify.png" alt="Centrify" />
+                    	<img src="library/images/community/ebay.png" alt="Ebay" />
+                    	<img src="library/images/community/semantix.png" alt="Ebay" />
+                    	<img src="library/images/community/rich-it.png" alt="Ebay" />
+                    	
+                    </div>
+
+                </div>
+            </div>
+
+            <div id="use-case">
+                <div class="wrap cf">
+
+                    <h1>Use Case</h1>
+                    <div class="quotes">
+
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell quote-man">
+                                    <img src="library/images/quote-person.png" alt="" />
+                                    <h3>Senior Analyst</h3>
+                                </div>
+                                <div class="table-cell">
+                                    <p>
+                                        ...that allows me to see and customize the data and scripts to my enviroment. I want control over how the solution works.”
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell quote-man">
+                                    <img src="library/images/quote-person.png" alt="" />
+                                    <h3>Junior Analyst</h3>
+                                </div>
+                                <div class="table-cell">
+                                    <p>
+                                        ...that automatically alerts me to actionable suspicious events and ways to optimize my network in a timely fashion. Help me investigate these events and tell the story across stakeholders in my organization.”
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="table">
+                            <div class="table-row">
+                                <div class="table-cell quote-man">
+                                    <img src="library/images/quote-person.png" alt="" />
+                                    <h3>Decision Maker</h3>
+                                </div>
+                                <div class="table-cell">
+                                    <p>
+                                        ...tells me the story of what happened in a way I can understand so I can make decisions as a result.”
+                                    </p>
+                                </div>
+                            </div>
+                        </div>
+
+                    </div>
+
+                </div>
+
+                <div class="arrow">
+                    <div class="wrap cf">
+                        <p>
+                            Identify the needle in the haystack with <strong>patterns</strong> that provide insight into potential threats.
+                        </p>
+                    </div>
+                </div>
+            </div>
+            
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/index.php b/index.php
deleted file mode 100755
index 2c20ba8..0000000
--- a/index.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php include 'includes/config.php'; ?>
-
-<?php
-$bodyclass = "home";
-$pageTitle = "Apache Spot";
-$description = "";
-$currentPage = 'home';
-?>
-<?php include 'includes/header.php'; ?>
-
-
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all t-1of2 d-1of2">
-                        <h1>Apache Spot (Incubating)</h1>
-                        <h1 class="thin">A Community Approach to Fighting Cyber Threats</h1>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2 contribute">
-                        <h3>Help Spot expand his hunting ground to see deeper into the darkness of cyber threats.</h3>
-                        <p class="btn-margin"><a href="<?php echo BASE_URL; ?>/contribute" class="y-btn">Become a Contributor</a></p>
-                    </div>
-                </div>
-            </div>
-            
-            <div id="at-a-glance">
-            	<div class="wrap cf">
-            		<h1>Apache Spot at a Glance</h1>
-            		<p>Apache Spot is a community-driven cybersecurity project, built from the ground up, to bring advanced analytics to all IT Telemetry data on an open, scalable platform. Spot expedites threat detection, investigation, and remediation via machine learning and consolidates all enterprise security data into a comprehensive IT telemetry hub based on open data models. Spot’s scalability and machine learning capabilities support an ecosystem of ML-based applications that can run  [...]
-            	</div>
-            </div>
-
-            <div id="content">
-                <div id="inner-content" class="wrap cf">
-                    <main id="main" class="m-all t-all d-all cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-                        <h1 class="center">Apache Spot Advantages</h1>
-                        <p style="text-align: center;"><img src="library/images/advantages-1.png" alt="advantages" width="958" height="433" class="aligncenter size-full" />
-                        </p>
-                    </main>
-                </div>
-            </div>
-
-            <div id="and">
-                <div class="wrap cf">
-                    <div class="and-row">
-                        <div class="and-cell">
-                            <img src="library/images/and.png" alt="" />
-                        </div>
-                        <div class="and-cell">
-                            <p>
-                                Apache Spot is functional after just one day and just keeps improving through feedback and machine learning.
-                            </p>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div id="how-it-works">
-                <div class="wrap cf">
-                    <div class="m-all t-1of3 d-1of3">
-                        <h1>How It Works</h1>
-                        <p>
-                            Apache Spot uses machine learning as a filter for separating bad traffic from benign and to characterize the unique behavior of network traffic. A proven process, of context enrichment, noise filtering, whitelisting and heuristics, is also applied to network data to produce a shortlist of most likely security threats.
-                        </p>
-                        <p class="btn-margin">
-                            <a href="https://github.com/apache/incubator-spot" class="y-btn">More Info</a>
-                        </p>
-                    </div>
-                    <div class="m-all t-2of3 d-2of3">
-                        <img src="library/images/how-it-works.png" alt="" />
-                    </div>
-                </div>
-            </div>
-
-            <div id="key-features">
-                <div class="wrap cf">
-                    <h1>Key Features</h1>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/magnify-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Suspicious DNS packets</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Apache Spot is capable of performing deep-packet inspection of DNS traffic to build a profile of probable and improbable DNS payloads. After visualizing, normalizing, and conducting pattern searches, the analyst has a shortlist of the most likely threats present in DNS traffic.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/threat-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Threat Incident and Response</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Given an IP address, Apache Spot gathers all the characteristics about the communication associated with it – the “social network” of that IP address.  Then Apache Spot builds a timeline of the conversations that originated with that IP.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/connects.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Suspicious Connects</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Apache Spot uses advanced machine learning to build a model of the machines on the network and their communication patterns.  The connections between the machines that are the lowest probability are then visualized, filtered for noise, and searched for known patterns.  The result is the most likely threat patterns in the data, a few hundred flows picked from billions.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/storyboard-icon.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Storyboard</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            After an analyst has investigated a threat, the need still exists to communicate the event up and across the organization.  A “dashboard” gives quick answers to the questions you already know to ask.  What the analyst requires is a “storyboard,” something that tells who, what, where, and how of the story in words and interactive visualizations.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/SPOT_OpenDataModel-Icon_v1.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Open Data Models</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Spot provides common open data model for network, endpoint, and user – Open Data Models. These Open Data Models provide a standard format of enriched event data that makes it easier to integrate cross application data to gain complete enterprise visibility and develop net new analytic functionality.  Spot’s Open Data Models helps organizations quickly share new analytics with one another as new threats are discovered.
-                        </p>
-                    </div>
-                    <div class="m-all t-1of2 d-1of2">
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell">
-                                    <img src="library/images/SPOT_Collabration-Icon_v2.png" alt="" />
-                                </div>
-                                <div class="table-cell">
-                                    <h3>Collaboration</h3>
-                                </div>
-                            </div>
-                        </div>
-                        <p>
-                            Spot’s Open Data Models help organizations quickly share new analytics with one another as new threats are discovered.  And, with Hadoop, organizations able to run these analytics against comprehensive historic data sets, helping organizations identify past threats that have slipped through the cracks. With this capability, Spot aims to give security professionals the ability to collaborate like cybercriminals do.
-                        </p>
-                    </div>
-
-                    <div class="cf"></div>
-                    <p class="btn-margin">
-                        <a href="https://github.com/apache/incubator-spot" class="y-btn">More Info</a>
-                    </p>
-                </div>
-            </div>
-            
-            <div id="open-data-models">
-            	<div class="wrap cf">
-            		<h1 class="center">Apache Spot Open Data Models (ODM)</h1>
-            		<div class="m-all t-1of2 d-1of2 center">
-            			<img src="library/images/odm.png" alt="Apache Spot Open Data Models">
-            		</div>
-            		<div class="m-all t-1of2 d-1of2">
-            			<p>The primary use case initially supported by Spot includes Network Traffic Analysis for network flows (Netflow, sflow, etc.), DNS and Proxy.  The Spot open data model strategy aims to extend Spot capabilities to support a broader set of cybersecurity use cases.</p>
-            			<h3>ODM at a Glance</h3>
-            			<ul>
-            				<li>Includes a growing catalog of packaged ingestion pipelines for common data sources</li>
-            				<li>Enriched events provide full context leading to better analytics and faster incident response</li>
-            				<li>Organizations maintain and control a single copy of their security data</li>
-            			</ul>
-            			<p class="btn-margin"><a href="<?php echo BASE_URL; ?>/project-components/open-data-models/" class="y-btn">Read More</a></p>
-            		</div>
-            	</div>
-            </div>
-
-            <div id="user-stories">
-                <div class="wrap cf">
-                    <h1>Spot Fosters a Rich Application Ecosystem</h1>
-                    <p class="btn-margin center">
-                        Spot accelerates the development of cybersecurity applications by providing a cybersecurity analytics framework.  This means more solutions can be created faster. This is because Spot allows organizations to focus developing the analytics and visualizations for applications that discover cybercrime rather than spending time building systems to ingest, integrate, store, and process myriad volumes or varieties of security data.
-                    </p>
-                    
-                    <p class="center">Join the Apache Spot community and collaborate with us using a common framework.</p>
-                    
-                    <div class="community">
-                    	<img src="library/images/community/endgame.png" alt="Endgame" />
-                    	<img src="library/images/community/intel.png" alt="Intel" />
-                    	<img src="library/images/community/webroot.png" alt="Webroot" />
-                    	<img src="library/images/community/jask.png" alt="Jask" />
-                    	<img src="library/images/community/cloudera.png" alt="Cloudera" />
-                    	<img src="library/images/community/cloudwick.png" alt="Cloudwick" />
-                    	<img src="library/images/community/cybraics.png" alt="Cybraics" />
-                    	<img src="library/images/community/centrify.png" alt="Centrify" />
-                    	<img src="library/images/community/ebay.png" alt="Ebay" />
-                    	<img src="library/images/community/semantix.png" alt="Ebay" />
-                    	<img src="library/images/community/rich-it.png" alt="Ebay" />
-                    	
-                    </div>
-
-                </div>
-            </div>
-
-            <div id="use-case">
-                <div class="wrap cf">
-
-                    <h1>Use Case</h1>
-                    <div class="quotes">
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="library/images/quote-person.png" alt="" />
-                                    <h3>Senior Analyst</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...that allows me to see and customize the data and scripts to my enviroment. I want control over how the solution works.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="library/images/quote-person.png" alt="" />
-                                    <h3>Junior Analyst</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...that automatically alerts me to actionable suspicious events and ways to optimize my network in a timely fashion. Help me investigate these events and tell the story across stakeholders in my organization.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="table">
-                            <div class="table-row">
-                                <div class="table-cell quote-man">
-                                    <img src="library/images/quote-person.png" alt="" />
-                                    <h3>Decision Maker</h3>
-                                </div>
-                                <div class="table-cell">
-                                    <p>
-                                        ...tells me the story of what happened in a way I can understand so I can make decisions as a result.”
-                                    </p>
-                                </div>
-                            </div>
-                        </div>
-
-                    </div>
-
-                </div>
-
-                <div class="arrow">
-                    <div class="wrap cf">
-                        <p>
-                            Identify the needle in the haystack with <strong>patterns</strong> that provide insight into potential threats.
-                        </p>
-                    </div>
-                </div>
-            </div>
-            
-<?php include 'includes/prefooter.php'; ?>
-<?php include 'includes/footer.php'; ?>
\ No newline at end of file
diff --git a/category/index.php b/project-components/index.html
similarity index 100%
rename from category/index.php
rename to project-components/index.html
diff --git a/project-components/ingestion/index.html b/project-components/ingestion/index.html
new file mode 100755
index 0000000..58d49a1
--- /dev/null
+++ b/project-components/ingestion/index.html
@@ -0,0 +1,205 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Ingestion - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="page">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children active">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li class="active"><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+			<!--
+            <div id="masthead">
+                <div class="wrap cf">
+                    <div class="m-all d-1of2 right-center">
+						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
+                    </div>
+                </div>
+            </div>-->
+
+            
+            <div id="content">
+            	
+            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
+            		<div class="main">
+            			<h1 class="page-title">Apache Spot Ingestion</h1>
+            			
+            			<p>Apache Spot overcomes the challenge of how to enhance data collection from different sources when most of the time our collectors are sending thousands of events per second overflowing available server resources (CPU, memory).  With Spot, you can ensure service availability near to 100% without losing data. Spot enables a faster, scalable and distributed service when required. Because of its distributed architecture, data loss does not occur when data queuing on the dat [...]
+            			
+            			<p><img src="../../library/images/ingestion.png" alt="" /></p>
+            			
+            			<h3>Inside the Ingest</h3>
+            			
+            			<h4><em>Spot-Collectors</em></h4>
+            			
+            			<p>Daemons running in the background monitor/collect from file system paths. Collectors detect new files generated by network tools or data generated previously and left in the path for its collection. Collectors then translate this data into a human-readable format by using dissection tools, such as nfdump and tshark.</p>
+            			
+            			<p>Once the data is transformed, collectors store the data in HDFS with the original format (for forensics) and in Hive, in Avro-parquet format, so the data can be accessible by SQL queries.</p>
+            			<p>Once a file has been uploaded there two paths are available.</p>
+            			
+            			<ol>
+            				<li>Data size > 1mb: File name and location in HDFS is sent to Kafka.</li>
+            				<li>Data size < 1mb: the data event is sent to Kafka to be processed with Spark Streaming.</li>
+            			</ol>
+            			
+            			<h4><em>Kafka</em></h4>
+            			
+            			<p>A new topic is created for each instance of the ingest process. Partitions are defined by the number of Spot Workers in the ingest.  Kafka stores data sent by the collectors, so the Spot Workers can parse the data.</p>
+            			
+            			<h4><em>Spot Workers</em></h4>
+            			
+            			<p>Just like the collectors, Spot Workers are daemons running in the background subscribed to a specific Kafka topic and partition. The Spot Workers read, parse and store the data in a specific Hive tables that will be consumed by the machine learning algorithm later.</p>
+            			
+            			<p>Currently there are two types of Spot Workers.</p>
+            			
+            			<ol>
+            				<li>Python workers use multithreading to process data with the defined parsers.</li>
+            				<li>Spark-Streaming workers execute a Spark application to read data from Kafka, using spark-streaming context (micro batching).</li>
+            			</ol>          			
+            			
+            		</div>
+
+            	</div>
+            	
+            </div>
+
+
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="../../library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="../../library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/project-components/ingestion/index.php b/project-components/ingestion/index.php
deleted file mode 100755
index 6305506..0000000
--- a/project-components/ingestion/index.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "page";
-$pageTitle = "Ingestion - Apache Spot";
-$description = "";
-$currentPage = 'ingestion';
-?>
-<?php include '../../includes/header.php'; ?>
-
-			<!--
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all d-1of2 right-center">
-						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
-                    </div>
-                </div>
-            </div>-->
-
-            
-            <div id="content">
-            	
-            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
-            		<div class="main">
-            			<h1 class="page-title">Apache Spot Ingestion</h1>
-            			
-            			<p>Apache Spot overcomes the challenge of how to enhance data collection from different sources when most of the time our collectors are sending thousands of events per second overflowing available server resources (CPU, memory).  With Spot, you can ensure service availability near to 100% without losing data. Spot enables a faster, scalable and distributed service when required. Because of its distributed architecture, data loss does not occur when data queuing on the dat [...]
-            			
-            			<p><img src="../../library/images/ingestion.png" alt="" /></p>
-            			
-            			<h3>Inside the Ingest</h3>
-            			
-            			<h4><em>Spot-Collectors</em></h4>
-            			
-            			<p>Daemons running in the background monitor/collect from file system paths. Collectors detect new files generated by network tools or data generated previously and left in the path for its collection. Collectors then translate this data into a human-readable format by using dissection tools, such as nfdump and tshark.</p>
-            			
-            			<p>Once the data is transformed, collectors store the data in HDFS with the original format (for forensics) and in Hive, in Avro-parquet format, so the data can be accessible by SQL queries.</p>
-            			<p>Once a file has been uploaded there two paths are available.</p>
-            			
-            			<ol>
-            				<li>Data size > 1mb: File name and location in HDFS is sent to Kafka.</li>
-            				<li>Data size < 1mb: the data event is sent to Kafka to be processed with Spark Streaming.</li>
-            			</ol>
-            			
-            			<h4><em>Kafka</em></h4>
-            			
-            			<p>A new topic is created for each instance of the ingest process. Partitions are defined by the number of Spot Workers in the ingest.  Kafka stores data sent by the collectors, so the Spot Workers can parse the data.</p>
-            			
-            			<h4><em>Spot Workers</em></h4>
-            			
-            			<p>Just like the collectors, Spot Workers are daemons running in the background subscribed to a specific Kafka topic and partition. The Spot Workers read, parse and store the data in a specific Hive tables that will be consumed by the machine learning algorithm later.</p>
-            			
-            			<p>Currently there are two types of Spot Workers.</p>
-            			
-            			<ol>
-            				<li>Python workers use multithreading to process data with the defined parsers.</li>
-            				<li>Spark-Streaming workers execute a Spark application to read data from Kafka, using spark-streaming context (micro batching).</li>
-            			</ol>          			
-            			
-            		</div>
-					<!--<?php include '../../includes/download-sidebar.php';?>-->
-            	</div>
-            	
-            </div>
-
-
-<?php include '../../includes/prefooter.php'; ?>
-<?php include '../../includes/footer.php'; ?>
\ No newline at end of file
diff --git a/project-components/machine-learning/index.html b/project-components/machine-learning/index.html
new file mode 100755
index 0000000..d0c7d42
--- /dev/null
+++ b/project-components/machine-learning/index.html
@@ -0,0 +1,183 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Machine Learning - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="page">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children active">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li class="active"><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+			<!--
+            <div id="masthead">
+                <div class="wrap cf">
+                    <div class="m-all d-1of2 right-center">
+						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
+                    </div>
+                </div>
+            </div>-->
+
+            
+            <div id="content">
+            	
+            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
+            		<div class="main">
+            			<h1 class="page-title">Apache Spot Machine Learning</h1>
+            			            			
+            			<p>The machine learning component of Apache Spot contains routines for performing suspicious connections analyses on netflow, DNS or proxy logs gathered from a network. These analyses consume a collection of network events and produce a list of the events that are considered to be the least probable, and these are consider the most suspicious.  They rely on the ingest component of Spot to collect and load netflow, DNS, and proxy records.</p>
+            			
+            			<p>Apache Spot uses topic modeling to discover normal and abnormal behavior. It treats the collection of logs related to an IP as a document and uses Latent Dirichlet Allocation (LDA) to discover hidden semantic structures in the collection of such documents.   </p>
+            			
+            			<p>LDA is a generative probabilistic model used for discrete data, such as text corpora. LDA is a three-level Bayesian model in which each word of a document is generated from a mixture of an underlying set of topics [1]. We apply LDA to network traffic by converting network log entries into words through aggregation and discretization. In this manner, documents correspond to IP addresses, words to log entries (related to an IP address) and topics to profiles of common net [...]
+            			
+            			<p><img src="../../library/images/machine-learning.png" alt="" /></p>
+            			
+            			<p>Apache Spot infers a probabilistic model for the network behavior of each IP address. Each network log entry is assigned an estimated probability (score) by the model. The events with lower scores are flagged as “suspicious” for further analysis.</p>
+
+						<p class="citation">[1] Blei, David M., Andrew Y. Ng, and Michael I. Jordan. "Latent dirichlet allocation." Journal of machine Learning research 3, no. Jan (2003): 993-1022.</p>
+            		</div>
+					
+            	</div>
+            	
+            </div>
+
+
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="../../library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="../../library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/project-components/machine-learning/index.php b/project-components/machine-learning/index.php
deleted file mode 100755
index 72de1ed..0000000
--- a/project-components/machine-learning/index.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "page";
-$pageTitle = "Machine Learning - Apache Spot";
-$description = "";
-$currentPage = 'machine-learning';
-?>
-<?php include '../../includes/header.php'; ?>
-
-			<!--
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all d-1of2 right-center">
-						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
-                    </div>
-                </div>
-            </div>-->
-
-            
-            <div id="content">
-            	
-            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
-            		<div class="main">
-            			<h1 class="page-title">Apache Spot Machine Learning</h1>
-            			            			
-            			<p>The machine learning component of Apache Spot contains routines for performing suspicious connections analyses on netflow, DNS or proxy logs gathered from a network. These analyses consume a collection of network events and produce a list of the events that are considered to be the least probable, and these are consider the most suspicious.  They rely on the ingest component of Spot to collect and load netflow, DNS, and proxy records.</p>
-            			
-            			<p>Apache Spot uses topic modeling to discover normal and abnormal behavior. It treats the collection of logs related to an IP as a document and uses Latent Dirichlet Allocation (LDA) to discover hidden semantic structures in the collection of such documents.   </p>
-            			
-            			<p>LDA is a generative probabilistic model used for discrete data, such as text corpora. LDA is a three-level Bayesian model in which each word of a document is generated from a mixture of an underlying set of topics [1]. We apply LDA to network traffic by converting network log entries into words through aggregation and discretization. In this manner, documents correspond to IP addresses, words to log entries (related to an IP address) and topics to profiles of common net [...]
-            			
-            			<p><img src="../../library/images/machine-learning.png" alt="" /></p>
-            			
-            			<p>Apache Spot infers a probabilistic model for the network behavior of each IP address. Each network log entry is assigned an estimated probability (score) by the model. The events with lower scores are flagged as “suspicious” for further analysis.</p>
-
-						<p class="citation">[1] Blei, David M., Andrew Y. Ng, and Michael I. Jordan. "Latent dirichlet allocation." Journal of machine Learning research 3, no. Jan (2003): 993-1022.</p>
-            		</div>
-            		
-					<!--<?php include '../../includes/download-sidebar.php';?>-->
-					
-            	</div>
-            	
-            </div>
-
-
-<?php include '../../includes/prefooter.php'; ?>
-<?php include '../../includes/footer.php'; ?>
\ No newline at end of file
diff --git a/project-components/open-data-models/index.html b/project-components/open-data-models/index.html
new file mode 100755
index 0000000..7a39767
--- /dev/null
+++ b/project-components/open-data-models/index.html
@@ -0,0 +1,188 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Open Data Models - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="page">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children active">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li class="active"><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            
+            <div id="content">
+            	
+            	<div class="wrap cf with-sidebar"><!--if page has sidebar, add class "with-sidebar"-->
+            		<div class="main">
+            			<h1 class="page-title">Apache Spot Open Data Model</h1>
+            			           			
+            			<p>Many organizations have built threat detection capabilities leveraging myriad vendor solutions.  This approach leads to many silos of data corresponding to each vendor and often results in storing multiple copies of the same data, as each vendor’s capability operates independently from the others. There is no single vendor able to cost-effectively store and analyze all the data required to detect threats and facilitate incident investigations and remediation.</p>
+            			
+            			<p>Apache Spot ODM brings together all security-related data (event, user, network, endpoint, etc.) into a singular view that can be used to detect threats more effectively than ever before.  This consolidated view can be leveraged to create new analytic models that were not previously possible and to provide needed context at the event level to effectively determine whether or not there is a threat.  The Apache Spot ODM enables the sharing and reuse of threat detection mo [...]
+            			
+            			<p>The open data model (ODM) provides a common taxonomy for describing security telemetry data used to detect threats. It uses schemas, data structures, file formats and configurations in the underlying CDH platform for collecting, storing and analyzing security telemetry data at scale. Spot defines relationships amongst the various security data types for joining log data with user, network and endpoint entity data.</p>
+            			
+            			<p>The Apache Spot ODM enables organizations to:</p>
+            			<ul>
+            				<li>Store one copy of the security telemetry data and apply UNLIMITED analytics
+            					<ul>
+            						<li>Leverage out-of-the-box analytics powered by machine learning to detect threats in DNS, Flow and Proxy data</li>
+            						<li>Build custom analytics to your desired specification</li>
+            						<li>Plug-in third-party vendor analytics that interoperate with the ODM</li>
+            					</ul>	
+        					</li>
+            				<li>Share and/or reuse threat detection models, algorithms, ingest pipelines, visualizations and analytics across the Apache Spot community, due to a common data model.</li>
+            				<li>Leverage all your security telemetry data to establish the context needed to better detect threats
+            					<ul>
+            						<li>Security logs</li>
+            						<li>User, endpoint and network entity data</li>
+            						<li>Threat intelligence data</li>
+            					</ul>	
+        					</li>
+        					<li>Avoid “lock-in” to a specific technology and gain needed analytic flexibility resultant from a shared, open data model.</li>
+            			</ul>
+            		</div>
+            		
+					
+            	</div>
+            	
+            </div>
+
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="../../library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="../../library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/project-components/open-data-models/index.php b/project-components/open-data-models/index.php
deleted file mode 100755
index 9b95d9f..0000000
--- a/project-components/open-data-models/index.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "page";
-$pageTitle = "Open Data Models - Apache Spot";
-$description = "";
-$currentPage = 'open-data-models';
-?>
-<?php include '../../includes/header.php'; ?>
-
-			<!--
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all d-1of2 right-center">
-						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
-                    </div>
-                </div>
-            </div>-->
-
-            
-            <div id="content">
-            	
-            	<div class="wrap cf with-sidebar"><!--if page has sidebar, add class "with-sidebar"-->
-            		<div class="main">
-            			<h1 class="page-title">Apache Spot Open Data Model</h1>
-            			           			
-            			<p>Many organizations have built threat detection capabilities leveraging myriad vendor solutions.  This approach leads to many silos of data corresponding to each vendor and often results in storing multiple copies of the same data, as each vendor’s capability operates independently from the others. There is no single vendor able to cost-effectively store and analyze all the data required to detect threats and facilitate incident investigations and remediation.</p>
-            			
-            			<p>Apache Spot ODM brings together all security-related data (event, user, network, endpoint, etc.) into a singular view that can be used to detect threats more effectively than ever before.  This consolidated view can be leveraged to create new analytic models that were not previously possible and to provide needed context at the event level to effectively determine whether or not there is a threat.  The Apache Spot ODM enables the sharing and reuse of threat detection mo [...]
-            			
-            			<p>The open data model (ODM) provides a common taxonomy for describing security telemetry data used to detect threats. It uses schemas, data structures, file formats and configurations in the underlying CDH platform for collecting, storing and analyzing security telemetry data at scale. Spot defines relationships amongst the various security data types for joining log data with user, network and endpoint entity data.</p>
-            			
-            			<p>The Apache Spot ODM enables organizations to:</p>
-            			<ul>
-            				<li>Store one copy of the security telemetry data and apply UNLIMITED analytics
-            					<ul>
-            						<li>Leverage out-of-the-box analytics powered by machine learning to detect threats in DNS, Flow and Proxy data</li>
-            						<li>Build custom analytics to your desired specification</li>
-            						<li>Plug-in third-party vendor analytics that interoperate with the ODM</li>
-            					</ul>	
-        					</li>
-            				<li>Share and/or reuse threat detection models, algorithms, ingest pipelines, visualizations and analytics across the Apache Spot community, due to a common data model.</li>
-            				<li>Leverage all your security telemetry data to establish the context needed to better detect threats
-            					<ul>
-            						<li>Security logs</li>
-            						<li>User, endpoint and network entity data</li>
-            						<li>Threat intelligence data</li>
-            					</ul>	
-        					</li>
-        					<li>Avoid “lock-in” to a specific technology and gain needed analytic flexibility resultant from a shared, open data model.</li>
-            			</ul>
-            		</div>
-            		
-					<!--<?php include '../../includes/download-sidebar.php';?>-->
-					
-            	</div>
-            	
-            </div>
-
-<?php include '../../includes/prefooter.php'; ?>
-<?php include '../../includes/footer.php'; ?>
\ No newline at end of file
diff --git a/project-components/visualization/index.html b/project-components/visualization/index.html
new file mode 100755
index 0000000..cb10290
--- /dev/null
+++ b/project-components/visualization/index.html
@@ -0,0 +1,204 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Visualization - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="page">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children active">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li class="active"><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+            <div id="content">
+            	
+            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
+            		<div class="main">
+            			<h1 class="page-title">Visualization</h1>
+            			<h3>Take advantage of Apache Spot's tools to perform further analysis over the suspicious activity detected by our machine learning algorithm</h3>
+            			
+            			<h4>Suspicious</h4>
+            			
+            			<p>Study <strong>suspicious</strong> network activity by looking at a list of security threats detected by Apache Spot's machine learning algorithm.</p>
+            			
+            			<p><img src="../../library/images/suspicious.png" alt="" /></p>
+            			
+            			<p>Have a nice view of your network, understand how devices interact with each other and easily spot threats while exploring a visual representation of suspicious activity.</p>
+            			
+            			<p><img src="../../library/images/network.png" alt="" /></p>
+            			
+            			<p>The following feature is powered by IPython notebooks which allows the users to switch back and forth from the 'easy mode' to the 'expert mode', where they can view and edit the code behind this panel via the web browser.</p>
+            			
+            			<p>In the 'Notebook' panel, the form displayed is where the user can assign the level of risk for each connection and use that as feedback to train the Machine Learning model in future executions. Switching to the 'expert' mode, the user can adjust the criteria to filter the data, discarding results known to be non relevant to the analysis.</p>
+            			
+            			<p><img src="../../library/images/notebook.png" alt="" /></p>
+            			
+            			<p>As your investigation moves forward, get <strong>detailed</strong> information about a threat whenever you want to dig into an especific threat.</p>
+            			
+            			<p><img src="../../library/images/details.png" alt="" /></p>
+            			
+            			<h4>Threat Investigation</h4>
+            			
+            			<p>The threat investigation panel represents the last step of analysis before displaying the storyboard. At this point, the security analysts can enter a custom review for a given threat to display.</p>
+            			
+            			<h4>Storyboard</h4>
+            			
+            			<p>Ready to present your findings? Go over your high risk security threats and request further information, making it easy for executives to undestand what is going on. Here is a list of some of the information you will get when your analyses comes to the end.</p>
+            			
+            			<ul>
+            				<li>Incident Progression</li>
+            				<li>Impact Analysis</li>
+            				<li>Geographic location</li>
+            				<li>Incident Timeline</li>
+            			</ul>
+            			
+            			<h4>Ingest Summary</h4>
+            			
+            			<p>Wondering about how much data have been ingested on your cluster? We provide a nice visualization which allows you to get this information.</p>
+            			
+            			<p><img src="../../library/images/ingest-summary.png" alt="" /></p>
+            			
+            			<p>The "scoring panel" as well as the "Threat investigation panel" are powered by Jupyter notebooks, <a href="https://jupyter-notebook-beginner-guide.readthedocs.io/en/latest/what_is_jupyter.html" target="_blank">(click here to learn more)</a>.</p>
+            		</div>
+					
+            	</div>
+            	
+            </div>
+
+
+            <div id="more-info">
+                <div class="wrap cf">
+                    <p class="social-icons">
+                        <a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a><a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></span><a href="http://slack.apache-spot.io/" target="_blank"><img src="../../library/images/add-to-slack.png" alt="" class="add-to-slack" /></a></a>
+                    </p>
+
+                    <p>
+                        <a href="https://github.com/apache/incubator-spot" class="y-btn" target="_blank">More Info</a>
+                    </p>
+
+                    <p style="margin-top:50px;"><img src="../../library/images/apache-incubator.png" alt="Apache Incubator" />
+                    </p>
+
+                    <p class="disclaimer">
+                        Apache Spot is an effort undergoing incubation at The Apache Software Foundation (ASF), sponsored by the Apache Incubator. Incubation is required of all newly accepted projects until a further review indicates that the infrastructure, communications, and decision making process have stabilized in a manner consistent with other successful ASF projects. While incubation status is not necessarily a reflection of the completeness or stability of the code, it does indi [...]
+                    </p>
+
+                    <p class="disclaimer">
+                        The contents of this website are © 2016 Apache Software Foundation under the terms of the Apache License v2. Apache Spot and its logo are trademarks of the Apache Software Foundation.
+                    </p>
+                </div>
+            </div>
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/project-components/visualization/index.php b/project-components/visualization/index.php
deleted file mode 100755
index cd6b0a7..0000000
--- a/project-components/visualization/index.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "page";
-$pageTitle = "Visualization - Apache Spot";
-$description = "";
-$currentPage = 'visualization';
-?>
-<?php include '../../includes/header.php'; ?>
-
-			<!--
-            <div id="masthead">
-                <div class="wrap cf">
-                    <div class="m-all d-1of2 right-center">
-						<h1>Lorem ispum dolor sit amet, consectetur adipisicing elit</h1>
-                    </div>
-                </div>
-            </div>-->
-
-            
-            <div id="content">
-            	
-            	<div class="wrap cf"><!--if page has sidebar, add class "with-sidebar"-->
-            		<div class="main">
-            			<h1 class="page-title">Visualization</h1>
-            			<h3>Take advantage of Apache Spot's tools to perform further analysis over the suspicious activity detected by our machine learning algorithm</h3>
-            			
-            			<h4>Suspicious</h4>
-            			
-            			<p>Study <strong>suspicious</strong> network activity by looking at a list of security threats detected by Apache Spot's machine learning algorithm.</p>
-            			
-            			<p><img src="../../library/images/suspicious.png" alt="" /></p>
-            			
-            			<p>Have a nice view of your network, understand how devices interact with each other and easily spot threats while exploring a visual representation of suspicious activity.</p>
-            			
-            			<p><img src="../../library/images/network.png" alt="" /></p>
-            			
-            			<p>The following feature is powered by IPython notebooks which allows the users to switch back and forth from the 'easy mode' to the 'expert mode', where they can view and edit the code behind this panel via the web browser.</p>
-            			
-            			<p>In the 'Notebook' panel, the form displayed is where the user can assign the level of risk for each connection and use that as feedback to train the Machine Learning model in future executions. Switching to the 'expert' mode, the user can adjust the criteria to filter the data, discarding results known to be non relevant to the analysis.</p>
-            			
-            			<p><img src="../../library/images/notebook.png" alt="" /></p>
-            			
-            			<p>As your investigation moves forward, get <strong>detailed</strong> information about a threat whenever you want to dig into an especific threat.</p>
-            			
-            			<p><img src="../../library/images/details.png" alt="" /></p>
-            			
-            			<h4>Threat Investigation</h4>
-            			
-            			<p>The threat investigation panel represents the last step of analysis before displaying the storyboard. At this point, the security analysts can enter a custom review for a given threat to display.</p>
-            			
-            			<h4>Storyboard</h4>
-            			
-            			<p>Ready to present your findings? Go over your high risk security threats and request further information, making it easy for executives to undestand what is going on. Here is a list of some of the information you will get when your analyses comes to the end.</p>
-            			
-            			<ul>
-            				<li>Incident Progression</li>
-            				<li>Impact Analysis</li>
-            				<li>Geographic location</li>
-            				<li>Incident Timeline</li>
-            			</ul>
-            			
-            			<h4>Ingest Summary</h4>
-            			
-            			<p>Wondering about how much data have been ingested on your cluster? We provide a nice visualization which allows you to get this information.</p>
-            			
-            			<p><img src="../../library/images/ingest-summary.png" alt="" /></p>
-            			
-            			<p>The "scoring panel" as well as the "Threat investigation panel" are powered by Jupyter notebooks, <a href="https://jupyter-notebook-beginner-guide.readthedocs.io/en/latest/what_is_jupyter.html" target="_blank">(click here to learn more)</a>.</p>
-            		</div>
-            		
-					<!--<?php include '../../includes/download-sidebar.php';?>-->
-					
-            	</div>
-            	
-            </div>
-
-
-<?php include '../../includes/prefooter.php'; ?>
-<?php include '../../includes/footer.php'; ?>
\ No newline at end of file
diff --git a/tag/github/index.html b/tag/github/index.html
new file mode 100755
index 0000000..ea7ce75
--- /dev/null
+++ b/tag/github/index.html
@@ -0,0 +1,211 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Github - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Tag: github</h1>
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/tag/github/index.php b/tag/github/index.php
deleted file mode 100755
index fb1611c..0000000
--- a/tag/github/index.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive tag";
-$pageTitle = "Github - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Tag: github</h1>
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-    </body>
-
-</html>
\ No newline at end of file
diff --git a/2016/index.php b/tag/index.html
similarity index 100%
rename from 2016/index.php
rename to tag/index.html
diff --git a/tag/open-network-insight/index.html b/tag/open-network-insight/index.html
new file mode 100755
index 0000000..d797b2f
--- /dev/null
+++ b/tag/open-network-insight/index.html
@@ -0,0 +1,211 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Open Network Insight - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="http://spot.incubator.apache.org/favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="../../contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
+
+                        <h1 class="page-title">Tag: open network insight</h1>
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/tag/open-network-insight/index.php b/tag/open-network-insight/index.php
deleted file mode 100755
index ad6965b..0000000
--- a/tag/open-network-insight/index.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive tag";
-$pageTitle = "Open Network Insight - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Tag: open network insight</h1>
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->
diff --git a/tag/open-source/index.html b/tag/open-source/index.html
new file mode 100755
index 0000000..489d631
--- /dev/null
+++ b/tag/open-source/index.html
@@ -0,0 +1,211 @@
+<!doctype html>
+
+<!--[if lt IE 7]><html lang="en-US" class="no-js lt-ie9 lt-ie8 lt-ie7"><![endif]-->
+<!--[if (IE 7)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9 lt-ie8"><![endif]-->
+<!--[if (IE 8)&!(IEMobile)]><html lang="en-US" class="no-js lt-ie9"><![endif]-->
+<!--[if gt IE 8]><!-->
+<html lang="en-US" class="no-js">
+    <!--<![endif]-->
+
+    <head>
+        <meta charset="utf-8">
+
+        <meta http-equiv="X-UA-Compatible" content="IE=edge">
+
+        <title>Open Source - Apache Spot</title>
+
+        <meta name="HandheldFriendly" content="True">
+        <meta name="MobileOptimized" content="320">
+        <meta name="viewport" content="width=device-width, initial-scale=1"/>
+
+        <link rel="apple-touch-icon" href="../../library/images/apple-touch-icon.png">
+        <link rel="icon" href="../../favicon.png">
+        <!--[if IE]>
+        <link rel="shortcut icon" href="../../favicon.ico">
+        <![endif]-->
+        <meta name="msapplication-TileColor" content="#f01d4f">
+        <meta name="msapplication-TileImage" content="../../library/images/win8-tile-icon.png">
+        <meta name="theme-color" content="#121212">
+
+        <link rel='dns-prefetch' href='//fonts.googleapis.com' />
+        <link rel='dns-prefetch' href='//s.w.org' />
+        <link rel="alternate" type="application/rss+xml" title="Apache Spot &raquo; Feed" href="../../feed/" />
+
+        <link rel='stylesheet' id='googleFonts-css'  href='http://fonts.googleapis.com/css?family=Lato%3A400%2C700%2C400italic%2C700italic' type='text/css' media='all' />
+        <link rel='stylesheet' id='bones-stylesheet-css'  href='../../library/css/style.css' type='text/css' media='all' />
+        <!--[if lt IE 9]>
+        <link rel='stylesheet' id='bones-ie-only-css'  href='http://spot.incubator.apache.org/library/css/ie.css' type='text/css' media='all' />
+        <![endif]-->
+        <link rel='stylesheet' id='mm-css-css'  href='../../library/css/meanmenu.css' type='text/css' media='all' />
+        <script type='text/javascript' src='../../library/js/libs/modernizr.custom.min.js'></script>
+        <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script>
+        <script type='text/javascript' src='../../library/js/jquery-migrate.min.js'></script>
+        <script type='text/javascript' src='../../library/js/jquery.meanmenu.js'></script>
+
+		<script>
+		  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+		  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+		  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+		  })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+		
+		  ga('create', 'UA-87470508-1', 'auto');
+		  ga('send', 'pageview');
+		
+		</script>
+    </head>
+
+    <body class="archive tag">
+
+        <div id="container">
+			<div class="social-sidebar">
+				<a href="mailto:info@open-network-insight.org"><span class="icon-envelope"></span></a>
+				<a href="https://twitter.com/ApacheSpot" target="_blank"><span class="icon-twitter"></a>
+				<a href="http://slack.apache-spot.io/" target="_blank"><span class="icon-slack"></span></a>				
+			</div>
+            <header class="header">
+
+                <div id="inner-header" class="wrap cf">
+
+                    <p id="logo" class="h1" itemscope itemtype="http://schema.org/Organization">
+                        <a href="http://spot.incubator.apache.org/" rel="nofollow"><img src="../../library/images/logo.png" alt="Apache Spot" /></a>
+                    </p>
+
+                    <nav>
+                        <ul id="menu-main-menu" class="nav top-nav cf">
+                            <li id="menu-item-129" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-129">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot#try-the-apache-spot-ui-with-example-data">Get Started</a>
+                            </li>
+                            <li id="menu-item-5" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-5">
+                                <a target="_blank" href="https://github.com/apache/incubator-spot.git">Download</a>
+                            </li>
+                            <li id="menu-item-130" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-130">
+                                <a href="http://spot.incubator.apache.org/contribute">Contribute</a>
+                            </li>
+                            <li id="menu-item-106" class="menu-item menu-item-type-custom menu-item-object-custom menu-item-106">
+                                <a href="../../doc">Documentation</a>
+                            </li>
+                            <li class="menu-item menu-item-has-children">
+                                <a href="#">Project Components</a>
+                                <ul class="sub-menu">
+                                	<li><a href="../../project-components/open-data-models">Open Data Models</a></li>
+                                	<li><a href="../../project-components/ingestion">Ingestion</a></li>
+                                	<li><a href="../../project-components/machine-learning">Machine Learning</a></li>
+                                	<li><a href="../../project-components/visualization">Visualization</a></li>
+                                </ul>
+                            </li>
+                            <li id="menu-item-13" class="menu-item menu-item-type-post_type menu-item-object-page menu-item-13 active">
+                                <a href="../../blog">Blog</a>
+                            </li>
+                        </ul>
+                    </nav>
+
+                </div>
+
+            </header>
+
+            <div id="mobile-nav"></div>
+
+            <div id="content">
+
+                <div id="inner-content" class="wrap cf">
+
+                    <main id="main" class="m-all t-2of3 d-5of7 cf">
+
+                        <h1 class="page-title">Tag: open source</h1>
+
+                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
+
+                            <header class="entry-header article-header">
+
+                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
+                                <p class="byline entry-meta vcard">
+                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
+                                        March 29, 2016
+                                    </time>
+                                    </span>
+                                </p>
+
+                            </header>
+
+                            <section class="entry-content cf">
+
+                                <p>
+                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
+                                </p>
+
+                            </section>
+
+                            <footer class="article-footer">
+
+                            </footer>
+
+                        </article>
+
+                    </main>
+
+					<div id="sidebar1" class="sidebar m-all t-1of3 d-2of7 last-col cf" role="complementary">
+					
+						<div id="recent-posts-2" class="widget widget_recent_entries">
+							<h4 class="widgettitle">Recent Posts</h4>
+							<ul>
+								<li>
+									<a href="../../blog/strength-in-numbers-why-consider-open-source-cybersecurity-analytics/">Strength in Numbers:  Why Consider Open Source Cybersecurity Analytics</a>
+								</li>
+								<li>
+									<a href="../../blog/jupyter-notebooks-for-data-analysis/">Jupyter Notebooks for Data Analysis</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-and-cybersecurity-using-netflows-to-detect-threats-to-critical-infrastructure/">Apache Spot (Incubating) and Cybersecurity — Using NetFlows to Detect Threats to  Critical Infrastructure</a>
+								</li>
+								<li>
+									<a href="../../blog/how-apache-spot-helps-create-well-stocked-data-lakes-and-catch-powerful-insights/">How Apache Spot (Incubating) Helps Create Well-Stocked Data Lakes and Catch Powerful Insights</a>
+								</li>
+								<li>
+									<a href="../../blog/apache-spot-3-most-asked-questions/">Apache Spot (Incubating): 3 Most-Asked Questions</a>
+								</li>
+							</ul>
+						</div>
+						<div id="archives-2" class="widget widget_archive">
+							<h4 class="widgettitle">Archives</h4>
+							<ul>
+								<li>
+									<a href='../../2016/10/'>October 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/09/'>September 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/08/'>August 2016</a>
+								</li>
+								<li>
+									<a href='../../2016/03/'>March 2016</a>
+								</li>
+							</ul>
+						</div>
+					
+					</div>
+
+                </div>
+
+            </div>
+
+
+            <footer class="footer" role="contentinfo" itemscope itemtype="http://schema.org/WPFooter">
+
+                <div id="inner-footer" class="wrap cf">
+
+                    <p class="source-org copyright" style="text-align:center;">
+                        &copy; 2016 Apache Spot.
+                    </p>
+
+                </div>
+
+            </footer>
+
+        </div>
+		<a href="#0" class="cd-top">Top</a>
+        <script type='text/javascript' src='../../library/js/scripts.js'></script>
+
+    </body>
+
+</html>
\ No newline at end of file
diff --git a/tag/open-source/index.php b/tag/open-source/index.php
deleted file mode 100755
index b8e749f..0000000
--- a/tag/open-source/index.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php include '../../includes/config.php'; ?>
-<?php
-$bodyclass = "archive tag";
-$pageTitle = "Open Source - Apache Spot";
-$description = "";
-$currentPage = 'blog';
-?>
-<?php include '../../includes/header.php'; ?>
-
-            <div id="content">
-
-                <div id="inner-content" class="wrap cf">
-
-                    <main id="main" class="m-all t-2of3 d-5of7 cf" role="main" itemscope itemprop="mainContentOfPage" itemtype="http://schema.org/Blog">
-
-                        <h1 class="page-title">Tag: open source</h1>
-
-                        <article id="post-62" class="cf post-62 post type-post status-publish format-standard hentry category-security-analytics tag-github tag-apache-spot tag-open-source" role="article">
-
-                            <header class="entry-header article-header">
-
-                                <h3 class="h2 entry-title"><a href="../../blog/apache-spot-3-most-asked-questions/" rel="bookmark" title="Apache Spot: Three Most-Asked Questions">Apache Spot (Incubating): Three Most-Asked Questions</a></h3>
-                                <p class="byline entry-meta vcard">
-                                    <time class="updated entry-time" datetime="2016-03-29" itemprop="datePublished">
-                                        March 29, 2016
-                                    </time>
-                                    </span>
-                                </p>
-
-                            </header>
-
-                            <section class="entry-content cf">
-
-                                <p>
-                                    While this is not the first blog post about Apache Spot, it is the first one by a creator of the solution. As a security data scientist in Intel&#8217;s Data Center Group, I joined a small team to start thinking about solving really hard problems in cloud analytics. The team grew, and out of that&#8230; <a class="excerpt-read-more" href="../../blog/apache-spot-3-most-asked-questions/" title="Read Apache Spot: Three Most-Asked Questions">Read more &raquo;</a>
-                                </p>
-
-                            </section>
-
-                            <footer class="article-footer">
-
-                            </footer>
-
-                        </article>
-
-                    </main>
-
-					<?php include '../../includes/sidebar.php'; ?>
-
-                </div>
-
-            </div>
-
-			<?php include '../../includes/footer.php'; ?>
-
-    </body>
-
-</html>
-<!-- end of site. what a ride! -->