diff --git a/Netdisco/lib/Netdisco/Web.pm b/Netdisco/lib/Netdisco/Web.pm
index fe88b622..0744d76f 100644
--- a/Netdisco/lib/Netdisco/Web.pm
+++ b/Netdisco/lib/Netdisco/Web.pm
@@ -11,7 +11,7 @@ use Netdisco::Web::AuthN;
 use Netdisco::Web::Search;
 use Netdisco::Web::Device;
 
-before_template sub {
+hook 'before_template' => sub {
     my $tokens = shift;
 
     # allow portable static content
diff --git a/Netdisco/views/device.tt b/Netdisco/views/device.tt
index 66061541..7ba4030b 100644
--- a/Netdisco/views/device.tt
+++ b/Netdisco/views/device.tt
@@ -8,7 +8,7 @@
             <h3 class="device_label">[% d.ip %]</h3>
             <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
           </div>
-          [%+ TRY %][% INCLUDE "inc/device/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
+          [%+ TRY %][% INCLUDE "sidebar/device/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
         </div> <!-- /tab-pane -->
         [% END %]
       </div> <!-- /tab-content -->
@@ -29,5 +29,5 @@
 </div>
 
 <script type="text/javascript">
-[%+ INCLUDE 'inc/js/device.js' -%]
+[%+ INCLUDE 'js/device.js' -%]
 </script>
diff --git a/Netdisco/views/inc/js/device.js b/Netdisco/views/js/device.js
similarity index 100%
rename from Netdisco/views/inc/js/device.js
rename to Netdisco/views/js/device.js
diff --git a/Netdisco/views/inc/js/search.js b/Netdisco/views/js/search.js
similarity index 100%
rename from Netdisco/views/inc/js/search.js
rename to Netdisco/views/js/search.js
diff --git a/Netdisco/views/search.tt b/Netdisco/views/search.tt
index 77ac073e..cc623fec 100644
--- a/Netdisco/views/search.tt
+++ b/Netdisco/views/search.tt
@@ -8,7 +8,7 @@
             <div class="clearfix">
               <input class="span3" name="q" value="[% params.q %]" type="text"/>
             </div>
-            [%+ TRY %][% INCLUDE "inc/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
+            [%+ TRY %][% INCLUDE "sidebar/search/${tab.id}.tt" %][% CATCH %]<!-- no "[% tab.id %]" search options -->[% END %]
             <input name="tab" value="[% tab.id %]" type="hidden"/>
             <div class="nd_search clearfix">
               <button id="[% tab.id %]_submit" type="submit" class="btn info">Search Again</button>
@@ -38,5 +38,5 @@
 </div>
 
 <script type="text/javascript">
-[%+ INCLUDE 'inc/js/search.js' -%]
+[%+ INCLUDE 'js/search.js' -%]
 </script>
diff --git a/Netdisco/views/inc/device/addresses.tt b/Netdisco/views/sidebar/device/addresses.tt
similarity index 100%
rename from Netdisco/views/inc/device/addresses.tt
rename to Netdisco/views/sidebar/device/addresses.tt
diff --git a/Netdisco/views/inc/device/details.tt b/Netdisco/views/sidebar/device/details.tt
similarity index 100%
rename from Netdisco/views/inc/device/details.tt
rename to Netdisco/views/sidebar/device/details.tt
diff --git a/Netdisco/views/inc/device/modules.tt b/Netdisco/views/sidebar/device/modules.tt
similarity index 100%
rename from Netdisco/views/inc/device/modules.tt
rename to Netdisco/views/sidebar/device/modules.tt
diff --git a/Netdisco/views/inc/device/ports.tt b/Netdisco/views/sidebar/device/ports.tt
similarity index 100%
rename from Netdisco/views/inc/device/ports.tt
rename to Netdisco/views/sidebar/device/ports.tt
diff --git a/Netdisco/views/inc/search/device.tt b/Netdisco/views/sidebar/search/device.tt
similarity index 100%
rename from Netdisco/views/inc/search/device.tt
rename to Netdisco/views/sidebar/search/device.tt
diff --git a/Netdisco/views/inc/search/node.tt b/Netdisco/views/sidebar/search/node.tt
similarity index 100%
rename from Netdisco/views/inc/search/node.tt
rename to Netdisco/views/sidebar/search/node.tt