diff --git a/.gitignore b/.gitignore
index f8000c6c7cce67194dc3c32a560114269fdd06d9..3a262620e2261b63f17bb467b6c6a8c1ed71168d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ target/
 .classpath
 .project
 .settings/
-*.png
\ No newline at end of file
+*.png
+CSV/
\ No newline at end of file
diff --git a/xchart-demo/CSV/CSVChart/series1.csv b/xchart-demo/CSV/CSVChart/series1.csv
deleted file mode 100644
index 18bcd34e66f5845392b7cbb951769c762967c66c..0000000000000000000000000000000000000000
--- a/xchart-demo/CSV/CSVChart/series1.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-1,2,3
-12,34,56
\ No newline at end of file
diff --git a/xchart-demo/CSV/CSVChart/series2.csv b/xchart-demo/CSV/CSVChart/series2.csv
deleted file mode 100644
index 0b3fe0d3a422dd4a410dbb5aece32369c30d8fc6..0000000000000000000000000000000000000000
--- a/xchart-demo/CSV/CSVChart/series2.csv
+++ /dev/null
@@ -1,2 +0,0 @@
-1,2,3
-56,34,12
\ No newline at end of file
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java
new file mode 100644
index 0000000000000000000000000000000000000000..3ad92707e7200faaed1095a0a3f894a365ef1a64
--- /dev/null
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java
@@ -0,0 +1,33 @@
+/**
+ * Copyright (c) 2013 Knowmtech <http://knowmtech.com>
+ * 
+ * All rights reserved. No warranty, explicit or implicit, provided. In no event shall the author be liable for any claim or damages.
+ * 
+ * IMPORTANT: THIS CODE IS PROPRIETARY!!! ABSOLUTELY NO DUPLICATION OR DISTRIBUTION IS PERMITTED WITHOUT EXPRESS WRITTEN PERMISSION FROM:
+ * M. ALEXANDER NUGENT CONSULTING 22B STACY RD, SANTA FE NM 87585 (505)-988-7016 i@alexnugent.name
+ */
+package com.xeiam.xchart.standalone;
+
+import com.xeiam.xchart.CSVExporter;
+import com.xeiam.xchart.CSVImporter;
+import com.xeiam.xchart.CSVImporter.DataOrientation;
+import com.xeiam.xchart.Chart;
+import com.xeiam.xchart.SwingWrapper;
+
+/**
+ * @author timmolter
+ */
+public class CSVChartColumns {
+
+  public static void main(String[] args) throws Exception {
+
+    // import chart from a folder containing CSV files
+    Chart chart = CSVImporter.getChartFromCSVDir("./CSV/CSVChartColumns/", DataOrientation.Columns, 600, 600);
+
+    CSVExporter.writeCSVColumns(chart.getSeriesMap().get(0), "./CSV/CSVChartColumnsExport/");
+
+    // Show it
+    new SwingWrapper(chart).displayChart();
+
+  }
+}
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChart.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java
similarity index 94%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChart.java
rename to xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java
index 6ff29a5c1ceb6c9d1819a510123f50124e984517..85848aff11323de21446becfd3cae1a473e25996 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChart.java
+++ b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java
@@ -30,14 +30,14 @@ import com.xeiam.xchart.SwingWrapper;
 /**
  * @author timmolter
  */
-public class CSVChart {
+public class CSVChartRows {
 
   public static void main(String[] args) throws Exception {
 
     // import chart from a folder containing CSV files
-    Chart chart = CSVImporter.getChartFromCSVDir("./CSV/CSVChart/", DataOrientation.Rows, 600, 400);
+    Chart chart = CSVImporter.getChartFromCSVDir("./CSV/CSVChartRows/", DataOrientation.Rows, 600, 400);
 
-    CSVExporter.writeCSVRows(chart.getSeriesMap().get(0), "./CSV/CSVChartExport/");
+    CSVExporter.writeCSVRows(chart.getSeriesMap().get(0), "./CSV/CSVChartRowsExport/");
 
     // Show it
     new SwingWrapper(chart).displayChart();