diff --git a/src/spectator.cr b/src/spectator.cr
index bff5ef3..515d9ad 100644
--- a/src/spectator.cr
+++ b/src/spectator.cr
@@ -43,14 +43,14 @@ module Spectator
     exit(1) if autorun? && !run
   end
 
-  @@config_builder = ConfigBuilder.new
+  @@config_builder = Config::Builder.new
   @@config : Config?
 
   # Provides a means to configure how Spectator will run and report tests.
   # A `ConfigBuilder` is yielded to allow changing the configuration.
   # NOTE: The configuration set here can be overriden
   # with a `.spectator` file and command-line arguments.
-  def configure(& : ConfigBuilder -> _) : Nil
+  def configure(& : Config::Builder -> _) : Nil
     yield @@config_builder
   end
 
diff --git a/src/spectator/config/builder.cr b/src/spectator/config/builder.cr
index a61a465..39daeee 100644
--- a/src/spectator/config/builder.cr
+++ b/src/spectator/config/builder.cr
@@ -1,7 +1,7 @@
 require "../composite_example_filter"
 require "../example_filter"
+require "../formatting"
 require "../null_example_filter"
-require "../reporters"
 require "../run_flags"
 
 module Spectator
@@ -52,6 +52,7 @@ module Spectator
         case (formatters = self.formatters)
         when .one? then formatters.first
         else Formatting::BroadcastFormatter.new(formatters)
+        end
       end
 
       # Enables fail-fast mode.
diff --git a/src/spectator/includes.cr b/src/spectator/includes.cr
index e931000..9e9dd5f 100644
--- a/src/spectator/includes.cr
+++ b/src/spectator/includes.cr
@@ -7,11 +7,8 @@
 require "./abstract_expression"
 require "./anything"
 require "./block"
-require "./command_line_arguments_config_source"
 require "./composite_example_filter"
-require "./config_builder"
 require "./config"
-require "./config_source"
 require "./context"
 require "./context_delegate"
 require "./context_method"
@@ -52,6 +49,5 @@ require "./result"
 require "./spec"
 require "./tags"
 require "./test_context"
-require "./test_suite"
 require "./value"
 require "./wrapper"
diff --git a/src/spectator/spec/builder.cr b/src/spectator/spec/builder.cr
index dd76a7b..6aa6188 100644
--- a/src/spectator/spec/builder.cr
+++ b/src/spectator/spec/builder.cr
@@ -1,5 +1,4 @@
 require "../config"
-require "../config_builder"
 require "../example"
 require "../example_context_method"
 require "../example_group"
@@ -173,10 +172,10 @@ module Spectator
       end
 
       # Builds the configuration to use for the spec.
-      # A `ConfigBuilder` is yielded to the block provided to this method.
+      # A `Config::Builder` is yielded to the block provided to this method.
       # That builder will be used to create the configuration.
-      def configure(& : ConfigBuilder -> _) : Nil
-        builder = ConfigBuilder.new
+      def configure(& : Config::Builder -> _) : Nil
+        builder = Config::Builder.new
         yield builder
         @config = builder.build
       end
@@ -206,7 +205,7 @@ module Spectator
       # Retrieves the configuration.
       # If one wasn't previously set, a default configuration is used.
       private def config : Config
-        @config || ConfigBuilder.default
+        @config || Config.default
       end
     end
   end