From b0287f535c74adce47b789865d6f76cfbb336818 Mon Sep 17 00:00:00 2001
From: Tim Molter <tim@knowm.org>
Date: Wed, 7 Oct 2015 10:07:09 +0200
Subject: [PATCH] com.xeiam ==> org.knowm refactor

---
 README.md                                     | 12 +--
 etc/header.txt                                | 13 ----
 pom.xml                                       | 36 +++++----
 xchart-demo/pom.xml                           |  8 +-
 .../xchart/standalone/TestForIssue83.java     | 62 ---------------
 .../knowm}/xchart/demo/ChartInfo.java         |  7 +-
 .../knowm}/xchart/demo/XChartDemo.java        | 77 ++++++++++---------
 .../xchart/demo/charts/ExampleChart.java      |  7 +-
 .../xchart/demo/charts/area/AreaChart01.java  | 19 ++---
 .../xchart/demo/charts/area/AreaChart02.java  | 17 ++--
 .../demo/charts/area/AreaLineChart03.java     | 23 +++---
 .../xchart/demo/charts/bar/BarChart01.java    | 19 ++---
 .../xchart/demo/charts/bar/BarChart02.java    | 21 ++---
 .../xchart/demo/charts/bar/BarChart03.java    | 15 ++--
 .../xchart/demo/charts/bar/BarChart04.java    | 15 ++--
 .../xchart/demo/charts/bar/BarChart05.java    | 17 ++--
 .../xchart/demo/charts/bar/BarChart06.java    | 19 ++---
 .../xchart/demo/charts/bar/BarChart07.java    | 19 ++---
 .../xchart/demo/charts/bar/BarChart08.java    | 19 ++---
 .../xchart/demo/charts/date/DateChart01.java  | 17 ++--
 .../xchart/demo/charts/date/DateChart02.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart03.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart04.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart05.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart06.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart07.java  | 13 ++--
 .../xchart/demo/charts/date/DateChart08.java  | 13 ++--
 .../xchart/demo/charts/line/LineChart01.java  | 15 ++--
 .../xchart/demo/charts/line/LineChart02.java  | 19 ++---
 .../xchart/demo/charts/line/LineChart03.java  | 23 +++---
 .../xchart/demo/charts/line/LineChart04.java  | 21 ++---
 .../xchart/demo/charts/line/LineChart05.java  | 19 ++---
 .../xchart/demo/charts/line/LineChart06.java  | 17 ++--
 .../demo/charts/realtime/RealtimeChart01.java | 11 +--
 .../demo/charts/realtime/RealtimeChart02.java | 11 +--
 .../demo/charts/realtime/RealtimeChart03.java | 11 +--
 .../demo/charts/scatter/ScatterChart01.java   | 15 ++--
 .../demo/charts/scatter/ScatterChart02.java   | 15 ++--
 .../demo/charts/scatter/ScatterChart03.java   | 11 +--
 .../demo/charts/scatter/ScatterChart04.java   | 19 ++---
 .../demo/charts/theme/ThemeChart01.java       | 11 +--
 .../demo/charts/theme/ThemeChart02.java       | 15 ++--
 .../demo/charts/theme/ThemeChart03.java       | 19 ++---
 .../xchart/standalone/CSVChartColumns.java    | 15 ++--
 .../xchart/standalone/CSVChartRows.java       | 15 ++--
 .../knowm}/xchart/standalone/DateChart.java   | 13 ++--
 .../xchart/standalone/ErrorBarLogTest.java    | 17 ++--
 .../xchart/standalone/ErrorBarTest.java       | 17 ++--
 .../knowm}/xchart/standalone/Example0.java    | 11 +--
 .../knowm}/xchart/standalone/Example1.java    | 21 ++---
 .../knowm}/xchart/standalone/Example2.java    | 15 ++--
 .../knowm}/xchart/standalone/SwingDemo.java   |  9 ++-
 .../xchart/standalone/TestForIssue111.java    | 13 ++--
 .../xchart/standalone/TestForIssue83.java     | 61 +++++++++++++++
 .../xchart/standalone/TestForIssue98.java     | 13 ++--
 xchart/pom.xml                                |  4 +-
 .../knowm}/xchart/BitmapEncoder.java          |  5 +-
 .../knowm}/xchart/CSVExporter.java            |  5 +-
 .../knowm}/xchart/CSVImporter.java            |  7 +-
 .../xeiam => org/knowm}/xchart/Chart.java     | 11 +--
 .../knowm}/xchart/ChartBuilder.java           |  9 ++-
 .../knowm}/xchart/ChartColor.java             |  5 +-
 .../xeiam => org/knowm}/xchart/Histogram.java |  5 +-
 .../knowm}/xchart/QuickChart.java             |  5 +-
 .../xeiam => org/knowm}/xchart/Series.java    | 11 +--
 .../knowm}/xchart/SeriesColor.java            |  5 +-
 .../knowm}/xchart/SeriesLineStyle.java        |  5 +-
 .../knowm}/xchart/SeriesMarker.java           | 19 ++---
 .../knowm}/xchart/StyleManager.java           | 13 ++--
 .../knowm}/xchart/SwingWrapper.java           |  5 +-
 .../knowm}/xchart/VectorGraphicsEncoder.java  |  5 +-
 .../knowm}/xchart/XChartPanel.java            |  9 ++-
 .../knowm}/xchart/internal/Utils.java         |  5 +-
 .../xchart/internal/chartpart/Axis.java       |  9 ++-
 .../xchart/internal/chartpart/AxisPair.java   | 13 ++--
 .../xchart/internal/chartpart/AxisTick.java   |  5 +-
 .../chartpart/AxisTickBarChartCalculator.java | 13 ++--
 .../chartpart/AxisTickCalculator.java         | 13 ++--
 .../chartpart/AxisTickDateCalculator.java     | 11 +--
 .../internal/chartpart/AxisTickLabels.java    |  5 +-
 .../AxisTickLogarithmicCalculator.java        | 11 +--
 .../internal/chartpart/AxisTickMarks.java     |  5 +-
 .../AxisTickNumericalCalculator.java          | 11 +--
 .../xchart/internal/chartpart/AxisTitle.java  |  5 +-
 .../internal/chartpart/ChartPainter.java      |  9 ++-
 .../xchart/internal/chartpart/ChartPart.java  |  5 +-
 .../xchart/internal/chartpart/ChartTitle.java |  5 +-
 .../xchart/internal/chartpart/Legend.java     |  9 ++-
 .../internal/chartpart/NumberFormatter.java   |  9 ++-
 .../xchart/internal/chartpart/Plot.java       |  7 +-
 .../internal/chartpart/PlotContent.java       |  5 +-
 .../chartpart/PlotContentBarChart.java        | 11 +--
 .../chartpart/PlotContentLineChart.java       | 15 ++--
 .../internal/chartpart/PlotSurface.java       |  7 +-
 .../xchart/internal/markers/Circle.java       |  5 +-
 .../xchart/internal/markers/Diamond.java      |  5 +-
 .../xchart/internal/markers/Marker.java       |  5 +-
 .../xchart/internal/markers/Square.java       |  5 +-
 .../xchart/internal/markers/TriangleDown.java |  5 +-
 .../xchart/internal/markers/TriangleUp.java   |  5 +-
 .../knowm}/xchart/internal/package-info.java  | 10 +--
 .../xchart/internal/style/GGPlot2Theme.java   |  9 ++-
 .../xchart/internal/style/MatlabTheme.java    |  9 ++-
 .../style/SeriesColorMarkerLineStyle.java     |  7 +-
 .../SeriesColorMarkerLineStyleCycler.java     | 11 +--
 .../knowm}/xchart/internal/style/Theme.java   |  7 +-
 .../xchart/internal/style/XChartTheme.java    |  9 ++-
 .../java/com/xeiam/xchart/HistogramTest.java  |  4 +-
 108 files changed, 752 insertions(+), 665 deletions(-)
 delete mode 100644 etc/header.txt
 delete mode 100644 xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue83.java
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/ChartInfo.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/XChartDemo.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/ExampleChart.java (75%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/area/AreaChart01.java (79%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/area/AreaChart02.java (80%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/area/AreaLineChart03.java (89%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart01.java (76%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart02.java (81%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart03.java (77%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart04.java (80%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart05.java (79%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart06.java (81%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart07.java (81%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/bar/BarChart08.java (82%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart01.java (83%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart02.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart03.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart04.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart05.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart06.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart07.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/date/DateChart08.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart01.java (83%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart02.java (80%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart03.java (86%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart04.java (77%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart05.java (82%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/line/LineChart06.java (81%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/realtime/RealtimeChart01.java (90%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/realtime/RealtimeChart02.java (92%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/realtime/RealtimeChart03.java (92%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/scatter/ScatterChart01.java (82%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/scatter/ScatterChart02.java (82%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/scatter/ScatterChart03.java (80%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/scatter/ScatterChart04.java (82%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/theme/ThemeChart01.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/theme/ThemeChart02.java (78%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/demo/charts/theme/ThemeChart03.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/CSVChartColumns.java (73%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/CSVChartRows.java (73%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/DateChart.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/ErrorBarLogTest.java (84%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/ErrorBarTest.java (83%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/Example0.java (78%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/Example1.java (80%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/Example2.java (81%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/SwingDemo.java (85%)
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/TestForIssue111.java (77%)
 create mode 100644 xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue83.java
 rename xchart-demo/src/main/java/{com/xeiam => org/knowm}/xchart/standalone/TestForIssue98.java (98%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/BitmapEncoder.java (97%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/CSVExporter.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/CSVImporter.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/Chart.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/ChartBuilder.java (86%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/ChartColor.java (88%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/Histogram.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/QuickChart.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/Series.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/SeriesColor.java (92%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/SeriesLineStyle.java (92%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/SeriesMarker.java (75%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/StyleManager.java (98%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/SwingWrapper.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/VectorGraphicsEncoder.java (92%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/XChartPanel.java (97%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/Utils.java (87%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/Axis.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisPair.java (92%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTick.java (91%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickBarChartCalculator.java (91%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickCalculator.java (93%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickDateCalculator.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickLabels.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java (93%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickMarks.java (94%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTickNumericalCalculator.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/AxisTitle.java (93%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/ChartPainter.java (94%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/ChartPart.java (83%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/ChartTitle.java (93%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/Legend.java (97%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/NumberFormatter.java (94%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/Plot.java (90%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/PlotContent.java (86%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/PlotContentBarChart.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/PlotContentLineChart.java (96%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/chartpart/PlotSurface.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/Circle.java (85%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/Diamond.java (87%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/Marker.java (83%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/Square.java (85%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/TriangleDown.java (86%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/markers/TriangleUp.java (86%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/package-info.java (75%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/GGPlot2Theme.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/MatlabTheme.java (95%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/SeriesColorMarkerLineStyle.java (85%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java (91%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/Theme.java (92%)
 rename xchart/src/main/java/{com/xeiam => org/knowm}/xchart/internal/style/XChartTheme.java (95%)

diff --git a/README.md b/README.md
index 5a33510b..272a013b 100644
--- a/README.md
+++ b/README.md
@@ -91,9 +91,9 @@ Add the XChart library as a dependency to your pom.xml file:
 
 ```xml
     <dependency>
-        <groupId>com.xeiam.xchart</groupId>
+        <groupId>org.knowm.xchart</groupId>
         <artifactId>xchart</artifactId>
-        <version>2.5.1</version>
+        <version>2.6.0</version>
     </dependency>
 ```
 
@@ -107,9 +107,9 @@ For snapshots, add the following to your pom.xml file:
     </repository>
 
     <dependency>
-      <groupId>com.xeiam.xchart</groupId>
+      <groupId>org.knowm.xchart</groupId>
       <artifactId>xchart</artifactId>
-      <version>2.5.2-SNAPSHOT</version>
+      <version>2.6.1-SNAPSHOT</version>
     </dependency>
 ```
 
@@ -120,7 +120,7 @@ Snapshots can be manually downloaded from Sonatyope: [https://oss.sonatype.org/c
 To use XChart with the Scala Build Tool (SBT) add the following to your build.sbt
 
 ```scala
-libraryDependencies += "com.xeiam.xchart" % "xchart" % "2.5.0" exclude("de.erichseifert.vectorgraphics2d", "VectorGraphics2D") withSources()
+libraryDependencies += "org.knowm.xchart" % "xchart" % "2.6.0" exclude("de.erichseifert.vectorgraphics2d", "VectorGraphics2D") withSources()
 ```
 (SBT/Ivy does not seem to respect the optional [VectorGraphics2D](https://github.com/eseifert/vectorgraphics2d) dependency and as it does not exist in Maven Central the build will fail unless it is excluded or available in a local repository.)
 
@@ -140,7 +140,7 @@ libraryDependencies += "com.xeiam.xchart" % "xchart" % "2.5.0" exclude("de.erich
 ## Running Demo
 
     cd /path/to/xchart-demo/jar/
-    java -cp xchart-demo-2.5.1.jar:xchart-2.5.1.jar com.xeiam.xchart.demo.XChartDemo
+    java -cp xchart-demo-2.5.1.jar:xchart-2.5.1.jar org.knowm.xchart.demo.XChartDemo
 
 ![](https://raw.githubusercontent.com/timmolter/XChart/develop/etc/XChart_Demo.png)
 
diff --git a/etc/header.txt b/etc/header.txt
deleted file mode 100644
index c96c8578..00000000
--- a/etc/header.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-Copyright 2011 - 2015 Xeiam LLC.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index f9e49484..0807a479 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,25 +1,26 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.xeiam.xchart</groupId>
+	<groupId>org.knowm.xchart</groupId>
 	<artifactId>xchart-parent</artifactId>
-	<version>2.5.2-SNAPSHOT</version>
+	<version>2.6.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 	<name>XChart Parent</name>
 	<description>Basic Charts for Java Applications</description>
 	<url>http://knowm.org/open-source/xchart</url>
 	<inceptionYear>2011</inceptionYear>
 
-    <organization>
-        <name>Knowm Inc.</name>
-        <url>http://knowm.org/open-source/</url>
-    </organization>
+	<organization>
+		<name>Knowm Inc.</name>
+		<url>http://knowm.org/open-source/</url>
+	</organization>
 
-    <developers>
-        <developer>
-            <name>Tim Molter</name>
-        </developer>
-    </developers>
+	<developers>
+		<developer>
+			<name>Tim Molter</name>
+		</developer>
+	</developers>
 
 	<licenses>
 		<license>
@@ -87,7 +88,7 @@
 		<dependency>
 			<groupId>junit</groupId>
 			<artifactId>junit</artifactId>
-			<version>4.11</version>
+			<version>4.12</version>
 			<scope>test</scope>
 		</dependency>
 		<!-- FEST for fluent test assertions -->
@@ -138,6 +139,7 @@
 					<plugin>
 						<groupId>org.apache.maven.plugins</groupId>
 						<artifactId>maven-javadoc-plugin</artifactId>
+						<version>2.10.3</version>
 						<configuration>
 							<additionalparam>-Xdoclint:none</additionalparam>
 						</configuration>
@@ -151,7 +153,7 @@
 								<plugin>
 									<groupId>org.apache.maven.plugins</groupId>
 									<artifactId>maven-javadoc-plugin</artifactId>
-									<version>2.10.1</version>
+									<version>2.10.3</version>
 									<configuration>
 										<additionalparam>-Xdoclint:none</additionalparam>
 									</configuration>
@@ -170,7 +172,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>3.2</version>
+				<version>3.3</version>
 				<configuration>
 					<source>1.6</source>
 					<target>1.6</target>
@@ -195,7 +197,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-release-plugin</artifactId>
-				<version>2.5.1</version>
+				<version>2.5.2</version>
 				<configuration>
 					<autoversionsubmodules>true</autoversionsubmodules>
 				</configuration>
@@ -206,7 +208,7 @@
 				<artifactId>maven-license-plugin</artifactId>
 				<version>1.10.b1</version>
 				<configuration>
-					<header>etc/header.txt</header>
+					<header>NOTICE</header>
 					<aggregate>true</aggregate>
 					<includes>
 						<include>**/*.java</include>
diff --git a/xchart-demo/pom.xml b/xchart-demo/pom.xml
index 723213cb..c1cd0471 100644
--- a/xchart-demo/pom.xml
+++ b/xchart-demo/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.xeiam.xchart</groupId>
+		<groupId>org.knowm.xchart</groupId>
 		<artifactId>xchart-parent</artifactId>
-		<version>2.5.2-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>xchart-demo</artifactId>
@@ -15,9 +15,9 @@
 
 	<dependencies>
 		<dependency>
-			<groupId>com.xeiam.xchart</groupId>
+			<groupId>org.knowm.xchart</groupId>
 			<artifactId>xchart</artifactId>
-			<version>2.5.2-SNAPSHOT</version>
+			<version>2.6.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue83.java b/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue83.java
deleted file mode 100644
index f8bdf730..00000000
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue83.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Copyright 2011 - 2015 Xeiam LLC.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.xeiam.xchart.standalone;
-
-import java.io.IOException;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-
-/**
- * @author timmolter
- */
-public class TestForIssue83 {
-
-  public static void main(String[] args) throws IOException {
-
-    final Chart chart = new Chart(500, 580);
-    final StyleManager styleManager = chart.getStyleManager();
-    styleManager.setLegendPosition(LegendPosition.InsideNW);
-    styleManager.setLegendVisible(false);
-
-    final double[] keys =
-        { 101.6829700157669, 102.4741546172069, 101.56112372430265, 102.29668967750219, 102.1156928915296, 102.96288807133006, 102.85820232291313, 102.70416779932134, 102.75666703633065,
-            102.54695164724063, 102.64530701963236, 101.42229521418183, 102.6239220187132, 102.65392830689318, 101.3519528210374, 102.29890454069181, 101.45011555581048, 102.80876656547879,
-            102.9487829236201, 102.65658212119392, 102.5621808062546, 102.54679368788584, 101.44415451644835, 101.52360532420516, 102.7494132740427, 103.03755466140984, 102.75544822301157,
-            102.47525429542132, 102.63811088590982, 102.59191775294347, 101.32048881637581, 101.44482698818119, 102.80932781766394, 101.38219670988731, 101.46941028338044, 102.66645765488023,
-            101.79878506072832, 102.12919834900144, 102.65694786373456, 101.34087876032368, 102.35962292551396, 102.73324077985815, 101.6331900389947, 102.68657071464266, 102.31073017053264,
-            102.95034563173265, 101.56466092390214, 101.44263290542328, 102.54872192620866, 101.51961724673545, 101.56592215239088, 102.62299979115573, 102.16037884019369, 102.76241468528423,
-            103.06247033542299, 102.50392407673121, 102.71485878177548, 102.30595719462644, 101.83799733593067, 102.64446820738182, 102.95845141559543, 101.44913643540103, 102.62302475018619,
-            101.35064046209624, 102.49385977096229, 102.47902987190186, 102.6192546853896, 101.31787966105605, 102.61902499800594, 102.75304600782704, 102.66323038080031, 102.62927538605312,
-            101.41262366698777, 103.06302964768331, 103.01984694209135, 101.54079454702787, 101.7432632007971, 102.64746484983125, 102.94083129713017, 101.38693917529486, 102.28688939180357,
-            101.77714391046378, 102.61582509980576, 102.889235861335, 102.50686276405479, 103.09822940528373, 102.58948098022869, 102.70749156936542, 102.64387765680111, 102.75465208779484,
-            102.36218073405826 };
-    final double[] values =
-        { 40.37, 40.59, 40.31, 40.4, 40.39, 40.52, 40.47, 40.56, 40.46, 40.53, 40.58, 40.34, 40.55, 40.58, 40.33, 40.44, 40.36, 40.57, 40.48, 40.53, 40.55, 40.53, 40.3, 40.31, 40.45, 40.49, 40.47,
-            40.59, 40.55, 40.55, 40.35, 40.32, 40.57, 40.33, 40.34, 40.57, 40.38, 40.39, 40.53, 40.33, 40.41, 40.56, 40.37, 40.46, 40.44, 40.47, 40.31, 40.36, 40.55, 40.36, 40.31, 40.6, 40.39, 40.46,
-            40.49, 40.42, 40.58, 40.44, 40.38, 40.53, 40.5, 40.32, 40.6, 40.33, 40.41, 40.41, 40.53, 40.35, 40.57, 40.46, 40.56, 40.55, 40.34, 40.49, 40.51, 40.32, 40.37, 40.57, 40.5, 40.35, 40.43,
-            40.38, 40.58, 40.52, 40.59, 40.49, 40.55, 40.56, 40.53, 40.47, 40.41 };
-    chart.addSeries("Results", keys, values).setLineStyle(SeriesLineStyle.NONE);
-
-    // BitmapEncoder.saveBitmap(chart, "example", BitmapFormat.PNG);
-    new SwingWrapper(chart).displayChart();
-
-  }
-
-}
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/ChartInfo.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/ChartInfo.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java
index c9a39565..836fe370 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/ChartInfo.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/ChartInfo.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo;
+package org.knowm.xchart.demo;
 
-import com.xeiam.xchart.Chart;
+import org.knowm.xchart.Chart;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java
index 871dc4d1..7cacab7e 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/XChartDemo.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/XChartDemo.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo;
+package org.knowm.xchart.demo;
 
 import java.awt.Dimension;
 import java.awt.GridLayout;
@@ -30,42 +31,42 @@ import javax.swing.event.TreeSelectionListener;
 import javax.swing.tree.DefaultMutableTreeNode;
 import javax.swing.tree.TreeSelectionModel;
 
-import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.area.AreaChart01;
-import com.xeiam.xchart.demo.charts.area.AreaChart02;
-import com.xeiam.xchart.demo.charts.area.AreaLineChart03;
-import com.xeiam.xchart.demo.charts.bar.BarChart01;
-import com.xeiam.xchart.demo.charts.bar.BarChart02;
-import com.xeiam.xchart.demo.charts.bar.BarChart03;
-import com.xeiam.xchart.demo.charts.bar.BarChart04;
-import com.xeiam.xchart.demo.charts.bar.BarChart05;
-import com.xeiam.xchart.demo.charts.bar.BarChart06;
-import com.xeiam.xchart.demo.charts.bar.BarChart07;
-import com.xeiam.xchart.demo.charts.bar.BarChart08;
-import com.xeiam.xchart.demo.charts.date.DateChart01;
-import com.xeiam.xchart.demo.charts.date.DateChart02;
-import com.xeiam.xchart.demo.charts.date.DateChart03;
-import com.xeiam.xchart.demo.charts.date.DateChart04;
-import com.xeiam.xchart.demo.charts.date.DateChart05;
-import com.xeiam.xchart.demo.charts.date.DateChart06;
-import com.xeiam.xchart.demo.charts.date.DateChart07;
-import com.xeiam.xchart.demo.charts.date.DateChart08;
-import com.xeiam.xchart.demo.charts.line.LineChart01;
-import com.xeiam.xchart.demo.charts.line.LineChart02;
-import com.xeiam.xchart.demo.charts.line.LineChart03;
-import com.xeiam.xchart.demo.charts.line.LineChart04;
-import com.xeiam.xchart.demo.charts.line.LineChart05;
-import com.xeiam.xchart.demo.charts.line.LineChart06;
-import com.xeiam.xchart.demo.charts.realtime.RealtimeChart01;
-import com.xeiam.xchart.demo.charts.realtime.RealtimeChart02;
-import com.xeiam.xchart.demo.charts.realtime.RealtimeChart03;
-import com.xeiam.xchart.demo.charts.scatter.ScatterChart01;
-import com.xeiam.xchart.demo.charts.scatter.ScatterChart02;
-import com.xeiam.xchart.demo.charts.scatter.ScatterChart03;
-import com.xeiam.xchart.demo.charts.scatter.ScatterChart04;
-import com.xeiam.xchart.demo.charts.theme.ThemeChart01;
-import com.xeiam.xchart.demo.charts.theme.ThemeChart02;
-import com.xeiam.xchart.demo.charts.theme.ThemeChart03;
+import org.knowm.xchart.XChartPanel;
+import org.knowm.xchart.demo.charts.area.AreaChart01;
+import org.knowm.xchart.demo.charts.area.AreaChart02;
+import org.knowm.xchart.demo.charts.area.AreaLineChart03;
+import org.knowm.xchart.demo.charts.bar.BarChart01;
+import org.knowm.xchart.demo.charts.bar.BarChart02;
+import org.knowm.xchart.demo.charts.bar.BarChart03;
+import org.knowm.xchart.demo.charts.bar.BarChart04;
+import org.knowm.xchart.demo.charts.bar.BarChart05;
+import org.knowm.xchart.demo.charts.bar.BarChart06;
+import org.knowm.xchart.demo.charts.bar.BarChart07;
+import org.knowm.xchart.demo.charts.bar.BarChart08;
+import org.knowm.xchart.demo.charts.date.DateChart01;
+import org.knowm.xchart.demo.charts.date.DateChart02;
+import org.knowm.xchart.demo.charts.date.DateChart03;
+import org.knowm.xchart.demo.charts.date.DateChart04;
+import org.knowm.xchart.demo.charts.date.DateChart05;
+import org.knowm.xchart.demo.charts.date.DateChart06;
+import org.knowm.xchart.demo.charts.date.DateChart07;
+import org.knowm.xchart.demo.charts.date.DateChart08;
+import org.knowm.xchart.demo.charts.line.LineChart01;
+import org.knowm.xchart.demo.charts.line.LineChart02;
+import org.knowm.xchart.demo.charts.line.LineChart03;
+import org.knowm.xchart.demo.charts.line.LineChart04;
+import org.knowm.xchart.demo.charts.line.LineChart05;
+import org.knowm.xchart.demo.charts.line.LineChart06;
+import org.knowm.xchart.demo.charts.realtime.RealtimeChart01;
+import org.knowm.xchart.demo.charts.realtime.RealtimeChart02;
+import org.knowm.xchart.demo.charts.realtime.RealtimeChart03;
+import org.knowm.xchart.demo.charts.scatter.ScatterChart01;
+import org.knowm.xchart.demo.charts.scatter.ScatterChart02;
+import org.knowm.xchart.demo.charts.scatter.ScatterChart03;
+import org.knowm.xchart.demo.charts.scatter.ScatterChart04;
+import org.knowm.xchart.demo.charts.theme.ThemeChart01;
+import org.knowm.xchart.demo.charts.theme.ThemeChart02;
+import org.knowm.xchart.demo.charts.theme.ThemeChart03;
 
 /**
  * Class containing all XChart example charts
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/ExampleChart.java
similarity index 75%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/ExampleChart.java
index 3fbd7ca9..b9424927 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/ExampleChart.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/ExampleChart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts;
+package org.knowm.xchart.demo.charts;
 
-import com.xeiam.xchart.Chart;
+import org.knowm.xchart.Chart;
 
 public interface ExampleChart {
 
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
similarity index 79%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
index 70fd6101..2a2d3b37 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.area;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+package org.knowm.xchart.demo.charts.area;
+
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Area Chart with 3 series
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
similarity index 80%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
index 5cfa7a6a..69968e1a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.area;
+package org.knowm.xchart.demo.charts.area;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Null Y-Axis Data Points
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaLineChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
similarity index 89%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaLineChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
index 583b2639..a40b5dee 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/area/AreaLineChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/area/AreaLineChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.area;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+package org.knowm.xchart.demo.charts.area;
+
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Combination Line & Area Chart
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
similarity index 76%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
index e0b98c8a..bac75519 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+package org.knowm.xchart.demo.charts.bar;
+
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Basic Bar Chart
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
similarity index 81%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
index aa3d5c3b..a20557c4 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,14 +24,14 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Date Categories
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
similarity index 77%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
index 9dcdcacf..361b9637 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Positive and Negative
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
similarity index 80%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
index 448fdf98..2089a776 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart04.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Missing Point in Series
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
similarity index 79%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
index a13e8c18..f6a2150a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart05.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * GGPlot2 Theme
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
similarity index 81%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
index 070e2c11..b7650a48 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart06.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Histogram;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Histogram;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Histogram Overlapped
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
similarity index 81%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart07.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
index 1b81514d..1980e7ca 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart07.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Histogram;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Histogram;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Histogram Not Overlapped
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
similarity index 82%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart08.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
index d15a932b..28d2d05b 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/bar/BarChart08.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/bar/BarChart08.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.bar;
+package org.knowm.xchart.demo.charts.bar;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Histogram;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Histogram;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Histogram with Error Bars
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
similarity index 83%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
index 0473925b..3b7d00ac 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,12 +24,12 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Millisecond Scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
index 505af95e..311db555 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Second Scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
index cc80b0f6..d8e14b08 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Minute Scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
index 6815d1e2..54afe53f 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart04.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Hour Scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
index 0a49d189..f195812c 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart05.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Day Scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
index 0a90629e..de3afa54 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart06.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Month scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
index e3f8745d..f7693202 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart07.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart07.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Year scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart08.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart08.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
index 57308563..bbd60e18 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/date/DateChart08.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/date/DateChart08.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.date;
+package org.knowm.xchart.demo.charts.date;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Year scale
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
similarity index 83%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
index 027c08b3..e8846a4a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
+package org.knowm.xchart.demo.charts.line;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Logarithmic Y-Axis
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
similarity index 80%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
index c04545cf..7813658a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
+package org.knowm.xchart.demo.charts.line;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Sine wave with customized series style
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
similarity index 86%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
index 6afb4629..55d87781 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
+package org.knowm.xchart.demo.charts.line;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -25,15 +26,15 @@ import java.util.Date;
 import java.util.List;
 import java.util.Locale;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartColor;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartColor;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Extensive Chart Customization
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
similarity index 77%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
index 9112824e..3f251761 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart04.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
-
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+package org.knowm.xchart.demo.charts.line;
+
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Hundreds of Series on One Plot
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart05.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
similarity index 82%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart05.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
index 34a169dc..49ecf602 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart05.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart05.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
+package org.knowm.xchart.demo.charts.line;
 
 import java.awt.Color;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Scatter and Line
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
similarity index 81%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
index 8f0c8253..522c6bf3 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/line/LineChart06.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/line/LineChart06.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.line;
+package org.knowm.xchart.demo.charts.line;
 
 import java.awt.Color;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Logarithmic Y-Axis with Error Bars
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart01.java
similarity index 90%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart01.java
index 22d4ad5d..b9b39f3e 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.realtime;
+package org.knowm.xchart.demo.charts.realtime;
 
 import java.util.List;
 import java.util.Timer;
@@ -22,9 +23,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.JFrame;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.XChartPanel;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Realtime
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart02.java
similarity index 92%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart02.java
index 6689ed14..c8fa9490 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.realtime;
+package org.knowm.xchart.demo.charts.realtime;
 
 import java.util.List;
 import java.util.Timer;
@@ -22,9 +23,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.JFrame;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.XChartPanel;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Realtime
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart03.java
similarity index 92%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart03.java
index 8b7a3a96..c71b9492 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/realtime/RealtimeChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/realtime/RealtimeChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.realtime;
+package org.knowm.xchart.demo.charts.realtime;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,9 +24,9 @@ import java.util.concurrent.CopyOnWriteArrayList;
 
 import javax.swing.JFrame;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.XChartPanel;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Realtime
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
similarity index 82%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
index dee2d9e8..d154885c 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.scatter;
+package org.knowm.xchart.demo.charts.scatter;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Gaussian Blob
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
similarity index 82%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
index 8ac76e5e..2883b945 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.scatter;
+package org.knowm.xchart.demo.charts.scatter;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Logarithmic Data
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
similarity index 80%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
index acac803e..c9a11fcd 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.scatter;
+package org.knowm.xchart.demo.charts.scatter;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Single point
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart04.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
similarity index 82%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart04.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
index ff2d0bd3..3a14b6fd 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/scatter/ScatterChart04.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/scatter/ScatterChart04.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,19 +14,19 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.scatter;
+package org.knowm.xchart.demo.charts.scatter;
 
 import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Error Bars
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
index da450fec..5c147d15 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart01.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart01.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.theme;
+package org.knowm.xchart.demo.charts.theme;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Default XChart Theme
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart02.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
similarity index 78%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart02.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
index 65659326..78c0cb6a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart02.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart02.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.theme;
+package org.knowm.xchart.demo.charts.theme;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * GGPlot2 Theme
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart03.java b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart03.java
rename to xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
index f9cf851a..5a399028 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/demo/charts/theme/ThemeChart03.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/demo/charts/theme/ThemeChart03.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.demo.charts.theme;
+package org.knowm.xchart.demo.charts.theme;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -22,13 +23,13 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * Matlab Theme
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartColumns.java
similarity index 73%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartColumns.java
index ba997098..83ffb2be 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartColumns.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartColumns.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.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;
+import org.knowm.xchart.CSVExporter;
+import org.knowm.xchart.CSVImporter;
+import org.knowm.xchart.CSVImporter.DataOrientation;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartRows.java
similarity index 73%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartRows.java
index bc3422cb..97018f8f 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/CSVChartRows.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/CSVChartRows.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.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;
+import org.knowm.xchart.CSVExporter;
+import org.knowm.xchart.CSVImporter;
+import org.knowm.xchart.CSVImporter.DataOrientation;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/DateChart.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/DateChart.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/DateChart.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/DateChart.java
index 56e026fa..74773f6d 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/DateChart.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/DateChart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import java.text.DateFormat;
 import java.text.ParseException;
@@ -23,10 +24,10 @@ import java.util.Date;
 import java.util.List;
 import java.util.Random;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.SwingWrapper;
-import com.xeiam.xchart.demo.charts.ExampleChart;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.SwingWrapper;
+import org.knowm.xchart.demo.charts.ExampleChart;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarLogTest.java
similarity index 84%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarLogTest.java
index 8df4daef..ce8940cf 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarLogTest.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarLogTest.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import java.awt.Color;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarTest.java
similarity index 83%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarTest.java
index c4b214b9..d5048884 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/ErrorBarTest.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/ErrorBarTest.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import java.awt.Color;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java
similarity index 78%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java
index 9e8c2ed7..a19c84e8 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example0.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example0.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.QuickChart;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.QuickChart;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * Creates a simple Chart using QuickChart
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example1.java
similarity index 80%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/Example1.java
index 48fe9dca..d8c394dc 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example1.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example1.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
-
-import com.xeiam.xchart.BitmapEncoder;
-import com.xeiam.xchart.BitmapEncoder.BitmapFormat;
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.VectorGraphicsEncoder;
-import com.xeiam.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
+package org.knowm.xchart.standalone;
+
+import org.knowm.xchart.BitmapEncoder;
+import org.knowm.xchart.BitmapEncoder.BitmapFormat;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.VectorGraphicsEncoder;
+import org.knowm.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
 
 /**
  * Creates a simple Chart and saves it as a PNG and JPEG image file.
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
similarity index 81%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
index be7f4699..906d3d6e 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/Example2.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/Example2.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.SeriesMarker;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.SeriesMarker;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * Create a Chart matrix
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/SwingDemo.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java
similarity index 85%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/SwingDemo.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java
index 082c833f..2f4dce8a 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/SwingDemo.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/SwingDemo.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 
-import com.xeiam.xchart.XChartPanel;
-import com.xeiam.xchart.demo.charts.area.AreaChart01;
+import org.knowm.xchart.XChartPanel;
+import org.knowm.xchart.demo.charts.area.AreaChart01;
 
 /**
  * Class showing how to integrate a chart into a Swing JFrame
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue111.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue111.java
similarity index 77%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue111.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue111.java
index ab3916a9..8cc3f82b 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue111.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue111.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2013 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.ChartBuilder;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.ChartBuilder;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue83.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue83.java
new file mode 100644
index 00000000..309986e8
--- /dev/null
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue83.java
@@ -0,0 +1,61 @@
+/**
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.knowm.xchart.standalone;
+
+import java.io.IOException;
+
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
+
+/**
+ * @author timmolter
+ */
+public class TestForIssue83 {
+
+  public static void main(String[] args) throws IOException {
+
+    final Chart chart = new Chart(500, 580);
+    final StyleManager styleManager = chart.getStyleManager();
+    styleManager.setLegendPosition(LegendPosition.InsideNW);
+    styleManager.setLegendVisible(false);
+
+    final double[] keys = { 101.6829700157669, 102.4741546172069, 101.56112372430265, 102.29668967750219, 102.1156928915296, 102.96288807133006, 102.85820232291313, 102.70416779932134,
+        102.75666703633065, 102.54695164724063, 102.64530701963236, 101.42229521418183, 102.6239220187132, 102.65392830689318, 101.3519528210374, 102.29890454069181, 101.45011555581048,
+        102.80876656547879, 102.9487829236201, 102.65658212119392, 102.5621808062546, 102.54679368788584, 101.44415451644835, 101.52360532420516, 102.7494132740427, 103.03755466140984,
+        102.75544822301157, 102.47525429542132, 102.63811088590982, 102.59191775294347, 101.32048881637581, 101.44482698818119, 102.80932781766394, 101.38219670988731, 101.46941028338044,
+        102.66645765488023, 101.79878506072832, 102.12919834900144, 102.65694786373456, 101.34087876032368, 102.35962292551396, 102.73324077985815, 101.6331900389947, 102.68657071464266,
+        102.31073017053264, 102.95034563173265, 101.56466092390214, 101.44263290542328, 102.54872192620866, 101.51961724673545, 101.56592215239088, 102.62299979115573, 102.16037884019369,
+        102.76241468528423, 103.06247033542299, 102.50392407673121, 102.71485878177548, 102.30595719462644, 101.83799733593067, 102.64446820738182, 102.95845141559543, 101.44913643540103,
+        102.62302475018619, 101.35064046209624, 102.49385977096229, 102.47902987190186, 102.6192546853896, 101.31787966105605, 102.61902499800594, 102.75304600782704, 102.66323038080031,
+        102.62927538605312, 101.41262366698777, 103.06302964768331, 103.01984694209135, 101.54079454702787, 101.7432632007971, 102.64746484983125, 102.94083129713017, 101.38693917529486,
+        102.28688939180357, 101.77714391046378, 102.61582509980576, 102.889235861335, 102.50686276405479, 103.09822940528373, 102.58948098022869, 102.70749156936542, 102.64387765680111,
+        102.75465208779484, 102.36218073405826 };
+    final double[] values = { 40.37, 40.59, 40.31, 40.4, 40.39, 40.52, 40.47, 40.56, 40.46, 40.53, 40.58, 40.34, 40.55, 40.58, 40.33, 40.44, 40.36, 40.57, 40.48, 40.53, 40.55, 40.53, 40.3, 40.31,
+        40.45, 40.49, 40.47, 40.59, 40.55, 40.55, 40.35, 40.32, 40.57, 40.33, 40.34, 40.57, 40.38, 40.39, 40.53, 40.33, 40.41, 40.56, 40.37, 40.46, 40.44, 40.47, 40.31, 40.36, 40.55, 40.36, 40.31,
+        40.6, 40.39, 40.46, 40.49, 40.42, 40.58, 40.44, 40.38, 40.53, 40.5, 40.32, 40.6, 40.33, 40.41, 40.41, 40.53, 40.35, 40.57, 40.46, 40.56, 40.55, 40.34, 40.49, 40.51, 40.32, 40.37, 40.57, 40.5,
+        40.35, 40.43, 40.38, 40.58, 40.52, 40.59, 40.49, 40.55, 40.56, 40.53, 40.47, 40.41 };
+    chart.addSeries("Results", keys, values).setLineStyle(SeriesLineStyle.NONE);
+
+    // BitmapEncoder.saveBitmap(chart, "example", BitmapFormat.PNG);
+    new SwingWrapper(chart).displayChart();
+
+  }
+
+}
diff --git a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue98.java b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
similarity index 98%
rename from xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue98.java
rename to xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
index 283162cb..d7744df7 100644
--- a/xchart-demo/src/main/java/com/xeiam/xchart/standalone/TestForIssue98.java
+++ b/xchart-demo/src/main/java/org/knowm/xchart/standalone/TestForIssue98.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2013 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.standalone;
+package org.knowm.xchart.standalone;
 
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Date;
 
-import com.xeiam.xchart.Chart;
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.StyleManager.LegendPosition;
-import com.xeiam.xchart.SwingWrapper;
+import org.knowm.xchart.Chart;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.SwingWrapper;
 
 /**
  * @author timmolter
diff --git a/xchart/pom.xml b/xchart/pom.xml
index fb86b76e..cfcccac3 100644
--- a/xchart/pom.xml
+++ b/xchart/pom.xml
@@ -3,9 +3,9 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
-		<groupId>com.xeiam.xchart</groupId>
+		<groupId>org.knowm.xchart</groupId>
 		<artifactId>xchart-parent</artifactId>
-		<version>2.5.2-SNAPSHOT</version>
+		<version>2.6.0-SNAPSHOT</version>
 	</parent>
 
 	<artifactId>xchart</artifactId>
diff --git a/xchart/src/main/java/com/xeiam/xchart/BitmapEncoder.java b/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java
similarity index 97%
rename from xchart/src/main/java/com/xeiam/xchart/BitmapEncoder.java
rename to xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java
index ba0c9fba..631a58cf 100644
--- a/xchart/src/main/java/com/xeiam/xchart/BitmapEncoder.java
+++ b/xchart/src/main/java/org/knowm/xchart/BitmapEncoder.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Graphics2D;
 import java.awt.geom.AffineTransform;
diff --git a/xchart/src/main/java/com/xeiam/xchart/CSVExporter.java b/xchart/src/main/java/org/knowm/xchart/CSVExporter.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/CSVExporter.java
rename to xchart/src/main/java/org/knowm/xchart/CSVExporter.java
index fd805abc..d73d0b32 100644
--- a/xchart/src/main/java/com/xeiam/xchart/CSVExporter.java
+++ b/xchart/src/main/java/org/knowm/xchart/CSVExporter.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.io.BufferedWriter;
 import java.io.File;
diff --git a/xchart/src/main/java/com/xeiam/xchart/CSVImporter.java b/xchart/src/main/java/org/knowm/xchart/CSVImporter.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/CSVImporter.java
rename to xchart/src/main/java/org/knowm/xchart/CSVImporter.java
index 7cac74b2..20aa7f51 100644
--- a/xchart/src/main/java/com/xeiam/xchart/CSVImporter.java
+++ b/xchart/src/main/java/org/knowm/xchart/CSVImporter.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -22,7 +23,7 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.xeiam.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.StyleManager.ChartTheme;
 
 /**
  * This class is used to create a Chart object from a folder containing one or more CSV files. The parent folder's name becomes the title of the
diff --git a/xchart/src/main/java/com/xeiam/xchart/Chart.java b/xchart/src/main/java/org/knowm/xchart/Chart.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/Chart.java
rename to xchart/src/main/java/org/knowm/xchart/Chart.java
index 4ed931e4..b19f2f09 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Chart.java
+++ b/xchart/src/main/java/org/knowm/xchart/Chart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Graphics2D;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.internal.chartpart.ChartPainter;
-import com.xeiam.xchart.internal.style.Theme;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.internal.chartpart.ChartPainter;
+import org.knowm.xchart.internal.style.Theme;
 
 /**
  * An XChart Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/ChartBuilder.java b/xchart/src/main/java/org/knowm/xchart/ChartBuilder.java
similarity index 86%
rename from xchart/src/main/java/com/xeiam/xchart/ChartBuilder.java
rename to xchart/src/main/java/org/knowm/xchart/ChartBuilder.java
index e47aae46..76d3548b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/ChartBuilder.java
+++ b/xchart/src/main/java/org/knowm/xchart/ChartBuilder.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
-import com.xeiam.xchart.StyleManager.ChartTheme;
-import com.xeiam.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.ChartTheme;
+import org.knowm.xchart.StyleManager.ChartType;
 
 /**
  * A "Builder" to make creating charts easier
diff --git a/xchart/src/main/java/com/xeiam/xchart/ChartColor.java b/xchart/src/main/java/org/knowm/xchart/ChartColor.java
similarity index 88%
rename from xchart/src/main/java/com/xeiam/xchart/ChartColor.java
rename to xchart/src/main/java/org/knowm/xchart/ChartColor.java
index 201f1a85..1b4edc2b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/ChartColor.java
+++ b/xchart/src/main/java/org/knowm/xchart/ChartColor.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Color;
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/Histogram.java b/xchart/src/main/java/org/knowm/xchart/Histogram.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/Histogram.java
rename to xchart/src/main/java/org/knowm/xchart/Histogram.java
index 6876eea7..c22d2234 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Histogram.java
+++ b/xchart/src/main/java/org/knowm/xchart/Histogram.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.util.ArrayList;
 import java.util.Collection;
diff --git a/xchart/src/main/java/com/xeiam/xchart/QuickChart.java b/xchart/src/main/java/org/knowm/xchart/QuickChart.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/QuickChart.java
rename to xchart/src/main/java/org/knowm/xchart/QuickChart.java
index 0025909b..2b47a647 100644
--- a/xchart/src/main/java/com/xeiam/xchart/QuickChart.java
+++ b/xchart/src/main/java/org/knowm/xchart/QuickChart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.util.List;
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/Series.java b/xchart/src/main/java/org/knowm/xchart/Series.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/Series.java
rename to xchart/src/main/java/org/knowm/xchart/Series.java
index 2c1071f4..f5d1d66f 100644
--- a/xchart/src/main/java/com/xeiam/xchart/Series.java
+++ b/xchart/src/main/java/org/knowm/xchart/Series.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -22,9 +23,9 @@ import java.util.Date;
 import java.util.Iterator;
 import java.util.List;
 
-import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
-import com.xeiam.xchart.internal.markers.Marker;
-import com.xeiam.xchart.internal.style.SeriesColorMarkerLineStyle;
+import org.knowm.xchart.internal.chartpart.Axis.AxisType;
+import org.knowm.xchart.internal.markers.Marker;
+import org.knowm.xchart.internal.style.SeriesColorMarkerLineStyle;
 
 /**
  * A Series containing X and Y data to be plotted on a Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/SeriesColor.java b/xchart/src/main/java/org/knowm/xchart/SeriesColor.java
similarity index 92%
rename from xchart/src/main/java/com/xeiam/xchart/SeriesColor.java
rename to xchart/src/main/java/org/knowm/xchart/SeriesColor.java
index d5b7dd77..71444a2d 100644
--- a/xchart/src/main/java/com/xeiam/xchart/SeriesColor.java
+++ b/xchart/src/main/java/org/knowm/xchart/SeriesColor.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Color;
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/SeriesLineStyle.java b/xchart/src/main/java/org/knowm/xchart/SeriesLineStyle.java
similarity index 92%
rename from xchart/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
rename to xchart/src/main/java/org/knowm/xchart/SeriesLineStyle.java
index 320401e0..e3130074 100644
--- a/xchart/src/main/java/com/xeiam/xchart/SeriesLineStyle.java
+++ b/xchart/src/main/java/org/knowm/xchart/SeriesLineStyle.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.BasicStroke;
 
diff --git a/xchart/src/main/java/com/xeiam/xchart/SeriesMarker.java b/xchart/src/main/java/org/knowm/xchart/SeriesMarker.java
similarity index 75%
rename from xchart/src/main/java/com/xeiam/xchart/SeriesMarker.java
rename to xchart/src/main/java/org/knowm/xchart/SeriesMarker.java
index 54725f8d..5bd00b22 100644
--- a/xchart/src/main/java/com/xeiam/xchart/SeriesMarker.java
+++ b/xchart/src/main/java/org/knowm/xchart/SeriesMarker.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
-
-import com.xeiam.xchart.internal.markers.Circle;
-import com.xeiam.xchart.internal.markers.Diamond;
-import com.xeiam.xchart.internal.markers.Marker;
-import com.xeiam.xchart.internal.markers.Square;
-import com.xeiam.xchart.internal.markers.TriangleDown;
-import com.xeiam.xchart.internal.markers.TriangleUp;
+package org.knowm.xchart;
+
+import org.knowm.xchart.internal.markers.Circle;
+import org.knowm.xchart.internal.markers.Diamond;
+import org.knowm.xchart.internal.markers.Marker;
+import org.knowm.xchart.internal.markers.Square;
+import org.knowm.xchart.internal.markers.TriangleDown;
+import org.knowm.xchart.internal.markers.TriangleUp;
 
 /**
  * Pre-defined Markers used for Series Lines
diff --git a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java b/xchart/src/main/java/org/knowm/xchart/StyleManager.java
similarity index 98%
rename from xchart/src/main/java/com/xeiam/xchart/StyleManager.java
rename to xchart/src/main/java/org/knowm/xchart/StyleManager.java
index 2673c082..ad084568 100644
--- a/xchart/src/main/java/com/xeiam/xchart/StyleManager.java
+++ b/xchart/src/main/java/org/knowm/xchart/StyleManager.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -21,10 +22,10 @@ import java.awt.Stroke;
 import java.util.Locale;
 import java.util.TimeZone;
 
-import com.xeiam.xchart.internal.style.GGPlot2Theme;
-import com.xeiam.xchart.internal.style.MatlabTheme;
-import com.xeiam.xchart.internal.style.Theme;
-import com.xeiam.xchart.internal.style.XChartTheme;
+import org.knowm.xchart.internal.style.GGPlot2Theme;
+import org.knowm.xchart.internal.style.MatlabTheme;
+import org.knowm.xchart.internal.style.Theme;
+import org.knowm.xchart.internal.style.XChartTheme;
 
 /**
  * The StyleManager is used to manage all things related to styling of the vast number of Chart components
diff --git a/xchart/src/main/java/com/xeiam/xchart/SwingWrapper.java b/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/SwingWrapper.java
rename to xchart/src/main/java/org/knowm/xchart/SwingWrapper.java
index e10797f1..121099c4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/SwingWrapper.java
+++ b/xchart/src/main/java/org/knowm/xchart/SwingWrapper.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.GridLayout;
 import java.util.ArrayList;
diff --git a/xchart/src/main/java/com/xeiam/xchart/VectorGraphicsEncoder.java b/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java
similarity index 92%
rename from xchart/src/main/java/com/xeiam/xchart/VectorGraphicsEncoder.java
rename to xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java
index e0e16adc..894336af 100644
--- a/xchart/src/main/java/com/xeiam/xchart/VectorGraphicsEncoder.java
+++ b/xchart/src/main/java/org/knowm/xchart/VectorGraphicsEncoder.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
diff --git a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java b/xchart/src/main/java/org/knowm/xchart/XChartPanel.java
similarity index 97%
rename from xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
rename to xchart/src/main/java/org/knowm/xchart/XChartPanel.java
index 5c5a1d7a..12250f63 100644
--- a/xchart/src/main/java/com/xeiam/xchart/XChartPanel.java
+++ b/xchart/src/main/java/org/knowm/xchart/XChartPanel.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart;
+package org.knowm.xchart;
 
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -37,8 +38,8 @@ import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
 import javax.swing.filechooser.FileFilter;
 
-import com.xeiam.xchart.BitmapEncoder.BitmapFormat;
-import com.xeiam.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
+import org.knowm.xchart.BitmapEncoder.BitmapFormat;
+import org.knowm.xchart.VectorGraphicsEncoder.VectorGraphicsFormat;
 
 /**
  * A Swing JPanel that contains a Chart
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/Utils.java b/xchart/src/main/java/org/knowm/xchart/internal/Utils.java
similarity index 87%
rename from xchart/src/main/java/com/xeiam/xchart/internal/Utils.java
rename to xchart/src/main/java/org/knowm/xchart/internal/Utils.java
index 90c4baf5..c18fdfee 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/Utils.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/Utils.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal;
+package org.knowm.xchart.internal;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
index a9401fb4..572f8493 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Axis.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Axis.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -22,8 +23,8 @@ import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
 
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.LegendPosition;
 
 /**
  * Axis
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
similarity index 92%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
index 5637c1cf..a874dd98 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisPair.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisPair.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -24,10 +25,10 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
-import com.xeiam.xchart.internal.style.SeriesColorMarkerLineStyleCycler;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.internal.chartpart.Axis.AxisType;
+import org.knowm.xchart.internal.style.SeriesColorMarkerLineStyleCycler;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
similarity index 91%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
index f12d2f3e..b99262b0 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTick.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTick.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickBarChartCalculator.java
similarity index 91%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickBarChartCalculator.java
index fcad0c31..bb5e343a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickBarChartCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickBarChartCalculator.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +14,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.List;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.AxisType;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * This class encapsulates the logic to generate the axis tick mark and axis tick label data for rendering the axis ticks for decimal axes
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator.java
similarity index 93%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator.java
index 8a52fb79..a6d1672d 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickCalculator.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Shape;
 import java.awt.font.FontRenderContext;
@@ -23,10 +24,10 @@ import java.awt.geom.Rectangle2D;
 import java.util.LinkedList;
 import java.util.List;
 
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickDateCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickDateCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java
index 9093a850..c76ba457 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickDateCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickDateCalculator.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * This class encapsulates the logic to generate the axis tick mark and axis tick label data for rendering the axis ticks for date axes
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
index 076371a2..90a8b3b0 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLabels.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLabels.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
similarity index 93%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
index f810c8cf..ce9bac51 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickLogarithmicCalculator.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.math.BigDecimal;
 
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * This class encapsulates the logic to generate the axis tick mark and axis tick label data for rendering the axis ticks for logarithmic axes
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
similarity index 94%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
index 59073765..53c0c03b 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickMarks.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickMarks.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumericalCalculator.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumericalCalculator.java
index e18322a3..3b42ed26 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTickNumericalCalculator.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTickNumericalCalculator.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * This class encapsulates the logic to generate the axis tick mark and axis tick label data for rendering the axis ticks for decimal axes
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
similarity index 93%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
index bd05fb3f..de029e27 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/AxisTitle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/AxisTitle.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPainter.java
similarity index 94%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPainter.java
index 2e7e7732..097202ac 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPainter.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPainter.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Shape;
 import java.awt.geom.Rectangle2D;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.StyleManager;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.StyleManager;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPart.java
similarity index 83%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPart.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPart.java
index 47ca1949..b6e48fc5 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartPart.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartPart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartTitle.java
similarity index 93%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartTitle.java
index e798a0a3..2c861eac 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/ChartTitle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/ChartTitle.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend.java
similarity index 97%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend.java
index 8f3a2d16..c8083fc3 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Legend.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Legend.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
@@ -26,8 +27,8 @@ import java.awt.geom.Rectangle2D;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.StyleManager.ChartType;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.StyleManager.ChartType;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/NumberFormatter.java
similarity index 94%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/NumberFormatter.java
index 6e8682f9..b926a522 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/NumberFormatter.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/NumberFormatter.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.math.BigDecimal;
 import java.text.DecimalFormat;
 import java.text.NumberFormat;
 
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.internal.chartpart.Axis.Direction;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.internal.chartpart.Axis.Direction;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot.java
similarity index 90%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot.java
index c1238218..f48d3bf5 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/Plot.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/Plot.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
-import com.xeiam.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.ChartType;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent.java
similarity index 86%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent.java
index 23900560..0f07e6d2 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContent.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContent.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.BasicStroke;
 import java.awt.Stroke;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentBarChart.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentBarChart.java
index d2a1fa4f..47ae8417 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentBarChart.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentBarChart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -24,9 +25,9 @@ import java.awt.geom.Rectangle2D;
 import java.util.Collection;
 import java.util.Iterator;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.internal.Utils;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.internal.Utils;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentLineChart.java
similarity index 96%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentLineChart.java
index e68ad526..2dd4d2b4 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotContentLineChart.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotContentLineChart.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Rectangle;
@@ -25,11 +26,11 @@ import java.util.Collection;
 import java.util.Date;
 import java.util.Iterator;
 
-import com.xeiam.xchart.Series;
-import com.xeiam.xchart.StyleManager;
-import com.xeiam.xchart.StyleManager.ChartType;
-import com.xeiam.xchart.internal.Utils;
-import com.xeiam.xchart.internal.chartpart.Axis.AxisType;
+import org.knowm.xchart.Series;
+import org.knowm.xchart.StyleManager;
+import org.knowm.xchart.StyleManager.ChartType;
+import org.knowm.xchart.internal.Utils;
+import org.knowm.xchart.internal.chartpart.Axis.AxisType;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurface.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
rename to xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurface.java
index 1d688233..3c04fcd1 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/chartpart/PlotSurface.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/chartpart/PlotSurface.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.chartpart;
+package org.knowm.xchart.internal.chartpart;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
@@ -21,7 +22,7 @@ import java.awt.geom.Line2D;
 import java.awt.geom.Rectangle2D;
 import java.util.List;
 
-import com.xeiam.xchart.StyleManager.ChartType;
+import org.knowm.xchart.StyleManager.ChartType;
 
 /**
  * Draws the plot background, the plot border and the horizontal and vertical grid lines
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Circle.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/Circle.java
similarity index 85%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/Circle.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/Circle.java
index 67956509..21f69c1a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Circle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/Circle.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/Diamond.java
similarity index 87%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/Diamond.java
index bd3764cb..3b1f83f9 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Diamond.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/Diamond.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Path2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Marker.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/Marker.java
similarity index 83%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/Marker.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/Marker.java
index e4852dcf..702f01cf 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Marker.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/Marker.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.BasicStroke;
 import java.awt.Graphics2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Square.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/Square.java
similarity index 85%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/Square.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/Square.java
index 76aa85ef..54df5050 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/Square.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/Square.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.Graphics2D;
 import java.awt.Shape;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleDown.java
similarity index 86%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleDown.java
index 2b63cdf6..85628637 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleDown.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleDown.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Path2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java b/xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleUp.java
similarity index 86%
rename from xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java
rename to xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleUp.java
index c3dc57b3..1a69b413 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/markers/TriangleUp.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/markers/TriangleUp.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.markers;
+package org.knowm.xchart.internal.markers;
 
 import java.awt.Graphics2D;
 import java.awt.geom.Path2D;
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/package-info.java b/xchart/src/main/java/org/knowm/xchart/internal/package-info.java
similarity index 75%
rename from xchart/src/main/java/com/xeiam/xchart/internal/package-info.java
rename to xchart/src/main/java/org/knowm/xchart/internal/package-info.java
index 545db76f..0e49633f 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/package-info.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/package-info.java
@@ -1,12 +1,10 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
- *
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
+ * http://www.apache.org/licenses/LICENSE-2.0
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -16,4 +14,4 @@
 /**
  * Classes in this package are internal and are not intended to be accessed directly. Therefore, they are not included in the JavaDocs.
  */
-package com.xeiam.xchart.internal;
\ No newline at end of file
+package org.knowm.xchart.internal;
\ No newline at end of file
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java b/xchart/src/main/java/org/knowm/xchart/internal/style/GGPlot2Theme.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/GGPlot2Theme.java
index 8ece0fc5..e0461c20 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/GGPlot2Theme.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/GGPlot2Theme.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Stroke;
 
-import com.xeiam.xchart.ChartColor;
-import com.xeiam.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.ChartColor;
+import org.knowm.xchart.StyleManager.LegendPosition;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java b/xchart/src/main/java/org/knowm/xchart/internal/style/MatlabTheme.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/MatlabTheme.java
index c8bccc09..cdb2776a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/MatlabTheme.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/MatlabTheme.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Stroke;
 
-import com.xeiam.xchart.ChartColor;
-import com.xeiam.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.ChartColor;
+import org.knowm.xchart.StyleManager.LegendPosition;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyle.java b/xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyle.java
similarity index 85%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyle.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyle.java
index 4d2ddaca..6ddf7871 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyle.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyle.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
 
-import com.xeiam.xchart.internal.markers.Marker;
+import org.knowm.xchart.internal.markers.Marker;
 
 /**
  * A DTO to hold the Series' Color, Marker, and LineStyle
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java b/xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java
similarity index 91%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java
index 17b9667d..f73af62a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/SeriesColorMarkerLineStyleCycler.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 import java.util.Map;
 
-import com.xeiam.xchart.SeriesColor;
-import com.xeiam.xchart.SeriesLineStyle;
-import com.xeiam.xchart.SeriesMarker;
+import org.knowm.xchart.SeriesColor;
+import org.knowm.xchart.SeriesLineStyle;
+import org.knowm.xchart.SeriesMarker;
 
 /**
  * Cycles through the different colors, markers, and strokes in a predetermined way
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme.java
similarity index 92%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/Theme.java
index 854add80..c2a4132a 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/Theme.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/Theme.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Stroke;
 
-import com.xeiam.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.StyleManager.LegendPosition;
 
 /**
  * @author timmolter
diff --git a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java b/xchart/src/main/java/org/knowm/xchart/internal/style/XChartTheme.java
similarity index 95%
rename from xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
rename to xchart/src/main/java/org/knowm/xchart/internal/style/XChartTheme.java
index ad9b5501..56ba4b93 100644
--- a/xchart/src/main/java/com/xeiam/xchart/internal/style/XChartTheme.java
+++ b/xchart/src/main/java/org/knowm/xchart/internal/style/XChartTheme.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2011 - 2015 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,15 +14,15 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.xeiam.xchart.internal.style;
+package org.knowm.xchart.internal.style;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.Stroke;
 
-import com.xeiam.xchart.ChartColor;
-import com.xeiam.xchart.StyleManager.LegendPosition;
+import org.knowm.xchart.ChartColor;
+import org.knowm.xchart.StyleManager.LegendPosition;
 
 /**
  * @author timmolter
diff --git a/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java b/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
index ebfb46d4..0a3b0ba1 100644
--- a/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
+++ b/xchart/src/test/java/com/xeiam/xchart/HistogramTest.java
@@ -1,5 +1,6 @@
 /**
- * Copyright 2013 Xeiam LLC.
+ * Copyright 2015 Knowm Inc. (http://knowm.org) and contributors.
+ * Copyright 2011-2015 Xeiam LLC (http://xeiam.com) and contributors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +21,7 @@ import static org.fest.assertions.api.Assertions.assertThat;
 import java.util.Arrays;
 
 import org.junit.Test;
+import org.knowm.xchart.Histogram;
 
 /**
  * @author timmolter
-- 
GitLab