diff --git a/404.html b/404.html
index e53272ab..7259f5a3 100644
--- a/404.html
+++ b/404.html
@@ -21,10 +21,12 @@
     <meta name="twitter:description" content="SVG icons for popular brands.">
     <meta name="twitter:site" content="@bathtype">
     <meta name="twitter:domain" content="Simple Icons">
-    <meta name="twitter:image:src" content="https://simpleicons.org/og.png">
+    <meta name="twitter:image:src" content="https://simpleicons.org/images/og.png">
+    <link rel="icon" type="image/x-icon" href="https://simpleicons.org/images/favicon.ico">
+    <link rel="icon" type="image/png" href="https://simpleicons.org/images/favicon.png">
     <meta name="google-site-verification" content="jn6XSTOvKDg-FP9-O7SUw5qU1CxPOaqhAeNUEkNrz_M">
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
-    <link rel="mask-icon" href="https://simpleicons.org/logo.svg" color="#111111">
+    <link rel="apple-touch-icon" href="https://simpleicons.org/images/apple-touch-icon.png">
+    <link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:400&text=ABCDEFGHIJKLMNOPQERSTUVWXYZ.!%20%23%2B%3F%26%2C1234567890">
     <style>
         html {
diff --git a/apple-touch-icon.png b/images/apple-touch-icon.png
similarity index 100%
rename from apple-touch-icon.png
rename to images/apple-touch-icon.png
diff --git a/favicon.ico b/images/favicon.ico
similarity index 100%
rename from favicon.ico
rename to images/favicon.ico
diff --git a/favicon.png b/images/favicon.png
similarity index 100%
rename from favicon.png
rename to images/favicon.png
diff --git a/logo.svg b/images/logo.svg
similarity index 100%
rename from logo.svg
rename to images/logo.svg
diff --git a/og.png b/images/og.png
similarity index 100%
rename from og.png
rename to images/og.png
diff --git a/images/paypal-header.png b/images/paypal-header.png
new file mode 100644
index 00000000..753b8819
Binary files /dev/null and b/images/paypal-header.png differ
diff --git a/includes/header.html b/includes/header.html
new file mode 100644
index 00000000..2b9aab29
--- /dev/null
+++ b/includes/header.html
@@ -0,0 +1,213 @@
+<!DOCTYPE html>
+<html lang="en" prefix="og: http://ogp.me/ns#">
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="x-ua-compatible" content="ie=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="canonical" href="https://simpleicons.org">
+    <link rel="dns-prefetch" href="//fonts.googleapis.com">
+    <link rel="dns-prefetch" href="//github.com">
+    <link rel="dns-prefetch" href="//raw.githubusercontent.com">
+    <title>Simple Icons</title>
+    <meta name="description" content="SVG icons for popular brands.">
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="Simple Icons">
+    <meta property="og:description" content="SVG icons for popular brands.">
+    <meta property="og:url" content="https://simpleicons.org">
+    <meta property="og:site_name" content="Simple Icons">
+    <meta property="og:image" content="https://simpleicons.org/images/og.png">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:title" content="Simple Icons">
+    <meta name="twitter:description" content="SVG icons for popular brands.">
+    <meta name="twitter:site" content="@bathtype">
+    <meta name="twitter:domain" content="Simple Icons">
+    <meta name="twitter:image:src" content="https://simpleicons.org/images/og.png">
+    <link rel="icon" type="image/x-icon" href="https://simpleicons.org/images/favicon.ico">
+    <link rel="icon" type="image/png" href="https://simpleicons.org/images/favicon.png">
+    <meta name="google-site-verification" content="jn6XSTOvKDg-FP9-O7SUw5qU1CxPOaqhAeNUEkNrz_M">
+    <link rel="apple-touch-icon" href="https://simpleicons.org/images/apple-touch-icon.png">
+    <link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:400&text=ABCDEFGHIJKLMNOPQERSTUVWXYZ.!%20%23%2B%3F%26%2C1234567890">
+    <style>
+        html {
+            font-size: 16px;
+        }
+        body {
+            background-color: #FFF;
+            color: #666;
+            font-family: Lato, sans-serif;
+            -webkit-font-feature-settings: "dlig", "kern", "liga";
+                    font-feature-settings: "dlig", "kern", "liga";
+            -webkit-font-smoothing: antialiased;
+            font-weight: 400;
+            line-height: 1.5rem;
+            margin: 0;
+            -moz-osx-font-smoothing: grayscale;
+        }
+        a {
+            color: #333;
+        }
+        a:focus, a:hover {
+            color: #999;
+        }
+        .navbar {
+            background: #EEE;
+            text-align: center;
+        }
+        .title {
+            font-size: 1rem;
+            font-weight: 400;
+            letter-spacing: 0.05rem;
+            margin: 0;
+            padding: 1.5rem 1.5rem 0;
+            text-transform: uppercase;
+        }
+        .navbar__text {
+            font-size: 0.75rem;
+            letter-spacing: 0.05rem;
+            margin: 0;
+            padding: 0;
+            text-transform: uppercase;
+        }
+        .donate-form {
+            margin: 0;
+            padding: 0 0 1.5rem;
+            text-align: center;
+        }
+        @keyframes pulse {
+            0% {
+                background-color: #CCC;
+            }
+            50% {
+                background-color: #AAA;
+            }
+            100% {
+                background-color: #CCC;
+            }
+        }
+        .donate-button {
+            -webkit-appearance: none;
+            animation: pulse 2.5s infinite;
+            animation-timing-function: ease-in-out;
+            background: #CCC;
+            border: 0;
+            border-radius: 1.5rem;
+            color: #FFF;
+            cursor: pointer;
+            font-family: inherit;
+            font-size: 0.75rem;
+            font-weight: 400;
+            letter-spacing: 0.05rem;
+            padding: 0.75rem 1.5rem;
+            text-transform: uppercase;
+        }
+        .donate-button:focus, .donate-button:hover {
+            animation: none;
+            background: #333;
+        }
+        @media (min-width: 800px) {
+            .navbar {
+                display: flex;
+                justify-content: space-between;
+                text-align: left;
+            }
+            .title {
+                padding: 1.5rem;
+            }
+            .navbar__text {
+                display: inline-block;
+                padding: 1.5rem 0.75rem;
+            }
+            .donate-form {
+                margin: 0 1.5rem 0 0;
+                padding: 0;
+            }
+        }
+        .hero {
+            font-size: 0.75rem;
+            letter-spacing: 0.05rem;
+            margin: 0 auto;
+            max-width: 18rem;
+            padding: 3rem;
+            text-align: center;
+            text-transform: uppercase;
+        }
+        .tiles {
+            display: flex;
+            flex-wrap: wrap;
+            list-style: none;
+            margin: -0.25rem 1.25rem;
+            padding: 0;
+        }
+        .tiles li {
+            box-sizing: border-box;
+            background: #333;
+            border: 0.25rem solid #FFF;
+            color: #FFF;
+            font-size: 0.75rem;
+            letter-spacing: 0.05rem;
+            line-height: 1rem;
+            padding: 0;
+            text-transform: uppercase;
+            transition: all 0.05s ease-out;
+            width: 100%;
+        }
+        .tiles li:hover {
+            border: 0.125rem solid #FFF;
+            padding: 0.125rem 0 0 0.125rem;
+        }
+        .tiles a {
+            color: #FFF;
+            display: block;
+            padding: 1.25rem 0.75rem 1.25rem;
+            text-decoration: none;
+        }
+        .tile-name {
+            display: inline-block;
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+            width: calc(100% - 4rem);
+        }
+        .tiles svg {
+            float: left;
+            height: 2rem;
+            margin: -0.5rem 0.75rem 0 0;
+            padding: 0.5rem 0.5rem 0;
+            width: 2rem;
+        }
+        .hex {
+            opacity: 0.5;
+        }
+        @media (min-width: 500px) { .tiles li { width: 50%; } }
+        @media (min-width: 700px) { .tiles li { width: 33.333%; } }
+        @media (min-width: 900px) { .tiles li { width: 25% } }
+        @media (min-width: 1100px) { .tiles li { width: 20% } }
+        @media (min-width: 1250px) { .tiles li { width: 16.666% } }
+        @media (min-width: 1700px) { .tiles li { width: 12.5% } }
+        @media (min-width: 2100px) { .tiles li { width: 10% } }
+        .footer {
+            margin: 3rem;
+        }
+        .footer p {
+            font-size: 0.75rem;
+            letter-spacing: 0.05rem;
+            margin: 1.5rem auto 0;
+            max-width: 31.5rem;
+            text-align: center;
+            text-transform: uppercase;
+        }
+    </style>
+</head>
+
+<body>
+    <header class="navbar" role="banner">
+        <h1 class="title">Simple Icons</h1>
+        <form action="https://www.paypal.com/cgi-bin/webscr" method="post" target="_blank" class="donate-form">
+            <p class="navbar__text">Like this?</p>
+            <input type="hidden" name="cmd" value="_s-xclick">
+            <input type="hidden" name="hosted_button_id" value="UCMEG4SWEYFUC">
+            <input type="submit" name="submit" value="Buy Dan a coffee!" class="donate-button">
+        </form>
+    </header>
+    <main role="main">
diff --git a/index.html b/index.html
index e53272ab..7259f5a3 100644
--- a/index.html
+++ b/index.html
@@ -21,10 +21,12 @@
     <meta name="twitter:description" content="SVG icons for popular brands.">
     <meta name="twitter:site" content="@bathtype">
     <meta name="twitter:domain" content="Simple Icons">
-    <meta name="twitter:image:src" content="https://simpleicons.org/og.png">
+    <meta name="twitter:image:src" content="https://simpleicons.org/images/og.png">
+    <link rel="icon" type="image/x-icon" href="https://simpleicons.org/images/favicon.ico">
+    <link rel="icon" type="image/png" href="https://simpleicons.org/images/favicon.png">
     <meta name="google-site-verification" content="jn6XSTOvKDg-FP9-O7SUw5qU1CxPOaqhAeNUEkNrz_M">
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
-    <link rel="mask-icon" href="https://simpleicons.org/logo.svg" color="#111111">
+    <link rel="apple-touch-icon" href="https://simpleicons.org/images/apple-touch-icon.png">
+    <link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:400&text=ABCDEFGHIJKLMNOPQERSTUVWXYZ.!%20%23%2B%3F%26%2C1234567890">
     <style>
         html {
diff --git a/paypal-header.png b/paypal-header.png
deleted file mode 100644
index dbaa905f..00000000
Binary files a/paypal-header.png and /dev/null differ
diff --git a/build.js b/src/build.js
similarity index 93%
rename from build.js
rename to src/build.js
index 07edc713..49163837 100644
--- a/build.js
+++ b/src/build.js
@@ -83,8 +83,8 @@ function readFile(path, callback) {
     }
 }
 var fs = require('fs');
-var header = fs.readFileSync('./src/header.html', 'utf8');
-var footer = fs.readFileSync('./src/footer.html', 'utf8');
+var header = fs.readFileSync('./header.html', 'utf8');
+var footer = fs.readFileSync('./footer.html', 'utf8');
 
 // Build content
 var main = "<p class=\"hero\">" + source.icons.length + " SVG icons for popular brands <a href=\"https://github.com/danleech/simple-icons\">Download them from GitHub</a></p>\n<ul class=\"tiles\">";
@@ -95,7 +95,7 @@ for (var i = 0; i < source.icons.length; i++) {
     fileName = fileName.replace('!', '');
     fileName = fileName.replace('.', '');
     fileName = fileName.replace('+', 'plus');
-    filePath = "./icons/" + fileName + ".svg";
+    filePath = "../icons/" + fileName + ".svg";
     console.log(source.icons[i].title + ", sat = " + source.icons[i].saturation);
     var fs = require('fs');
     var svg = fs.readFileSync(filePath, 'utf8');
@@ -104,7 +104,7 @@ for (var i = 0; i < source.icons.length; i++) {
 
 // Put all content together and export to index.html
 var htmlOutput = header + main + footer;
-fs.writeFile("./index.html", htmlOutput, function(err) {
+fs.writeFile("../index.html", htmlOutput, function(err) {
     if(err) {
         return console.log(err);
     }
@@ -112,7 +112,7 @@ fs.writeFile("./index.html", htmlOutput, function(err) {
 });
 
 // Also output to 404.html
-fs.writeFile("./404.html", htmlOutput, function(err) {
+fs.writeFile("../404.html", htmlOutput, function(err) {
     if(err) {
         return console.log(err);
     }
diff --git a/src/header.html b/src/header.html
index b510660a..1504ef3a 100644
--- a/src/header.html
+++ b/src/header.html
@@ -21,10 +21,12 @@
     <meta name="twitter:description" content="SVG icons for popular brands.">
     <meta name="twitter:site" content="@bathtype">
     <meta name="twitter:domain" content="Simple Icons">
-    <meta name="twitter:image:src" content="https://simpleicons.org/og.png">
+    <meta name="twitter:image:src" content="https://simpleicons.org/images/og.png">
+    <link rel="icon" type="image/x-icon" href="https://simpleicons.org/images/favicon.ico">
+    <link rel="icon" type="image/png" href="https://simpleicons.org/images/favicon.png">
     <meta name="google-site-verification" content="jn6XSTOvKDg-FP9-O7SUw5qU1CxPOaqhAeNUEkNrz_M">
-    <link rel="apple-touch-icon" href="apple-touch-icon.png">
-    <link rel="mask-icon" href="https://simpleicons.org/logo.svg" color="#111111">
+    <link rel="apple-touch-icon" href="https://simpleicons.org/images/apple-touch-icon.png">
+    <link rel="mask-icon" href="https://simpleicons.org/images/logo.svg" color="#111111">
     <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lato:400&text=ABCDEFGHIJKLMNOPQERSTUVWXYZ.!%20%23%2B%3F%26%2C1234567890">
     <style>
         html {
diff --git a/simple-icons.json b/src/simple-icons.json
similarity index 100%
rename from simple-icons.json
rename to src/simple-icons.json
