diff --git a/functions.php b/functions.php
index 3be8cd7..b99d876 100644
--- a/functions.php
+++ b/functions.php
@@ -3,12 +3,12 @@
 // get active theme directory name (lets you rename roots)
 $theme_name = next(explode('/themes/', get_template_directory()));
 
-include_once('includes/roots-activation.php');	// activation
-include_once('includes/roots-admin.php');		// admin additions/mods
-include_once('includes/roots-options.php');		// theme options menu
-include_once('includes/roots-ob.php');			// output buffer
-include_once('includes/roots-cleanup.php');		// code cleanup/removal
-include_once('includes/roots-htaccess.php');	// h5bp htaccess
+include_once('inc/roots-activation.php');	// activation
+include_once('inc/roots-admin.php');		// admin additions/mods
+include_once('inc/roots-options.php');		// theme options menu
+include_once('inc/roots-ob.php');			// output buffer
+include_once('inc/roots-cleanup.php');		// code cleanup/removal
+include_once('inc/roots-htaccess.php');	// h5bp htaccess
 
 // set the value of the main container class depending on the selected grid framework
 $roots_css_framework = get_option('roots_css_framework');
diff --git a/includes/css/admin.css b/inc/css/admin.css
similarity index 100%
rename from includes/css/admin.css
rename to inc/css/admin.css
diff --git a/includes/css/codemirror/csscolors.css b/inc/css/codemirror/csscolors.css
similarity index 100%
rename from includes/css/codemirror/csscolors.css
rename to inc/css/codemirror/csscolors.css
diff --git a/includes/css/codemirror/docs.css b/inc/css/codemirror/docs.css
similarity index 100%
rename from includes/css/codemirror/docs.css
rename to inc/css/codemirror/docs.css
diff --git a/includes/css/codemirror/jscolors.css b/inc/css/codemirror/jscolors.css
similarity index 100%
rename from includes/css/codemirror/jscolors.css
rename to inc/css/codemirror/jscolors.css
diff --git a/includes/css/codemirror/sparqlcolors.css b/inc/css/codemirror/sparqlcolors.css
similarity index 100%
rename from includes/css/codemirror/sparqlcolors.css
rename to inc/css/codemirror/sparqlcolors.css
diff --git a/includes/css/codemirror/xmlcolors.css b/inc/css/codemirror/xmlcolors.css
similarity index 100%
rename from includes/css/codemirror/xmlcolors.css
rename to inc/css/codemirror/xmlcolors.css
diff --git a/includes/css/options.css b/inc/css/options.css
similarity index 100%
rename from includes/css/options.css
rename to inc/css/options.css
diff --git a/includes/img/icon-roots.png b/inc/img/icon-roots.png
similarity index 100%
rename from includes/img/icon-roots.png
rename to inc/img/icon-roots.png
diff --git a/includes/js/codemirror/codemirror.js b/inc/js/codemirror/codemirror.js
similarity index 100%
rename from includes/js/codemirror/codemirror.js
rename to inc/js/codemirror/codemirror.js
diff --git a/includes/js/codemirror/editor.js b/inc/js/codemirror/editor.js
similarity index 100%
rename from includes/js/codemirror/editor.js
rename to inc/js/codemirror/editor.js
diff --git a/includes/js/codemirror/highlight.js b/inc/js/codemirror/highlight.js
similarity index 100%
rename from includes/js/codemirror/highlight.js
rename to inc/js/codemirror/highlight.js
diff --git a/includes/js/codemirror/mirrorframe.js b/inc/js/codemirror/mirrorframe.js
similarity index 100%
rename from includes/js/codemirror/mirrorframe.js
rename to inc/js/codemirror/mirrorframe.js
diff --git a/includes/js/codemirror/parsecss.js b/inc/js/codemirror/parsecss.js
similarity index 100%
rename from includes/js/codemirror/parsecss.js
rename to inc/js/codemirror/parsecss.js
diff --git a/includes/js/codemirror/parsedummy.js b/inc/js/codemirror/parsedummy.js
similarity index 100%
rename from includes/js/codemirror/parsedummy.js
rename to inc/js/codemirror/parsedummy.js
diff --git a/includes/js/codemirror/parsehtmlmixed.js b/inc/js/codemirror/parsehtmlmixed.js
similarity index 100%
rename from includes/js/codemirror/parsehtmlmixed.js
rename to inc/js/codemirror/parsehtmlmixed.js
diff --git a/includes/js/codemirror/parsejavascript.js b/inc/js/codemirror/parsejavascript.js
similarity index 100%
rename from includes/js/codemirror/parsejavascript.js
rename to inc/js/codemirror/parsejavascript.js
diff --git a/includes/js/codemirror/parsesparql.js b/inc/js/codemirror/parsesparql.js
similarity index 100%
rename from includes/js/codemirror/parsesparql.js
rename to inc/js/codemirror/parsesparql.js
diff --git a/includes/js/codemirror/parsexml.js b/inc/js/codemirror/parsexml.js
similarity index 100%
rename from includes/js/codemirror/parsexml.js
rename to inc/js/codemirror/parsexml.js
diff --git a/includes/js/codemirror/select.js b/inc/js/codemirror/select.js
similarity index 100%
rename from includes/js/codemirror/select.js
rename to inc/js/codemirror/select.js
diff --git a/includes/js/codemirror/stringstream.js b/inc/js/codemirror/stringstream.js
similarity index 100%
rename from includes/js/codemirror/stringstream.js
rename to inc/js/codemirror/stringstream.js
diff --git a/includes/js/codemirror/tokenize.js b/inc/js/codemirror/tokenize.js
similarity index 100%
rename from includes/js/codemirror/tokenize.js
rename to inc/js/codemirror/tokenize.js
diff --git a/includes/js/codemirror/tokenizejavascript.js b/inc/js/codemirror/tokenizejavascript.js
similarity index 100%
rename from includes/js/codemirror/tokenizejavascript.js
rename to inc/js/codemirror/tokenizejavascript.js
diff --git a/includes/js/codemirror/undo.js b/inc/js/codemirror/undo.js
similarity index 100%
rename from includes/js/codemirror/undo.js
rename to inc/js/codemirror/undo.js
diff --git a/includes/js/codemirror/unittests.js b/inc/js/codemirror/unittests.js
similarity index 100%
rename from includes/js/codemirror/unittests.js
rename to inc/js/codemirror/unittests.js
diff --git a/includes/js/codemirror/util.js b/inc/js/codemirror/util.js
similarity index 100%
rename from includes/js/codemirror/util.js
rename to inc/js/codemirror/util.js
diff --git a/includes/js/options.js b/inc/js/options.js
similarity index 100%
rename from includes/js/options.js
rename to inc/js/options.js
diff --git a/includes/js/scripts.js b/inc/js/scripts.js
similarity index 61%
rename from includes/js/scripts.js
rename to inc/js/scripts.js
index bd51904..69cad7a 100644
--- a/includes/js/scripts.js
+++ b/inc/js/scripts.js
@@ -5,8 +5,8 @@ jQuery(document).ready(function(){
 //	var editor = CodeMirror.fromTextArea('content', {
 //		height: "350px",
 //		parserfile: "parsexml.js",
-//		stylesheet: "../wp-content/themes/roots/includes/css/codemirror/xmlcolors.css",
-//		path: "../wp-content/themes/roots/includes/js/codemirror/",
+//		stylesheet: "../wp-content/themes/roots/inc/css/codemirror/xmlcolors.css",
+//		path: "../wp-content/themes/roots/inc/js/codemirror/",
 //		continuousScanning: 500,
 //		lineNumbers: false
 //	});	
diff --git a/includes/roots-activation.php b/inc/roots-activation.php
similarity index 100%
rename from includes/roots-activation.php
rename to inc/roots-activation.php
diff --git a/includes/roots-admin.php b/inc/roots-admin.php
similarity index 92%
rename from includes/roots-admin.php
rename to inc/roots-admin.php
index 979df69..96347a7 100644
--- a/includes/roots-admin.php
+++ b/inc/roots-admin.php
@@ -7,13 +7,13 @@ function roots_admin_init() {
 	$home_url = home_url();
 	$theme_name = next(explode('/themes/', get_template_directory()));
 	
-	//wp_register_script('roots_codemirror', "$home_url/wp-content/themes/roots/includes/js/codemirror/codemirror.js");
+	//wp_register_script('roots_codemirror', "$home_url/wp-content/themes/roots/inc/js/codemirror/codemirror.js");
 	//wp_enqueue_script('roots_codemirror');
 
-	wp_register_style('roots_admin_css', "$home_url/wp-content/themes/$theme_name/includes/css/admin.css");
+	wp_register_style('roots_admin_css', "$home_url/wp-content/themes/$theme_name/inc/css/admin.css");
 	wp_enqueue_style('roots_admin_css');
 	
-	wp_register_script('roots_admin_js', "$home_url/wp-content/themes/$theme_name/includes/js/scripts.js");
+	wp_register_script('roots_admin_js', "$home_url/wp-content/themes/$theme_name/inc/js/scripts.js");
 	wp_enqueue_script('roots_admin_js');
 
 }
diff --git a/includes/roots-cleanup.php b/inc/roots-cleanup.php
similarity index 100%
rename from includes/roots-cleanup.php
rename to inc/roots-cleanup.php
diff --git a/includes/roots-htaccess.php b/inc/roots-htaccess.php
similarity index 100%
rename from includes/roots-htaccess.php
rename to inc/roots-htaccess.php
diff --git a/includes/roots-ob.php b/inc/roots-ob.php
similarity index 100%
rename from includes/roots-ob.php
rename to inc/roots-ob.php
diff --git a/includes/roots-options.php b/inc/roots-options.php
similarity index 97%
rename from includes/roots-options.php
rename to inc/roots-options.php
index 76d52a5..ae66cea 100644
--- a/includes/roots-options.php
+++ b/inc/roots-options.php
@@ -6,7 +6,7 @@ add_action('admin_menu', 'roots_create_menu');
 function roots_create_menu() {
 	$home_url = home_url();
 	$theme_name = next(explode('/themes/', get_template_directory()));
-	$icon = "$home_url/wp-content/themes/$theme_name/includes/img/icon-roots.png";
+	$icon = "$home_url/wp-content/themes/$theme_name/inc/img/icon-roots.png";
 
 	// create menu
 	$theme_name = get_current_theme();
@@ -26,10 +26,10 @@ function roots_admin_styles() {
 	$home_url = home_url();
 	$theme_name = next(explode('/themes/', get_template_directory()));
 
-	wp_register_style('roots_options_css', "$home_url/wp-content/themes/$theme_name/includes/css/options.css");
+	wp_register_style('roots_options_css', "$home_url/wp-content/themes/$theme_name/inc/css/options.css");
 	wp_enqueue_style('roots_options_css');
 	
-	wp_register_script('roots_options_js', "$home_url/wp-content/themes/$theme_name/includes/js/options.js");
+	wp_register_script('roots_options_js', "$home_url/wp-content/themes/$theme_name/inc/js/options.js");
 	wp_enqueue_script('roots_options_js');	
 
 	wp_register_style('jquery-ui-css', "http://ajax.googleapis.com/ajax/libs/jqueryui/1.8.9/themes/smoothness/jquery-ui.css");