diff --git a/README.md~ b/README.md~
deleted file mode 100644
index 78e263095e199123fce6c97ee00577a3b022e50c..0000000000000000000000000000000000000000
--- a/README.md~
+++ /dev/null
@@ -1,4 +0,0 @@
-swift
-=====
-
-A clean Minimal Blog theme for Jekyll , built with Bootswatch 
diff --git a/_config.yml b/_config.yml
index bfdc6a99cfa9959f94394e7b3b38691ca84f444d..f5284ad5c6c214ce9cd56ff6fa6ac7d8b9981c1c 100644
--- a/_config.yml
+++ b/_config.yml
@@ -2,10 +2,10 @@
 title: Swift
 description: A clean minimal Theme for Jekyll
 email: pranav@maangalabs.com
-
-url: "http://pranav.maangalabs.com/swift" # the base hostname & protocol for your site
+baseurl: /swift
+url: "http://pranav.maangalabs.com" # the base hostname & protocol for your site
 #favicon
-favicon: favicon.png
+favicon: /favicon.png
 
 #feed
 feedburner_username: maangalabs
diff --git a/_config.yml~ b/_config.yml~
deleted file mode 100644
index 22358e1696dba3261df2a1fecd6a55dab1545e9e..0000000000000000000000000000000000000000
--- a/_config.yml~
+++ /dev/null
@@ -1,44 +0,0 @@
-# Site settings
-title: Swift
-description: A clean minimal Theme for Jekyll
-email: pranav@maangalabs.com
-
-url: "http://pranav.maangalabs.com/swift/" # the base hostname & protocol for your site
-#favicon
-favicon: favicon.png
-
-#feed
-feedburner_username: maangalabs
-#twitter
-twitter_username: pranavrajs
-github_username:  pranavrajs
-
-#linkedin
-linkedin_username: pranavrajs
-
-#google analytics
-google_analytics_id : UA-53386152-1
-#gplus
-gplus_username: 101893920934936418705
-
-#fb_username
-fb_username: pranav.tayberrycreative
-
-#permalink /blog/2014/11/11/this-is-a-sample-post
-permalink: /blog/:year/:month/:day/:title
-# Build settings
-markdown: kramdown
-
-#Disqus configuration
-disqus_short_name: maangalabscom
-disqus_show_comment_count: true
-
-#Can be used for multiple author blogs ! Add name to post For more visit the sample
-authors:
-  pranavrajs:
-    display_name: Pranav Raj S
-    email: pranavrajs@gmail.com
-    fb: pranav.tayberrycreative
-    linkedin: pranavrajs
-    twitter: pranavrajs
-    github: pranavrajs
diff --git a/_includes/head.html b/_includes/head.html
index 48a0e3059102310741286fe83ae7a59c5f0afa1f..2e7e9c2a2ec2c0b6c59c5f7363d549959a4b00aa 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -8,7 +8,7 @@
   <meta name="google-translate-customization" content="b9870a0c7376df54-aa35852016e6a5cc-ga0a0d80f6c171f17-e"></meta>
   <link rel="stylesheet" href="{{ "/css/main.css" | prepend: site.baseurl }}">
   <link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
-  <link href="/{{site.favicon}}" rel="icon">
+  <link href="{{site.baseurl}}{{ site.favicon}}" rel="icon">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}" />
+  <link rel="alternate" type="application/atom+xml" title="{{ site.title }}" href="{{ "/atom.xml" | prepend: site.baseurl | prepend: site.url }}" />
 </head>
diff --git a/_includes/header.html b/_includes/header.html
index 9e053236dd2be60c6d29a19493861f1c497a1d01..565c5028da71ac1af13a8480c802bb952d3cba5a 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -31,7 +31,7 @@
           <li><a href="https://facebook.com/{{site.fb_username}}" target="_blank"><i class="fa fa-facebook-square"></i> <span>Facebook</span></a></li>
           <li><a href="http://github.com/{{ site.github_username}}" target="_blank"><i class="fa fa-github"></i> <span>Github</span></a></li>
           <li><a href="//twitter.com/{{site.twitter_username}}" target="_blank"><i class="fa fa-twitter"></i> <span>Twitter</span></a></li>
-          <li><a href="/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
+          <li><a href="{{ "/atom.xml" | prepend: site.baseurl | prepend: site.url }}" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
         </ul>
       </div>
     </div>
diff --git a/_site/atom.xml b/_site/atom.xml
index 94928bca3539e3022374f792295b98f9e2d3baed..bd800466f112c2f5a7b40658b3521c77e848e9e4 100644
--- a/_site/atom.xml
+++ b/_site/atom.xml
@@ -5,8 +5,8 @@
     <description>A clean minimal Theme for Jekyll</description>
     <link>http://pranav.maangalabs.com/swift/</link>
     <atom:link href="http://pranav.maangalabs.com/swift/feed.xml" rel="self" type="application/rss+xml"/>
-    <pubDate>Mon, 01 Dec 2014 21:35:49 +0530</pubDate>
-    <lastBuildDate>Mon, 01 Dec 2014 21:35:49 +0530</lastBuildDate>
+    <pubDate>Mon, 01 Dec 2014 21:56:24 +0530</pubDate>
+    <lastBuildDate>Mon, 01 Dec 2014 21:56:24 +0530</lastBuildDate>
     <generator>Jekyll v2.5.1</generator>
     
       <item>
diff --git a/_site/blog/2014/09/09/example/index.html b/_site/blog/2014/09/09/example/index.html
index 34734eaa8609759e08e8a99b0a63742a0d946061..6a1029413ee50e2fdde3a31e59573847e3d47a4f 100644
--- a/_site/blog/2014/09/09/example/index.html
+++ b/_site/blog/2014/09/09/example/index.html
@@ -9,11 +9,11 @@
   <title>Example</title>
   <meta name="description" content="This is a sample post to denote the features of Swift theme . The theme consists of various share plugins , feedburner support , sitemap generation etc. You ...">
   <meta name="google-translate-customization" content="b9870a0c7376df54-aa35852016e6a5cc-ga0a0d80f6c171f17-e"></meta>
-  <link rel="stylesheet" href="/css/main.css">
+  <link rel="stylesheet" href="/swift/css/main.css">
   <link rel="canonical" href="http://pranav.maangalabs.com/swift/blog/2014/09/09/example">
-  <link href="/favicon.png" rel="icon">
+  <link href="/swiftfavicon.png" rel="icon">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/feed.xml" />
+  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/atom.xml" />
 </head>
 
 
@@ -25,7 +25,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">Swift</a>
+        <a class="navbar-brand" href="/swift/">Swift</a>
       </div>
       <div class="navbar-collapse collapse navbar-inverse-collapse">
         <ul class="nav navbar-nav">
@@ -33,11 +33,11 @@
             
           
             
-              <li><a href="/contribute/">Contribute</a></li>
+              <li><a href="/swift/contribute/">Contribute</a></li>
             
           
             
-              <li><a href="/donate/">Donate</a></li>
+              <li><a href="/swift/donate/">Donate</a></li>
             
           
             
@@ -54,11 +54,11 @@
               
             
               
-                <li><a href="/contribute/" style="text-transform : uppercase;">Contribute</a></li>
+                <li><a href="/swift/contribute/" style="text-transform : uppercase;">Contribute</a></li>
               
             
               
-                <li><a href="/donate/" style="text-transform : uppercase;">Donate</a></li>
+                <li><a href="/swift/donate/" style="text-transform : uppercase;">Donate</a></li>
               
             
               
@@ -75,7 +75,7 @@
           <li><a href="https://facebook.com/pranav.tayberrycreative" target="_blank"><i class="fa fa-facebook-square"></i> <span>Facebook</span></a></li>
           <li><a href="http://github.com/pranavrajs" target="_blank"><i class="fa fa-github"></i> <span>Github</span></a></li>
           <li><a href="//twitter.com/pranavrajs" target="_blank"><i class="fa fa-twitter"></i> <span>Twitter</span></a></li>
-          <li><a href="/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
+          <li><a href="http://pranav.maangalabs.com/swift/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
         </ul>
       </div>
     </div>
@@ -258,7 +258,7 @@
                       <h4>Recent Posts</h4>
                         <ul>
                         
-                          <li><a href="/blog/2014/09/09/example">Example</a></li>
+                          <li><a href="/swift/blog/2014/09/09/example">Example</a></li>
                         
                         </ul>
                     </div>
diff --git a/_site/contribute/index.html b/_site/contribute/index.html
index 9a3b54536744c1497002b5aac1852028e7522307..0909c018467b2e70dcf1f1a37af3b0dfbb64fb91 100644
--- a/_site/contribute/index.html
+++ b/_site/contribute/index.html
@@ -9,11 +9,11 @@
   <title>Contribute</title>
   <meta name="description" content="A clean minimal Theme for Jekyll">
   <meta name="google-translate-customization" content="b9870a0c7376df54-aa35852016e6a5cc-ga0a0d80f6c171f17-e"></meta>
-  <link rel="stylesheet" href="/css/main.css">
+  <link rel="stylesheet" href="/swift/css/main.css">
   <link rel="canonical" href="http://pranav.maangalabs.com/swift/contribute/">
-  <link href="/favicon.png" rel="icon">
+  <link href="/swiftfavicon.png" rel="icon">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/feed.xml" />
+  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/atom.xml" />
 </head>
 
 
@@ -25,7 +25,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">Swift</a>
+        <a class="navbar-brand" href="/swift/">Swift</a>
       </div>
       <div class="navbar-collapse collapse navbar-inverse-collapse">
         <ul class="nav navbar-nav">
@@ -33,11 +33,11 @@
             
           
             
-              <li><a href="/contribute/">Contribute</a></li>
+              <li><a href="/swift/contribute/">Contribute</a></li>
             
           
             
-              <li><a href="/donate/">Donate</a></li>
+              <li><a href="/swift/donate/">Donate</a></li>
             
           
             
@@ -54,11 +54,11 @@
               
             
               
-                <li><a href="/contribute/" style="text-transform : uppercase;">Contribute</a></li>
+                <li><a href="/swift/contribute/" style="text-transform : uppercase;">Contribute</a></li>
               
             
               
-                <li><a href="/donate/" style="text-transform : uppercase;">Donate</a></li>
+                <li><a href="/swift/donate/" style="text-transform : uppercase;">Donate</a></li>
               
             
               
@@ -75,7 +75,7 @@
           <li><a href="https://facebook.com/pranav.tayberrycreative" target="_blank"><i class="fa fa-facebook-square"></i> <span>Facebook</span></a></li>
           <li><a href="http://github.com/pranavrajs" target="_blank"><i class="fa fa-github"></i> <span>Github</span></a></li>
           <li><a href="//twitter.com/pranavrajs" target="_blank"><i class="fa fa-twitter"></i> <span>Twitter</span></a></li>
-          <li><a href="/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
+          <li><a href="http://pranav.maangalabs.com/swift/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
         </ul>
       </div>
     </div>
@@ -162,7 +162,7 @@
                       <h4>Recent Posts</h4>
                         <ul>
                         
-                          <li><a href="/blog/2014/09/09/example">Example</a></li>
+                          <li><a href="/swift/blog/2014/09/09/example">Example</a></li>
                         
                         </ul>
                     </div>
diff --git a/_site/donate/index.html b/_site/donate/index.html
index c5c63004c13acbddf2696062e02d2b19bd7d6914..9b83d5c00acf0aee257fe68853176ad0159c5ef7 100644
--- a/_site/donate/index.html
+++ b/_site/donate/index.html
@@ -9,11 +9,11 @@
   <title>Donate</title>
   <meta name="description" content="A clean minimal Theme for Jekyll">
   <meta name="google-translate-customization" content="b9870a0c7376df54-aa35852016e6a5cc-ga0a0d80f6c171f17-e"></meta>
-  <link rel="stylesheet" href="/css/main.css">
+  <link rel="stylesheet" href="/swift/css/main.css">
   <link rel="canonical" href="http://pranav.maangalabs.com/swift/donate/">
-  <link href="/favicon.png" rel="icon">
+  <link href="/swiftfavicon.png" rel="icon">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/feed.xml" />
+  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/atom.xml" />
 </head>
 
 
@@ -25,7 +25,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">Swift</a>
+        <a class="navbar-brand" href="/swift/">Swift</a>
       </div>
       <div class="navbar-collapse collapse navbar-inverse-collapse">
         <ul class="nav navbar-nav">
@@ -33,11 +33,11 @@
             
           
             
-              <li><a href="/contribute/">Contribute</a></li>
+              <li><a href="/swift/contribute/">Contribute</a></li>
             
           
             
-              <li><a href="/donate/">Donate</a></li>
+              <li><a href="/swift/donate/">Donate</a></li>
             
           
             
@@ -54,11 +54,11 @@
               
             
               
-                <li><a href="/contribute/" style="text-transform : uppercase;">Contribute</a></li>
+                <li><a href="/swift/contribute/" style="text-transform : uppercase;">Contribute</a></li>
               
             
               
-                <li><a href="/donate/" style="text-transform : uppercase;">Donate</a></li>
+                <li><a href="/swift/donate/" style="text-transform : uppercase;">Donate</a></li>
               
             
               
@@ -75,7 +75,7 @@
           <li><a href="https://facebook.com/pranav.tayberrycreative" target="_blank"><i class="fa fa-facebook-square"></i> <span>Facebook</span></a></li>
           <li><a href="http://github.com/pranavrajs" target="_blank"><i class="fa fa-github"></i> <span>Github</span></a></li>
           <li><a href="//twitter.com/pranavrajs" target="_blank"><i class="fa fa-twitter"></i> <span>Twitter</span></a></li>
-          <li><a href="/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
+          <li><a href="http://pranav.maangalabs.com/swift/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
         </ul>
       </div>
     </div>
@@ -162,7 +162,7 @@
                       <h4>Recent Posts</h4>
                         <ul>
                         
-                          <li><a href="/blog/2014/09/09/example">Example</a></li>
+                          <li><a href="/swift/blog/2014/09/09/example">Example</a></li>
                         
                         </ul>
                     </div>
diff --git a/_site/index.html b/_site/index.html
index 9b9bfd4158dfa283aa82433efe1f5a6d9d642ae4..ce83fb1560d8580f913ee86ab0a7f19efd7e8921 100644
--- a/_site/index.html
+++ b/_site/index.html
@@ -9,11 +9,11 @@
   <title>Swift</title>
   <meta name="description" content="A clean minimal Theme for Jekyll">
   <meta name="google-translate-customization" content="b9870a0c7376df54-aa35852016e6a5cc-ga0a0d80f6c171f17-e"></meta>
-  <link rel="stylesheet" href="/css/main.css">
+  <link rel="stylesheet" href="/swift/css/main.css">
   <link rel="canonical" href="http://pranav.maangalabs.com/swift/">
-  <link href="/favicon.png" rel="icon">
+  <link href="/swiftfavicon.png" rel="icon">
   <link href="//maxcdn.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" rel="stylesheet">
-  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/feed.xml" />
+  <link rel="alternate" type="application/atom+xml" title="Swift" href="http://pranav.maangalabs.com/swift/atom.xml" />
 </head>
 
 
@@ -25,7 +25,7 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </button>
-        <a class="navbar-brand" href="/">Swift</a>
+        <a class="navbar-brand" href="/swift/">Swift</a>
       </div>
       <div class="navbar-collapse collapse navbar-inverse-collapse">
         <ul class="nav navbar-nav">
@@ -33,11 +33,11 @@
             
           
             
-              <li><a href="/contribute/">Contribute</a></li>
+              <li><a href="/swift/contribute/">Contribute</a></li>
             
           
             
-              <li><a href="/donate/">Donate</a></li>
+              <li><a href="/swift/donate/">Donate</a></li>
             
           
             
@@ -54,11 +54,11 @@
               
             
               
-                <li><a href="/contribute/" style="text-transform : uppercase;">Contribute</a></li>
+                <li><a href="/swift/contribute/" style="text-transform : uppercase;">Contribute</a></li>
               
             
               
-                <li><a href="/donate/" style="text-transform : uppercase;">Donate</a></li>
+                <li><a href="/swift/donate/" style="text-transform : uppercase;">Donate</a></li>
               
             
               
@@ -75,7 +75,7 @@
           <li><a href="https://facebook.com/pranav.tayberrycreative" target="_blank"><i class="fa fa-facebook-square"></i> <span>Facebook</span></a></li>
           <li><a href="http://github.com/pranavrajs" target="_blank"><i class="fa fa-github"></i> <span>Github</span></a></li>
           <li><a href="//twitter.com/pranavrajs" target="_blank"><i class="fa fa-twitter"></i> <span>Twitter</span></a></li>
-          <li><a href="/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
+          <li><a href="http://pranav.maangalabs.com/swift/atom.xml" target="_blank"><i class="fa fa-rss"></i> <span>RSS Feed</span></a></li>
         </ul>
       </div>
     </div>
@@ -100,7 +100,7 @@
               <!-- Blog Post Links -->
               <div class="blog-post-small">
                 
-                  <h3><a href="/blog/2014/09/09/example">Example</a></h3>
+                  <h3><a href="/swift/blog/2014/09/09/example">Example</a></h3>
                   <p><i class="fa fa-calendar"></i> &nbsp;Sep 9, 2014 | 
          <a href="/blog/2014/09/09/example#disqus_thread">Comments</a>
         </p>
@@ -196,7 +196,7 @@
                       <h4>Recent Posts</h4>
                         <ul>
                         
-                          <li><a href="/blog/2014/09/09/example">Example</a></li>
+                          <li><a href="/swift/blog/2014/09/09/example">Example</a></li>
                         
                         </ul>
                     </div>