Index: src/wp-content/themes/twentyfifteen/inc/class-twentyfifteen-customize-color-scheme-control.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/class-twentyfifteen-customize-color-scheme-control.php	(revision 0)
+++ src/wp-content/themes/twentyfifteen/inc/class-twentyfifteen-customize-color-scheme-control.php	(working copy)
@@ -0,0 +1,40 @@
+<?php
+/**
+ * The Color Scheme Customizer control class.
+ *
+ * @package WordPress
+ * @subpackage Twenty_Fifteen
+ * @since Twenty Fifteen 1.0
+ */
+
+ class Twentyfifteen_Customize_Color_Scheme_Control extends WP_Customize_Control {
+	public $type = 'colorScheme';
+
+	function enqueue() {
+ 		wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls' ), '', true  );
+ 		wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
+ 	}
+
+	public function render_content() {
+		if ( empty( $this->choices ) )
+			return;
+
+		?>
+		<label>
+			<?php if ( ! empty( $this->label ) ) : ?>
+				<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
+			<?php endif;
+			if ( ! empty( $this->description ) ) : ?>
+				<span class="description customize-control-description"><?php echo $this->description; ?></span>
+			<?php endif; ?>
+
+			<select <?php $this->link(); ?>>
+				<?php
+				foreach ( $this->choices as $value => $label )
+					echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
+				?>
+			</select>
+		</label>
+		<?php
+	}
+}
Index: src/wp-content/themes/twentyfifteen/inc/customizer.php
===================================================================
--- src/wp-content/themes/twentyfifteen/inc/customizer.php	(revision 29895)
+++ src/wp-content/themes/twentyfifteen/inc/customizer.php	(working copy)
@@ -15,6 +15,9 @@
  * @param WP_Customize_Manager $wp_customize Theme Customizer object.
  */
 function twentyfifteen_customize_register( $wp_customize ) {
+	// Load the Twentyfifteen_Customize_Color_Scheme_Control class.
+	require( 'class-twentyfifteen-customize-color-scheme-control.php' );
+
 	$color_scheme = twentyfifteen_get_color_scheme();
 
 	$wp_customize->get_setting( 'blogname' )->transport         = 'postMessage';
@@ -56,49 +59,9 @@
 		'section' => 'colors',
 	) ) );
 }
-add_action( 'customize_register', 'twentyfifteen_customize_register', 11 );
+add_action( 'customize_register', 'twentyfifteen_customize_register' );
 
 /**
- * Custom control for Color Schemes
- *
- * @since Twenty Fifteen 1.0
- */
-function twentyfifteen_customize_color_scheme_control() {
-	class Twentyfifteen_Customize_Color_Scheme_Control extends WP_Customize_Control {
-		public $type = 'colorScheme';
-
-		function enqueue() {
-	 		wp_enqueue_script( 'color-scheme-control', get_template_directory_uri() . '/js/color-scheme-control.js', array( 'customize-controls' ), '', true  );
-	 		wp_localize_script( 'color-scheme-control', 'colorScheme', twentyfifteen_get_color_schemes() );
-	 	}
-
-		public function render_content() {
-			if ( empty( $this->choices ) )
-				return;
-
-			?>
-			<label>
-				<?php if ( ! empty( $this->label ) ) : ?>
-					<span class="customize-control-title"><?php echo esc_html( $this->label ); ?></span>
-				<?php endif;
-				if ( ! empty( $this->description ) ) : ?>
-					<span class="description customize-control-description"><?php echo $this->description; ?></span>
-				<?php endif; ?>
-
-				<select <?php $this->link(); ?>>
-					<?php
-					foreach ( $this->choices as $value => $label )
-						echo '<option value="' . esc_attr( $value ) . '"' . selected( $this->value(), $value, false ) . '>' . $label . '</option>';
-					?>
-				</select>
-			</label>
-			<?php
-		}
-	}
-}
-add_action( 'customize_register', 'twentyfifteen_customize_color_scheme_control', 10 );
-
-/**
  * Register color schemes for Twenty Fifteen.
  * Can be filtered with twentyfifteen_color_schemes.
  *