diff --git a/functions.php b/functions.php
index 8a6ff6a..2ca45c0 100644
--- a/functions.php
+++ b/functions.php
@@ -4,6 +4,7 @@
  */
 require_once locate_template('/lib/utils.php');           // Utility functions
 require_once locate_template('/lib/init.php');            // Initial theme setup and constants
+require_once locate_template('/lib/wrapper.php');         // Theme wrapper class
 require_once locate_template('/lib/sidebar.php');         // Sidebar class
 require_once locate_template('/lib/config.php');          // Configuration
 require_once locate_template('/lib/activation.php');      // Theme activation
diff --git a/lib/utils.php b/lib/utils.php
index 4a663be..f818029 100644
--- a/lib/utils.php
+++ b/lib/utils.php
@@ -1,56 +1,4 @@
 <?php
-/**
- * Theme wrapper
- *
- * @link http://scribu.net/wordpress/theme-wrappers.html
- */
-function roots_template_path() {
-  return Roots_Wrapping::$main_template;
-}
-
-function roots_sidebar_path() {
-  return Roots_Wrapping::sidebar();
-}
-
-class Roots_Wrapping {
-  // Stores the full path to the main template file
-  static $main_template;
-
-  // Stores the base name of the template file; e.g. 'page' for 'page.php' etc.
-  static $base;
-
-  static function wrap($template) {
-    self::$main_template = $template;
-
-    self::$base = substr(basename(self::$main_template), 0, -4);
-
-    if (self::$base === 'index') {
-      self::$base = false;
-    }
-
-    $templates = array('base.php');
-
-    if (self::$base) {
-      array_unshift($templates, sprintf('base-%s.php', self::$base));
-    }
-
-    $templates = apply_filters('roots_wrap_base', $templates);
-    return locate_template($templates);
-  }
-
-  static function sidebar() {
-    $templates = array('templates/sidebar.php');
-
-    if (self::$base) {
-      array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base));
-    }
-
-    $templates = apply_filters('roots_wrap_sidebar', $templates);
-    return locate_template($templates);
-  }
-}
-add_filter('template_include', array('Roots_Wrapping', 'wrap'), 99);
-
 /**
  * Page titles
  */
diff --git a/lib/wrapper.php b/lib/wrapper.php
new file mode 100644
index 0000000..1ce5e5f
--- /dev/null
+++ b/lib/wrapper.php
@@ -0,0 +1,52 @@
+<?php
+/**
+ * Theme wrapper
+ *
+ * @link http://scribu.net/wordpress/theme-wrappers.html
+ */
+function roots_template_path() {
+  return Roots_Wrapping::$main_template;
+}
+
+function roots_sidebar_path() {
+  return Roots_Wrapping::sidebar();
+}
+
+class Roots_Wrapping {
+  // Stores the full path to the main template file
+  static $main_template;
+
+  // Stores the base name of the template file; e.g. 'page' for 'page.php' etc.
+  static $base;
+
+  static function wrap($template) {
+    self::$main_template = $template;
+
+    self::$base = substr(basename(self::$main_template), 0, -4);
+
+    if (self::$base === 'index') {
+      self::$base = false;
+    }
+
+    $templates = array('base.php');
+
+    if (self::$base) {
+      array_unshift($templates, sprintf('base-%s.php', self::$base));
+    }
+
+    $templates = apply_filters('roots_wrap_base', $templates);
+    return locate_template($templates);
+  }
+
+  static function sidebar() {
+    $templates = array('templates/sidebar.php');
+
+    if (self::$base) {
+      array_unshift($templates, sprintf('templates/sidebar-%s.php', self::$base));
+    }
+
+    $templates = apply_filters('roots_wrap_sidebar', $templates);
+    return locate_template($templates);
+  }
+}
+add_filter('template_include', array('Roots_Wrapping', 'wrap'), 99);