diff --git a/www/kojiweb/Makefile b/www/kojiweb/Makefile
index 7ef61d9d..ec059375 100644
--- a/www/kojiweb/Makefile
+++ b/www/kojiweb/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS = includes
+SUBDIRS = templates
 
 SERVERDIR = /usr/share/koji-web/scripts
 FILES = $(wildcard *.py *.html.j2)
diff --git a/www/kojiweb/includes/Makefile b/www/kojiweb/templates/Makefile
similarity index 100%
rename from www/kojiweb/includes/Makefile
rename to www/kojiweb/templates/Makefile
diff --git a/www/kojiweb/activesession.html.j2 b/www/kojiweb/templates/activesession.html.j2
similarity index 92%
rename from www/kojiweb/activesession.html.j2
rename to www/kojiweb/templates/activesession.html.j2
index 2577228b..4b2a27b3 100644
--- a/www/kojiweb/activesession.html.j2
+++ b/www/kojiweb/templates/activesession.html.j2
@@ -1,5 +1,5 @@
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #set _PASSTHROUGH = ['userID']
 
@@ -26,4 +26,4 @@
     #endfor
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/api.html.j2 b/www/kojiweb/templates/api.html.j2
similarity index 93%
rename from www/kojiweb/api.html.j2
rename to www/kojiweb/templates/api.html.j2
index 7b995e5f..0e1f9ac6 100644
--- a/www/kojiweb/api.html.j2
+++ b/www/kojiweb/templates/api.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
 <h4>API reference <small>(hub version: {{ koji_version }}, web version: {{ web_version }})</small></h4>
 
@@ -34,4 +34,4 @@ except koji.GenericError:
 #endfor
 </ul>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/archiveinfo.html.j2 b/www/kojiweb/templates/archiveinfo.html.j2
similarity index 98%
rename from www/kojiweb/archiveinfo.html.j2
rename to www/kojiweb/templates/archiveinfo.html.j2
index 11a0e1b9..0908a0c6 100644
--- a/www/kojiweb/archiveinfo.html.j2
+++ b/www/kojiweb/templates/archiveinfo.html.j2
@@ -1,8 +1,8 @@
 
 #set _PASSTHROUGH = ['archiveID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
   <h4>Information for archive <a href="archiveinfo?archiveID={{ archive.id }}">{{ archive.filename }}</a></h4>
 
   <table>
@@ -157,4 +157,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/archivelist.html.j2 b/www/kojiweb/templates/archivelist.html.j2
similarity index 97%
rename from www/kojiweb/archivelist.html.j2
rename to www/kojiweb/templates/archivelist.html.j2
index 79ce7829..99199245 100644
--- a/www/kojiweb/archivelist.html.j2
+++ b/www/kojiweb/templates/archivelist.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #macro getID()
   #if type == 'image'
@@ -90,4 +90,4 @@ buildrootID={{ buildroot.id }}
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildinfo.html.j2 b/www/kojiweb/templates/buildinfo.html.j2
similarity index 99%
rename from www/kojiweb/buildinfo.html.j2
rename to www/kojiweb/templates/buildinfo.html.j2
index 88ad1ae7..f92fcc42 100644
--- a/www/kojiweb/buildinfo.html.j2
+++ b/www/kojiweb/templates/buildinfo.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 #set nvrpath = pathinfo.build(build)
 
   <h4>Information for build <a href="buildinfo?buildID={{ build.id }}">{{ koji.buildLabel(build) }}</a></h4>
@@ -258,4 +258,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildrootinfo.html.j2 b/www/kojiweb/templates/buildrootinfo.html.j2
similarity index 97%
rename from www/kojiweb/buildrootinfo.html.j2
rename to www/kojiweb/templates/buildrootinfo.html.j2
index 2c3fa3cb..3206ac6a 100644
--- a/www/kojiweb/buildrootinfo.html.j2
+++ b/www/kojiweb/templates/buildrootinfo.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for buildroot <a href="buildrootinfo?buildrootID={{ buildroot.id }}">{{ util.brLabel(buildroot) }}</a></h4>
 
@@ -56,4 +56,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildrootinfo_cg.html.j2 b/www/kojiweb/templates/buildrootinfo_cg.html.j2
similarity index 95%
rename from www/kojiweb/buildrootinfo_cg.html.j2
rename to www/kojiweb/templates/buildrootinfo_cg.html.j2
index 2b487600..7b99e41f 100644
--- a/www/kojiweb/buildrootinfo_cg.html.j2
+++ b/www/kojiweb/templates/buildrootinfo_cg.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for external buildroot <a href="buildrootinfo?buildrootID={{ buildroot.id }}">{{ util.brLabel(buildroot) }}</a></h4>
 
@@ -41,4 +41,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildroots.html.j2 b/www/kojiweb/templates/buildroots.html.j2
similarity index 97%
rename from www/kojiweb/buildroots.html.j2
rename to www/kojiweb/templates/buildroots.html.j2
index a8cf94cb..07595710 100644
--- a/www/kojiweb/buildroots.html.j2
+++ b/www/kojiweb/templates/buildroots.html.j2
@@ -1,8 +1,8 @@
 
 #set _PASSTHROUGH = ['repoID', 'order', 'state']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Buildroots in repo <a href="repoinfo?repoID={{ repoID }}">{{ repoID }}</a></h4>
 
@@ -93,4 +93,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/builds.html.j2 b/www/kojiweb/templates/builds.html.j2
similarity index 98%
rename from www/kojiweb/builds.html.j2
rename to www/kojiweb/templates/builds.html.j2
index 75828d94..9da7d086 100644
--- a/www/kojiweb/builds.html.j2
+++ b/www/kojiweb/templates/builds.html.j2
@@ -1,8 +1,8 @@
 
 #set _PASSTHROUGH = ['userID', 'tagID', 'packageID', 'order', 'prefix', 'state', 'inherited', 'latest', 'type']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #macro getDescription()
 #if latest
@@ -185,4 +185,4 @@ in tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a>
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildsbystatus.html.j2 b/www/kojiweb/templates/buildsbystatus.html.j2
similarity index 96%
rename from www/kojiweb/buildsbystatus.html.j2
rename to www/kojiweb/templates/buildsbystatus.html.j2
index 6d2fb2ac..6908fa23 100644
--- a/www/kojiweb/buildsbystatus.html.j2
+++ b/www/kojiweb/templates/buildsbystatus.html.j2
@@ -8,7 +8,7 @@
 
 #set numTotal = numSucceeded + numFailed + numCanceled
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Succeeded/Failed/Canceled Builds{{ ' in the last %i days' % days if days != -1 else '' }}</h4>
   <table class="data-list">
@@ -60,4 +60,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildsbytarget.html.j2 b/www/kojiweb/templates/buildsbytarget.html.j2
similarity index 97%
rename from www/kojiweb/buildsbytarget.html.j2
rename to www/kojiweb/templates/buildsbytarget.html.j2
index a0481081..69eb7466 100644
--- a/www/kojiweb/buildsbytarget.html.j2
+++ b/www/kojiweb/templates/buildsbytarget.html.j2
@@ -6,8 +6,8 @@
 <option value="{{ value }}"{{ ' selected' if value == days else '' }}>{{ label }}</option>
 #endmacro
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Builds by Target{{ ' in the last %i days' % days if days != -1 else '' }}</h4>
   <table class="data-list">
@@ -96,4 +96,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildsbyuser.html.j2 b/www/kojiweb/templates/buildsbyuser.html.j2
similarity index 96%
rename from www/kojiweb/buildsbyuser.html.j2
rename to www/kojiweb/templates/buildsbyuser.html.j2
index 83a2114d..1f50d036 100644
--- a/www/kojiweb/buildsbyuser.html.j2
+++ b/www/kojiweb/templates/buildsbyuser.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Builds by User</h4>
   <table class="data-list">
@@ -70,4 +70,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildtargetedit.html.j2 b/www/kojiweb/templates/buildtargetedit.html.j2
similarity index 95%
rename from www/kojiweb/buildtargetedit.html.j2
rename to www/kojiweb/templates/buildtargetedit.html.j2
index b03a3655..b7957487 100644
--- a/www/kojiweb/buildtargetedit.html.j2
+++ b/www/kojiweb/templates/buildtargetedit.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   #if target
   <h4>Edit target {{ target.name }}</h4>
@@ -59,4 +59,4 @@
     </table>
     </form>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildtargetinfo.html.j2 b/www/kojiweb/templates/buildtargetinfo.html.j2
similarity index 91%
rename from www/kojiweb/buildtargetinfo.html.j2
rename to www/kojiweb/templates/buildtargetinfo.html.j2
index 12119228..0c84e2b0 100644
--- a/www/kojiweb/buildtargetinfo.html.j2
+++ b/www/kojiweb/templates/buildtargetinfo.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for target <a href="buildtargetinfo?targetID={{ target.id }}">{{ target.name }}</a></h4>
 
@@ -25,4 +25,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/buildtargets.html.j2 b/www/kojiweb/templates/buildtargets.html.j2
similarity index 96%
rename from www/kojiweb/buildtargets.html.j2
rename to www/kojiweb/templates/buildtargets.html.j2
index 2afbdda1..fafae321 100644
--- a/www/kojiweb/buildtargets.html.j2
+++ b/www/kojiweb/templates/buildtargets.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Build Targets</h4>
   <table class="data-list">
@@ -73,4 +73,4 @@
   <a href="buildtargetcreate{{ util.authToken(first=True) }}">Create new Build Target</a>
   #endif
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/channelinfo.html.j2 b/www/kojiweb/templates/channelinfo.html.j2
similarity index 93%
rename from www/kojiweb/channelinfo.html.j2
rename to www/kojiweb/templates/channelinfo.html.j2
index 4ae2a0c4..565482f0 100644
--- a/www/kojiweb/channelinfo.html.j2
+++ b/www/kojiweb/templates/channelinfo.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Information for channel <a href="channelinfo?channelID={{ channel.id }}">{{ channel.name }}</a></h4>
 
@@ -57,4 +57,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/clusterhealth.html.j2 b/www/kojiweb/templates/clusterhealth.html.j2
similarity index 97%
rename from www/kojiweb/clusterhealth.html.j2
rename to www/kojiweb/templates/clusterhealth.html.j2
index 0fd6c20c..0676ad3e 100644
--- a/www/kojiweb/clusterhealth.html.j2
+++ b/www/kojiweb/templates/clusterhealth.html.j2
@@ -6,7 +6,7 @@
 <option value="{{ value }}"{{ ' selected' if value == arch else '' }}>{{ label }}</option>
 #endmacro
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 <style>
   span {
     display: inline-block;
@@ -80,4 +80,4 @@
     #endfor
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/error.html.j2 b/www/kojiweb/templates/error.html.j2
similarity index 78%
rename from www/kojiweb/error.html.j2
rename to www/kojiweb/templates/error.html.j2
index a2cc133e..96df3098 100644
--- a/www/kojiweb/error.html.j2
+++ b/www/kojiweb/templates/error.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Error</h4>
 
@@ -24,4 +24,4 @@
 </pre>
 </div>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/externalrepoinfo.html.j2 b/www/kojiweb/templates/externalrepoinfo.html.j2
similarity index 90%
rename from www/kojiweb/externalrepoinfo.html.j2
rename to www/kojiweb/templates/externalrepoinfo.html.j2
index c2ddf78e..1e9f618d 100644
--- a/www/kojiweb/externalrepoinfo.html.j2
+++ b/www/kojiweb/templates/externalrepoinfo.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for external repo <a href="externalrepoinfo?extrepoID={{ extRepo.id }}">{{ extRepo.name }}</a></h4>
 
@@ -26,4 +26,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/fileinfo.html.j2 b/www/kojiweb/templates/fileinfo.html.j2
similarity index 96%
rename from www/kojiweb/fileinfo.html.j2
rename to www/kojiweb/templates/fileinfo.html.j2
index 1e7d2467..a522c23e 100644
--- a/www/kojiweb/fileinfo.html.j2
+++ b/www/kojiweb/templates/fileinfo.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
   #if rpm
   <h4>Information for file <a href="fileinfo?rpmID={{ rpm.id }}&amp;filename={{ file.name|urlencode }}">{{ file.name }}</a></h4>
   #elif archive
@@ -58,4 +58,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/includes/footer.html.j2 b/www/kojiweb/templates/footer.html.j2
similarity index 100%
rename from www/kojiweb/includes/footer.html.j2
rename to www/kojiweb/templates/footer.html.j2
diff --git a/www/kojiweb/includes/header.html.j2 b/www/kojiweb/templates/header.html.j2
similarity index 100%
rename from www/kojiweb/includes/header.html.j2
rename to www/kojiweb/templates/header.html.j2
diff --git a/www/kojiweb/hostedit.html.j2 b/www/kojiweb/templates/hostedit.html.j2
similarity index 95%
rename from www/kojiweb/hostedit.html.j2
rename to www/kojiweb/templates/hostedit.html.j2
index 7b305e68..71e5f661 100644
--- a/www/kojiweb/hostedit.html.j2
+++ b/www/kojiweb/templates/hostedit.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Edit host {{ host.name }}</h4>
 
@@ -53,4 +53,4 @@
     </table>
   </form>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/hostinfo.html.j2 b/www/kojiweb/templates/hostinfo.html.j2
similarity index 95%
rename from www/kojiweb/hostinfo.html.j2
rename to www/kojiweb/templates/hostinfo.html.j2
index 511561f4..febfa1c9 100644
--- a/www/kojiweb/hostinfo.html.j2
+++ b/www/kojiweb/templates/hostinfo.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Information for host <a href="hostinfo?hostID={{ host.id }}">{{ host.name }}</a></h4>
 
@@ -88,4 +88,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/hosts.html.j2 b/www/kojiweb/templates/hosts.html.j2
similarity index 98%
rename from www/kojiweb/hosts.html.j2
rename to www/kojiweb/templates/hosts.html.j2
index f56f9ef9..301dd464 100644
--- a/www/kojiweb/hosts.html.j2
+++ b/www/kojiweb/templates/hosts.html.j2
@@ -35,8 +35,8 @@ in {{ channel }} channel
 
 #set _PASSTHROUGH = ['state', 'order', 'ready', 'channel', 'arch']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>{{ headerState(state) }} {{ headerReady(ready) }} {{ headerArch(arch) }} {{ headerChannel(channel) }}</h4>
   <table class="data-list">
@@ -166,4 +166,4 @@ in {{ channel }} channel
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/index.html.j2 b/www/kojiweb/templates/index.html.j2
similarity index 98%
rename from www/kojiweb/index.html.j2
rename to www/kojiweb/templates/index.html.j2
index 073ffc8d..c51d55a9 100644
--- a/www/kojiweb/index.html.j2
+++ b/www/kojiweb/templates/index.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <div class="pageHeader">{{ welcomeMessage }}</div>
 
@@ -157,4 +157,4 @@
   <a href="notificationcreate{{ util.authToken(first=True) }}">Add a Notification</a>
   #endif
     
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/includes/macros.html.j2 b/www/kojiweb/templates/macros.html.j2
similarity index 100%
rename from www/kojiweb/includes/macros.html.j2
rename to www/kojiweb/templates/macros.html.j2
diff --git a/www/kojiweb/notificationedit.html.j2 b/www/kojiweb/templates/notificationedit.html.j2
similarity index 96%
rename from www/kojiweb/notificationedit.html.j2
rename to www/kojiweb/templates/notificationedit.html.j2
index ce6d04e0..85f34368 100644
--- a/www/kojiweb/notificationedit.html.j2
+++ b/www/kojiweb/templates/notificationedit.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   #if notif
   <h4>Edit notification</h4>
@@ -52,4 +52,4 @@
     </table>
   </form>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/packageinfo.html.j2 b/www/kojiweb/templates/packageinfo.html.j2
similarity index 98%
rename from www/kojiweb/packageinfo.html.j2
rename to www/kojiweb/templates/packageinfo.html.j2
index 2e714cea..801b3492 100644
--- a/www/kojiweb/packageinfo.html.j2
+++ b/www/kojiweb/templates/packageinfo.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Information for package <a href="packageinfo?packageID={{ package.id }}">{{ package.name }}</a></h4>
 
@@ -124,4 +124,4 @@
     
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/packages.html.j2 b/www/kojiweb/templates/packages.html.j2
similarity index 98%
rename from www/kojiweb/packages.html.j2
rename to www/kojiweb/templates/packages.html.j2
index 7eeb0f93..5904db67 100644
--- a/www/kojiweb/packages.html.j2
+++ b/www/kojiweb/templates/packages.html.j2
@@ -1,8 +1,8 @@
 
 #set _PASSTHROUGH = ['userID', 'tagID', 'order', 'prefix', 'inherited', 'blocked']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #macro getDescription()
 Packages
@@ -134,4 +134,4 @@ owned by <a href="userinfo?userID={{ user.id }}">{{ user.name }}</a>
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/packagesbyuser.html.j2 b/www/kojiweb/templates/packagesbyuser.html.j2
similarity index 96%
rename from www/kojiweb/packagesbyuser.html.j2
rename to www/kojiweb/templates/packagesbyuser.html.j2
index 241aca3f..8af3c2a4 100644
--- a/www/kojiweb/packagesbyuser.html.j2
+++ b/www/kojiweb/templates/packagesbyuser.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Packages by User</h4>
   <table class="data-list">
@@ -70,4 +70,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/recentbuilds.html.j2 b/www/kojiweb/templates/recentbuilds.html.j2
similarity index 100%
rename from www/kojiweb/recentbuilds.html.j2
rename to www/kojiweb/templates/recentbuilds.html.j2
diff --git a/www/kojiweb/repoinfo.html.j2 b/www/kojiweb/templates/repoinfo.html.j2
similarity index 92%
rename from www/kojiweb/repoinfo.html.j2
rename to www/kojiweb/templates/repoinfo.html.j2
index b8a3208f..c31f2b95 100644
--- a/www/kojiweb/repoinfo.html.j2
+++ b/www/kojiweb/templates/repoinfo.html.j2
@@ -1,4 +1,4 @@
-{% include "includes/header.html.j2" %}
+{% include "header.html.j2" %}
 
 <h4>Information for repo {{ repo_id }}</h4>
 
@@ -23,4 +23,4 @@ Repo {{ repo_id }} not found.
 {% endif %}
 
 
-{% include "includes/footer.html.j2" %}
+{% include "footer.html.j2" %}
diff --git a/www/kojiweb/reports.html.j2 b/www/kojiweb/templates/reports.html.j2
similarity index 90%
rename from www/kojiweb/reports.html.j2
rename to www/kojiweb/templates/reports.html.j2
index a236617f..bd9d898b 100644
--- a/www/kojiweb/reports.html.j2
+++ b/www/kojiweb/templates/reports.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Reports</h4>
 
@@ -16,4 +16,4 @@
     #endif
   </ul>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/rpminfo.html.j2 b/www/kojiweb/templates/rpminfo.html.j2
similarity index 98%
rename from www/kojiweb/rpminfo.html.j2
rename to www/kojiweb/templates/rpminfo.html.j2
index 7bb7c2ac..0efcb65d 100644
--- a/www/kojiweb/rpminfo.html.j2
+++ b/www/kojiweb/templates/rpminfo.html.j2
@@ -1,8 +1,8 @@
 
 #set _PASSTHROUGH = ['rpmID', 'fileOrder', 'fileStart', 'buildrootOrder', 'buildrootStart']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
   #set epoch = (rpm.epoch|string + ':' if rpm.epoch != None else '')
   <h4>Information for RPM <a href="rpminfo?rpmID={{ rpm.id }}">{{ rpm.name }}-{{ epoch }}{{ rpm.version }}-{{ rpm.release }}.{{rpm.arch}}.rpm</a></h4>
 
@@ -313,4 +313,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/rpmlist.html.j2 b/www/kojiweb/templates/rpmlist.html.j2
similarity index 97%
rename from www/kojiweb/rpmlist.html.j2
rename to www/kojiweb/templates/rpmlist.html.j2
index f0c11fbc..fb94c413 100644
--- a/www/kojiweb/rpmlist.html.j2
+++ b/www/kojiweb/templates/rpmlist.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #macro getID()
   #if type == 'image'
@@ -107,4 +107,4 @@ colspan="2"
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/rpmsbyhost.html.j2 b/www/kojiweb/templates/rpmsbyhost.html.j2
similarity index 97%
rename from www/kojiweb/rpmsbyhost.html.j2
rename to www/kojiweb/templates/rpmsbyhost.html.j2
index 007e323a..1f068608 100644
--- a/www/kojiweb/rpmsbyhost.html.j2
+++ b/www/kojiweb/templates/rpmsbyhost.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>{{ rpmArch + ' ' if rpmArch else '' }}RPMs by Host{{ ' (%s)' % hostArch if hostArch else '' }}</h4>
   <table class="data-list">
@@ -104,4 +104,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/search.html.j2 b/www/kojiweb/templates/search.html.j2
similarity index 97%
rename from www/kojiweb/search.html.j2
rename to www/kojiweb/templates/search.html.j2
index 649d15b2..1e953299 100644
--- a/www/kojiweb/search.html.j2
+++ b/www/kojiweb/templates/search.html.j2
@@ -1,5 +1,5 @@
-{% include "includes/header.html.j2" %}
-{% from 'includes/macros.html.j2' import rowToggle %}
+{% include "header.html.j2" %}
+{% from 'macros.html.j2' import rowToggle %}
 
 
   <h4>Search</h4>
@@ -113,4 +113,4 @@
   </table>
 {% endif %}
 
-{% include "includes/footer.html.j2" %}
+{% include "footer.html.j2" %}
diff --git a/www/kojiweb/tagedit.html.j2 b/www/kojiweb/templates/tagedit.html.j2
similarity index 96%
rename from www/kojiweb/tagedit.html.j2
rename to www/kojiweb/templates/tagedit.html.j2
index 376d4720..7d267c04 100644
--- a/www/kojiweb/tagedit.html.j2
+++ b/www/kojiweb/templates/tagedit.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   #if tag
   <h4>Edit tag {{ tag.name }}</h4>
@@ -61,4 +61,4 @@
     </table>
   </form>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/taginfo.html.j2 b/www/kojiweb/templates/taginfo.html.j2
similarity index 98%
rename from www/kojiweb/taginfo.html.j2
rename to www/kojiweb/templates/taginfo.html.j2
index c9ad5355..3b4bc3e8 100644
--- a/www/kojiweb/taginfo.html.j2
+++ b/www/kojiweb/templates/taginfo.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a></h4>
 
@@ -174,4 +174,4 @@
     #endif
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/taginfo_deleted.html.j2 b/www/kojiweb/templates/taginfo_deleted.html.j2
similarity index 82%
rename from www/kojiweb/taginfo_deleted.html.j2
rename to www/kojiweb/templates/taginfo_deleted.html.j2
index 5ba2540a..6eda2760 100644
--- a/www/kojiweb/taginfo_deleted.html.j2
+++ b/www/kojiweb/templates/taginfo_deleted.html.j2
@@ -1,4 +1,4 @@
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for deleted tag <a href="taginfo?tagID={{ tag.id }}">{{ tag.name }}</a></h4>
 
@@ -14,4 +14,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/tagparent.html.j2 b/www/kojiweb/templates/tagparent.html.j2
similarity index 96%
rename from www/kojiweb/tagparent.html.j2
rename to www/kojiweb/templates/tagparent.html.j2
index c4f13ab3..5c6dd692 100644
--- a/www/kojiweb/tagparent.html.j2
+++ b/www/kojiweb/templates/tagparent.html.j2
@@ -1,5 +1,5 @@
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   #if inheritanceData
   <h4>Edit Parent</h4>
@@ -68,4 +68,4 @@
     </table>
   </form>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/tags.html.j2 b/www/kojiweb/templates/tags.html.j2
similarity index 96%
rename from www/kojiweb/tags.html.j2
rename to www/kojiweb/templates/tags.html.j2
index 0c873b1d..b7dd6a65 100644
--- a/www/kojiweb/tags.html.j2
+++ b/www/kojiweb/templates/tags.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Tags</h4>
   <table class="data-list">
@@ -73,4 +73,4 @@
   <a href="tagcreate{{ util.authToken(first=True) }}">Create new Tag</a>
   #endif
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/taskinfo.html.j2 b/www/kojiweb/templates/taskinfo.html.j2
similarity index 99%
rename from www/kojiweb/taskinfo.html.j2
rename to www/kojiweb/templates/taskinfo.html.j2
index 4f913068..453d37d2 100644
--- a/www/kojiweb/taskinfo.html.j2
+++ b/www/kojiweb/templates/taskinfo.html.j2
@@ -95,7 +95,7 @@ None
 #endmacro
 
 
-#include "includes/header.html.j2"
+#include "header.html.j2"
 
   <h4>Information for task <a href="taskinfo?taskID={{ task.id }}">{{ koji.taskLabel(task) }}</a></h4>
 
@@ -321,4 +321,4 @@ None
     })();
   </script>
 #endif
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/tasks.html.j2 b/www/kojiweb/templates/tasks.html.j2
similarity index 98%
rename from www/kojiweb/tasks.html.j2
rename to www/kojiweb/templates/tasks.html.j2
index 4dae37af..d77170b7 100644
--- a/www/kojiweb/tasks.html.j2
+++ b/www/kojiweb/templates/tasks.html.j2
@@ -34,8 +34,8 @@ All
 
 #set _PASSTHROUGH = ['owner', 'state', 'view', 'method', 'hostID', 'channelID', 'order']
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
 #macro getDescription()
 {{ headerPrefix(state) }}
@@ -219,4 +219,4 @@ in channel <a href="channelinfo?channelID={{ channel.id }}">{{ channel.name }}</
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/tasksbyhost.html.j2 b/www/kojiweb/templates/tasksbyhost.html.j2
similarity index 96%
rename from www/kojiweb/tasksbyhost.html.j2
rename to www/kojiweb/templates/tasksbyhost.html.j2
index 9171c942..83bb9ae6 100644
--- a/www/kojiweb/tasksbyhost.html.j2
+++ b/www/kojiweb/templates/tasksbyhost.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Tasks by Host{{ ' (%s)' % hostArch if hostArch else '' }}</h4>
   <table class="data-list">
@@ -87,4 +87,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/tasksbyuser.html.j2 b/www/kojiweb/templates/tasksbyuser.html.j2
similarity index 96%
rename from www/kojiweb/tasksbyuser.html.j2
rename to www/kojiweb/templates/tasksbyuser.html.j2
index 66891c1a..64d7a91d 100644
--- a/www/kojiweb/tasksbyuser.html.j2
+++ b/www/kojiweb/templates/tasksbyuser.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Tasks by User</h4>
   <table class="data-list">
@@ -70,4 +70,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/userinfo.html.j2 b/www/kojiweb/templates/userinfo.html.j2
similarity index 97%
rename from www/kojiweb/userinfo.html.j2
rename to www/kojiweb/templates/userinfo.html.j2
index b443d71a..bf20e6d3 100644
--- a/www/kojiweb/userinfo.html.j2
+++ b/www/kojiweb/templates/userinfo.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Information for user <a href="userinfo?userID={{ user.id }}">{{ user.name }}</a></h4>
 
@@ -105,4 +105,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/kojiweb/users.html.j2 b/www/kojiweb/templates/users.html.j2
similarity index 96%
rename from www/kojiweb/users.html.j2
rename to www/kojiweb/templates/users.html.j2
index b1ef3fcd..7a2d0d47 100644
--- a/www/kojiweb/users.html.j2
+++ b/www/kojiweb/templates/users.html.j2
@@ -1,6 +1,6 @@
 
-#include "includes/header.html.j2"
-# from "includes/macros.html.j2" import rowToggle
+#include "header.html.j2"
+# from "macros.html.j2" import rowToggle
 
   <h4>Users {{ ' starting with "%s"' % prefix if prefix else '' }}</h4>
   <table class="data-list">
@@ -91,4 +91,4 @@
     </tr>
   </table>
 
-#include "includes/footer.html.j2"
+#include "footer.html.j2"
diff --git a/www/lib/kojiweb/util.py b/www/lib/kojiweb/util.py
index 0ca47d34..db3fe6f1 100644
--- a/www/lib/kojiweb/util.py
+++ b/www/lib/kojiweb/util.py
@@ -157,10 +157,6 @@ def get_jinja_env(dirpath):
 
 
 def _genHTML(environ, fileName):
-    reqdir = os.path.dirname(environ['SCRIPT_FILENAME'])
-    if os.getcwd() != reqdir:
-        os.chdir(reqdir)
-
     if 'koji.currentUser' in environ:
         environ['koji.values']['currentUser'] = environ['koji.currentUser']
         environ['koji.values']['greeting'] = random.choice(greetings)
@@ -183,6 +179,7 @@ def _genHTML(environ, fileName):
         else:
             environ['koji.values']['LoginDisabled'] = False
 
+    reqdir = os.path.dirname(environ['SCRIPT_FILENAME']) + '/templates'
     env = get_jinja_env(reqdir)
     template = env.get_template(fileName)
     return template.render(**environ['koji.values'])