diff --git a/lib/uplot/command.rb b/lib/uplot/command.rb
index 8f82e6b..292bde0 100644
--- a/lib/uplot/command.rb
+++ b/lib/uplot/command.rb
@@ -5,33 +5,6 @@ module Uplot
   Data = Struct.new(:headers, :series)
 
   class Command
-    Params = Struct.new(
-      # Sort me!
-      :title,
-      :width,
-      :height,
-      :border,
-      :margin,
-      :padding,
-      :color,
-      :xlabel,
-      :ylabel,
-      :labels,
-      :symbol,
-      :xscale,
-      :nbins,
-      :closed,
-      :canvas,
-      :xlim,
-      :ylim,
-      :grid,
-      :name
-    ) do
-      def to_hc
-        to_h.compact
-      end
-    end
-
     attr_accessor :params, :command
     attr_reader :raw_inputs, :data, :fmt
 
diff --git a/lib/uplot/command/params.rb b/lib/uplot/command/params.rb
new file mode 100644
index 0000000..1b5d6a2
--- /dev/null
+++ b/lib/uplot/command/params.rb
@@ -0,0 +1,30 @@
+module Uplot
+  class Command
+    Params = Struct.new(
+      # Sort me!
+      :title,
+      :width,
+      :height,
+      :border,
+      :margin,
+      :padding,
+      :color,
+      :xlabel,
+      :ylabel,
+      :labels,
+      :symbol,
+      :xscale,
+      :nbins,
+      :closed,
+      :canvas,
+      :xlim,
+      :ylim,
+      :grid,
+      :name
+    ) do
+      def to_hc
+        to_h.compact
+      end
+    end
+  end
+end