--- a/lib/kipling/commands/timeline_command.rb
+++ b/lib/kipling/commands/timeline_command.rb
@@ -22,14 +22,14 @@ module Kipling
       
       def renderer
         if out =~ /\.png/
-          Renderer::Ploticus.new(:day, out)
+          Renderer::Timeline::Ploticus.new(:day, out)
         else
           {
             'tabs' => lambda do
-              Renderer::Tabs.new
+              Renderer::Timeline::Tabs.new
             end, 
             'ascii' => lambda do
-              Renderer::AsciiBar.new(:day, 333333)
+              Renderer::Timeline::Ascii.new(:day, 333333)
             end
           }[@renderer].call
         end

--- a/lib/kipling/renderer.rb
+++ b/lib/kipling/renderer.rb
@@ -1,6 +1,4 @@
-require 'kipling/renderer/ploticus'
-require 'kipling/renderer/ascii_bar'
-require 'kipling/renderer/tabs'
+require 'kipling/renderer/timeline'
 require 'kipling/renderer/snapshot'
 
 module Kipling

--- a/lib/kipling/renderer/ascii_bar.rb
+++ /dev/null
@@ -1,32 +0,0 @@
-module Kipling
-  module Renderer
-    # Original code from Neelakanth Nadgir, http://blogs.sun.com/realneel/entry/ascii_graphs_using_ruby
-    class AsciiBar
-      WIDTH = 72
-      HEIGHT = 16
-      
-      def initialize(scale, out)
-      end
-
-      def render(data, names)
-        raise "data must have exactly 2 columns. It was #{data[0].length}" unless data[0].length == 2
-        data = data.map{|a| a[1]}
-        
-        #Adjust X axis when there are more than WIDTH cols
-        if data.length > WIDTH then
-          old_values = data;
-          data = []
-          0.upto(WIDTH - 1){ |i| data << old_values[i*old_values.length/WIDTH]}
-        end
-        max = data.max
-        # initialize display with blanks
-        display = Array.new(HEIGHT).collect { Array.new(WIDTH, ' ') }
-        data.each_with_index do |e, i|
-          num= e*HEIGHT/max
-          (HEIGHT - 1).downto(HEIGHT - 1 - num){|j| display[j][i] = '|'}
-        end    
-        display.each{|ar| ar.each{|e| putc e}; puts "\n"} #now print
-      end
-    end
-  end
-end

--- a/lib/kipling/renderer/ploticus.rb
+++ /dev/null
@@ -1,71 +0,0 @@
-require 'time'
-
-module Kipling
-  module Renderer
-    class Ploticus
-      # http://ploticus.sourceforge.net/doc/dates.html
-      DATE_FORMATS = {
-        :day => {
-          :script_fmt => '%y/%m/%d',
-          :datefmt    => 'yy/mm/dd',
-          :stubfmt    => 'MMMdd',
-          :xinc       => '"1 day"',
-          :mode       => 'bars',
-          :xyears     => 'xyears=yyyy'
-        },
-        :hour => {
-          :script_fmt => '%y/%m/%d.%H:%M',
-          :datefmt    => 'yy/mm/dd',
-          :stubfmt    => 'hh:mm',
-          :xinc       => '"4 hours"',
-          :mode       => 'line',
-          :xyears     => nil
-        }
-      }
-    
-      def initialize(scale, out)
-        @p = DATE_FORMATS[scale]
-        raise "BAD SCALE: #{scale}" if @p.nil?
-        @out = out
-      end
-
-      def render(points, grouping_values)
-        script = Tabs.new(@p[:script_fmt]).text(points, grouping_values)
-
-        # y=dev y2=done
-        n = 0
-        ys = grouping_values.map do |grouping_value|
-          n += 1
-          y = (n==1) ? '' : n
-          "y#{y}=#{grouping_value}"
-        end.join(' ')
-
-        # http://ploticus.sourceforge.net/doc/prefab_chron_ex.html
-        cmd = <<-EOF
-ploticus -png
--o #{@out}
--prefab chron
-header=yes
-x=dt
-#{ys}
-unittype=datetime
-mode=#{@p[:mode]}
-datefmt=#{@p[:datefmt]}
-xinc=#{@p[:xinc]}
-stubfmt=#{@p[:stubfmt]}
-#{@p[:xyears]}
-title=\"Iteration Burndown\" 
-barwidth=0.2
-color=powderblue
-omitweekends=no
-data=stdin
-legendfmt=singleline
-EOF
-        cmd = cmd.split(/\n/).join(' ')
-        IO.popen(cmd, "w") do |io|
-          io << script
-        end
-      end
-    end
-  end
-end
\ No newline at end of file

--- a/lib/kipling/renderer/tabs.rb
+++ /dev/null
@@ -1,24 +0,0 @@
-require 'time'
-
-module Kipling
-  module Renderer
-    # Renders a timeline as a tab-delimited file
-    class Tabs
-      def initialize(time_format = '%y/%m/%d')
-        @time_format = time_format
-      end
-
-      def render(points, grouping_values)
-        puts text(points, grouping_values)
-      end
-      
-      def text(points, grouping_values)
-        script = "dt #{grouping_values.join(' ')}\n" + points.map do |point|
-          point = point.dup
-          point[0] = point[0].strftime(@time_format)
-          point.join(" ")
-        end.join("\n")
-      end
-    end
-  end
-end
\ No newline at end of file

--- /dev/null
+++ b/lib/kipling/renderer/timeline.rb
@@ -0,0 +1,3 @@
+require 'kipling/renderer/timeline/ascii'
+require 'kipling/renderer/timeline/tabs'
+require 'kipling/renderer/timeline/ploticus'
\ No newline at end of file

--- /dev/null
+++ b/lib/kipling/renderer/timeline/ascii.rb
@@ -0,0 +1,34 @@
+module Kipling
+  module Renderer
+    module Timeline
+      # Original code from Neelakanth Nadgir, http://blogs.sun.com/realneel/entry/ascii_graphs_using_ruby
+      class Ascii
+        WIDTH = 72
+        HEIGHT = 16
+      
+        def initialize(scale, out)
+        end
+
+        def render(data, names)
+          raise "data must have exactly 2 columns. It was #{data[0].length}" unless data[0].length == 2
+          data = data.map{|a| a[1]}
+        
+          #Adjust X axis when there are more than WIDTH cols
+          if data.length > WIDTH then
+            old_values = data;
+            data = []
+            0.upto(WIDTH - 1){ |i| data << old_values[i*old_values.length/WIDTH]}
+          end
+          max = data.max
+          # initialize display with blanks
+          display = Array.new(HEIGHT).collect { Array.new(WIDTH, ' ') }
+          data.each_with_index do |e, i|
+            num= e*HEIGHT/max
+            (HEIGHT - 1).downto(HEIGHT - 1 - num){|j| display[j][i] = '|'}
+          end    
+          display.each{|ar| ar.each{|e| putc e}; puts "\n"} #now print
+        end
+      end
+    end
+  end
+end

--- /dev/null
+++ b/lib/kipling/renderer/timeline/ploticus.rb
@@ -0,0 +1,73 @@
+require 'time'
+
+module Kipling
+  module Renderer
+    module Timeline
+      class Ploticus
+        # http://ploticus.sourceforge.net/doc/dates.html
+        DATE_FORMATS = {
+          :day => {
+            :script_fmt => '%y/%m/%d',
+            :datefmt    => 'yy/mm/dd',
+            :stubfmt    => 'MMMdd',
+            :xinc       => '"1 day"',
+            :mode       => 'bars',
+            :xyears     => 'xyears=yyyy'
+          },
+          :hour => {
+            :script_fmt => '%y/%m/%d.%H:%M',
+            :datefmt    => 'yy/mm/dd',
+            :stubfmt    => 'hh:mm',
+            :xinc       => '"4 hours"',
+            :mode       => 'line',
+            :xyears     => nil
+          }
+        }
+    
+        def initialize(scale, out)
+          @p = DATE_FORMATS[scale]
+          raise "BAD SCALE: #{scale}" if @p.nil?
+          @out = out
+        end
+
+        def render(points, grouping_values)
+          script = Tabs.new(@p[:script_fmt]).text(points, grouping_values)
+
+          # y=dev y2=done
+          n = 0
+          ys = grouping_values.map do |grouping_value|
+            n += 1
+            y = (n==1) ? '' : n
+            "y#{y}=#{grouping_value}"
+          end.join(' ')
+
+          # http://ploticus.sourceforge.net/doc/prefab_chron_ex.html
+          cmd = <<-EOF
+ploticus -png
+-o #{@out}
+-prefab chron
+header=yes
+x=dt
+#{ys}
+unittype=datetime
+mode=#{@p[:mode]}
+datefmt=#{@p[:datefmt]}
+xinc=#{@p[:xinc]}
+stubfmt=#{@p[:stubfmt]}
+#{@p[:xyears]}
+title=\"Iteration Burndown\" 
+barwidth=0.2
+color=powderblue
+omitweekends=no
+data=stdin
+legendfmt=singleline
+EOF
+          cmd = cmd.split(/\n/).join(' ')
+          IO.popen(cmd, "w") do |io|
+            io << script
+          end
+        end
+      end
+    end
+  end
+end
\ No newline at end of file

--- /dev/null
+++ b/lib/kipling/renderer/timeline/tabs.rb
@@ -0,0 +1,26 @@
+require 'time'
+
+module Kipling
+  module Renderer
+    module Timeline
+      # Renders a timeline as a tab-delimited file
+      class Tabs
+        def initialize(time_format = '%y/%m/%d')
+          @time_format = time_format
+        end
+
+        def render(points, grouping_values)
+          puts text(points, grouping_values)
+        end
+      
+        def text(points, grouping_values)
+          script = "dt #{grouping_values.join(' ')}\n" + points.map do |point|
+            point = point.dup
+            point[0] = point[0].strftime(@time_format)
+            point.join(" ")
+          end.join("\n")
+        end
+      end
+    end
+  end
+end
\ No newline at end of file