diff --git a/gistpress.php b/gistpress.php
index 74d0875..7dcb11e 100644
--- a/gistpress.php
+++ b/gistpress.php
@@ -25,13 +25,13 @@
 
 // Instantiate main plugin class.
 if ( ! class_exists( 'GistPress' ) ) {
-	require( plugin_dir_path( __FILE__ ) . 'class-gistpress.php' );
+	require( plugin_dir_path( __FILE__ ) . 'includes/class-gistpress.php' );
 }
 $gistpress = new GistPress;
 
 // Instantiate logging class.
 if ( ! class_exists( 'GistPress_Log' ) ) {
-	require( plugin_dir_path( __FILE__ ) . 'class-gistpress-log.php' );
+	require( plugin_dir_path( __FILE__ ) . 'includes/class-gistpress-log.php' );
 }
 $gistpress_logger = new GistPress_Log;
 
@@ -79,7 +79,7 @@ function gistpress_add_debug_bar_panel( array $panels ) {
 
 	if ( ! is_admin() ) {
 		if ( ! class_exists( 'GistPress_Debug_Bar_Panel' ) ) {
-			require( plugin_dir_path( __FILE__ ) . 'class-gistpress-debug-bar-panel.php' );
+			require( plugin_dir_path( __FILE__ ) . 'includes/class-gistpress-debug-bar-panel.php' );
 		}
 
 		$panels[] = new GistPress_Debug_Bar_Panel( $gistpress_logger );
diff --git a/class-gistpress-debug-bar-panel.php b/includes/class-gistpress-debug-bar-panel.php
similarity index 100%
rename from class-gistpress-debug-bar-panel.php
rename to includes/class-gistpress-debug-bar-panel.php
diff --git a/class-gistpress-log.php b/includes/class-gistpress-log.php
similarity index 100%
rename from class-gistpress-log.php
rename to includes/class-gistpress-log.php
diff --git a/class-gistpress.php b/includes/class-gistpress.php
similarity index 100%
rename from class-gistpress.php
rename to includes/class-gistpress.php