diff --git a/_config.yml b/_config.yml
index ea95bbc..5af0498 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,2 +1 @@
 title: Window Maker
-baseurl: /
diff --git a/_includes/dock.html b/_includes/dock.html
index 576e240..e862622 100644
--- a/_includes/dock.html
+++ b/_includes/dock.html
@@ -1,36 +1,36 @@
   <div id="dock">
     <table width="64" height="500" border="0" cellpadding="0" cellspacing="0">
       <tr>
-        <td><a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/homewmaker.png" alt="Home" width="60" height="81"></a></td>
+        <td><a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/img/homewmaker.png" alt="Home" width="60" height="81"></a></td>
       </tr>
 
       <tr>
         <td><a href="{{ site.baseurl }}/news"><img src=
-        "{{ site.baseurl }}/news.png" alt="News" width="60" height="81"></a></td>
+        "{{ site.baseurl }}/img/news.png" alt="News" width="60" height="81"></a></td>
       </tr>
 
       <tr>
         <td><a href="{{ site.baseurl }}/docs"><img src=
-        "{{ site.baseurl }}/docs.png" alt="Documentation" width="60" height="81"></a></td>
+        "{{ site.baseurl }}/img/docs.png" alt="Documentation" width="60" height="81"></a></td>
       </tr>
 
       <tr>
-        <td><a href="{{ site.baseurl }}/lists"><img src="{{ site.baseurl }}/mailing_list.png" alt="Mailing Lists" width="60" height=
+        <td><a href="{{ site.baseurl }}/lists"><img src="{{ site.baseurl }}/img/mailing_list.png" alt="Mailing Lists" width="60" height=
         "81"></a></td>
       </tr>
 
       <tr>
-        <td><a href="{{ site.baseurl }}/dev"><img src="{{ site.baseurl }}/development.png" alt="Development" width="60" height=
+        <td><a href="{{ site.baseurl }}/dev"><img src="{{ site.baseurl }}/img/development.png" alt="Development" width="60" height=
         "81"></a></td>
       </tr>
 
       <tr>
-        <td><a href="{{ site.baseurl }}/themes"><img src="{{ site.baseurl }}/themes.png" alt="Themes" width="60" height=
+        <td><a href="{{ site.baseurl }}/themes"><img src="{{ site.baseurl }}/img/themes.png" alt="Themes" width="60" height=
         "81"></a></td>
       </tr>
 
       <tr>
-        <td><a href="{{ site.baseurl }}/links"><img src="{{ site.baseurl }}/links.png" alt="Links" width="60" height=
+        <td><a href="{{ site.baseurl }}/links"><img src="{{ site.baseurl }}/img/links.png" alt="Links" width="60" height=
         "81"></a></td>
       </tr>
     </table>
diff --git a/_includes/header.html b/_includes/header.html
index e3e8412..bd1f5de 100644
--- a/_includes/header.html
+++ b/_includes/header.html
@@ -2,7 +2,7 @@
     <table width="100%">
       <tr>
         <td width="100%">
-          <a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/header.png" style="min-width:700px" width="95%" alt="title bar"></a>
+          <a href="{{ site.baseurl }}/"><img src="{{ site.baseurl }}/img/header.png" style="min-width:700px" width="95%" alt="title bar"></a>
       </tr>
       <tr>
         <td width="100%">
diff --git a/development.png b/img/development.png
similarity index 100%
rename from development.png
rename to img/development.png
diff --git a/docs.png b/img/docs.png
similarity index 100%
rename from docs.png
rename to img/docs.png
diff --git a/essential_dockapps.png b/img/essential_dockapps.png
similarity index 100%
rename from essential_dockapps.png
rename to img/essential_dockapps.png
diff --git a/header.png b/img/header.png
similarity index 100%
rename from header.png
rename to img/header.png
diff --git a/homewmaker.png b/img/homewmaker.png
similarity index 100%
rename from homewmaker.png
rename to img/homewmaker.png
diff --git a/links.png b/img/links.png
similarity index 100%
rename from links.png
rename to img/links.png
diff --git a/mailing_list.png b/img/mailing_list.png
similarity index 100%
rename from mailing_list.png
rename to img/mailing_list.png
diff --git a/news.png b/img/news.png
similarity index 100%
rename from news.png
rename to img/news.png
diff --git a/themes.png b/img/themes.png
similarity index 100%
rename from themes.png
rename to img/themes.png
diff --git a/v0_95_1.png b/img/v0_95_1.png
similarity index 100%
rename from v0_95_1.png
rename to img/v0_95_1.png
diff --git a/wmaker-screenshot.png b/img/wmaker-screenshot.png
similarity index 100%
rename from wmaker-screenshot.png
rename to img/wmaker-screenshot.png