diff --git a/functions.php b/functions.php
index 8c4ee29..e015e73 100644
--- a/functions.php
+++ b/functions.php
@@ -8,12 +8,14 @@ if (!defined('__DIR__')) { define('__DIR__', dirname(__FILE__)); }
 require_once locate_template('/lib/utils.php');           // Utility functions
 require_once locate_template('/lib/config.php');          // Configuration and constants
 require_once locate_template('/lib/activation.php');      // Theme activation
-require_once locate_template('/lib/template-tags.php');   // Template tags
 require_once locate_template('/lib/cleanup.php');         // Cleanup
-require_once locate_template('/lib/scripts.php');         // Scripts and stylesheets
 require_once locate_template('/lib/htaccess.php');        // Rewrites for assets, H5BP .htaccess
-require_once locate_template('/lib/actions.php');         // Actions
 require_once locate_template('/lib/widgets.php');         // Sidebars and widgets
+require_once locate_template('/lib/template-tags.php');   // Template tags
+require_once locate_template('/lib/actions.php');         // Actions
+require_once locate_template('/lib/scripts.php');         // Scripts and stylesheets
+require_once locate_template('/lib/post-types.php')       // Custom post types
+require_once locate_template('/lib/metaboxes.php'         // Custom metaboxes
 require_once locate_template('/lib/custom.php');          // Custom functions
 
 function roots_setup() {
diff --git a/lib/metaboxes.php b/lib/metaboxes.php
new file mode 100644
index 0000000..eea11e3
--- /dev/null
+++ b/lib/metaboxes.php
@@ -0,0 +1,3 @@
+<?php
+
+// Custom metaboxes
diff --git a/lib/post-types.php b/lib/post-types.php
new file mode 100644
index 0000000..6a8972d
--- /dev/null
+++ b/lib/post-types.php
@@ -0,0 +1,3 @@
+<?php
+
+// Custom post types