diff --git a/README.md b/README.md
index 5a33510b1e46e91aeb8972675d930ba6ed97bba0..272a013b752075630362926854c55ed22b2c107a 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 c96c857890ab330e766e2d70318dcbb12e0e59cb..0000000000000000000000000000000000000000
--- 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 f9e4948453e30249e81f1ceea0e5a6965e5ced00..0807a4797a0dd4c2e81c8711005f427c079f4591 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 723213cb78ee20f285a8567fa8fae9d9e8c782d0..c1cd047138fc68d171097e07e2a3a7ccfe8270fc 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 f8bdf7301ff3894416e8be5e83b30911c97668df..0000000000000000000000000000000000000000
--- 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 c9a3956595afbb9874157edfc0790515ffb035f8..836fe370e32c516b56866e0ecd6cb0b5a6b0ce96 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 871dc4d134d2fd9b5319c3c76b2b5864233fa90c..7cacab7e56fda0b88e962b473bbe94d830ccfb61 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 3fbd7ca9732697eadc7dbd49f6c016f825d8aefa..b9424927943b2ee5e3e590a23679b29669650d6e 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 70fd6101ed0144cd98faa734ef0ba8e32acd0c8c..2a2d3b377511ab65c934d3ba5447ae77769e898a 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 5cfa7a6a9c9e09a88b51fc519e5b7bed6aeaa597..69968e1a161420b0731cd8df8897a1d9570fa357 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 583b2639a3c0492147d0a198830f17c2942cd3f6..a40b5deef4693d60048567c31b9d187d5bea1678 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 e0b98c8a8ac6c0ac1491e6aebe37fcb95cfd741a..bac75519031598f38263c464565723f9942a38b3 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 aa3d5c3bdb9d65d4b57816aad7a7e86957ac0496..a20557c4e7588a78bc0269b6559345b846e4b69a 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 9dcdcacf19055c18f44b77eb997aa7ca80dc4136..361b96377bc4f32ef27cb0255ea732e368437d6a 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 448fdf984ab92bd22adf8af71bac4be9cd8a9289..2089a7764c6b528f18868aa8e86c59c6769e61cb 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 a13e8c18fbbc193b7744d5ea77aa30e8df60ebc6..f6a2150a35acc6dc5274f89df2a24c4c470ed713 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 070e2c1122cd59eef63c39af9ec0d68888b647c9..b7650a48979cf6743461910ba0033071e3b6fd36 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 1b81514df048ac8f230940e1d993519dfc41d7f2..1980e7ca270d8dc5ecd008174b812be268534336 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 d15a932b4b68f50ba8b65fbd9603baaa2d499576..28d2d05bd21ddeeb796dda8e5570863d801c90bb 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 0473925b5456a989f63a4c2481bc653cdd59a76d..3b7d00ac548ee9ab80dcd0c01ce4fc200b2e4be4 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 505af95ebed5292e219c904811c647de5617fc0d..311db555ead52ca89aef0fa1615d3fa446bf73cc 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 cc80b0f65e07156f4e77b46a6434e36730c44e66..d8e14b084715475153f63ad076f80180c430c914 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 6815d1e27d543aba697396edf67323791459f1e1..54afe53fa35c332188ec471b676a430319d22ad3 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 0a49d189fabe82f5544b13e7ff19f172e437c7f3..f195812ce6adef4b85e7ea5fd8bebfa9c6d7b039 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 0a90629e12848cae34ed5b3cc10db582d104261c..de3afa5485c58a080a7db026905095015c99cbc3 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 e3f8745da99a7b992a9632357a0b684e1f7e4296..f7693202f2ee19953dac7f109a37c87533064378 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 57308563659c5146bee361d7090b0e0f01de25a8..bbd60e18d1bbc3e5a6e45ff5b3235372f985c6c4 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 027c08b3de85cb9805a1fb5767e753cc2eb1dcc0..e8846a4acdad2417c526f4d3af341dffa8aad061 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 c04545cf608c8df6135a8418a9554ee4a3fec076..7813658aa83cd9a793ac9fa37b858c6468721515 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 6afb4629cdb3a79cfa664ea951fb3dd95bf2587f..55d8778149c98b656954f581a4444da14c454526 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 9112824eaf3959ae17cc271bed02af9a092e60e7..3f251761da72944055ccfaedd46a01eb72e91bbb 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 34a169dc33cd000a017e30e2fcc61f4453efdff2..49ecf60221897f8efa0c7d91c9e34d613b5931c9 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 8f0c8253bdee5204c69c1d262f53ba11f95b619e..522c6bf3e3518a68f646fd4217ccf862d077c102 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 22d4ad5db3e113528929c87d1fa662a7963ddb27..b9b39f3ed6e9a7013c92572cdf5a250f58c7d0a1 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 6689ed14cb9d9f9b690618e7dc3af4060c2d2213..c8fa94900407a64fc72ee38dd05b529188a38a18 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 8b7a3a963d25338d97059f075c3df5fc82939fc2..c71b9492dbb166f5568fdeeee4fafba47ef810fb 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 dee2d9e86e808a9f9bf73acb9d482bcbbdd81e37..d154885c7ea2f982cd1103724fd0163e3a9f0f80 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 8ac76e5ea778b89a087d16c44449de3a4529559a..2883b9456d28af9298b0ed5593c97c20cca41928 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 acac803e275e545f6cbc53e7a9713489d8c79b4d..c9a11fcd20dbc65772da5551434a75c3f54145e0 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 ff2d0bd33c58b8d1b07ff6cfa49ccdacbdec1a63..3a14b6fdd0bc059af30558da8a88091854254222 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 da450fec09a9e518635af16b0ea12a443bb6346e..5c147d15e942ea9eb5e76b9757e9b949563d3e80 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 65659326fbd1907b005babd332310ab888b7e3b0..78c0cb6a7dc4bcdf15481c4c6b7efe65de237f6b 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 f9cf851a9f987f890d21601691ac03992fe616d2..5a3990287472fe8ad84f8a470ab427132ddbd455 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 ba997098223805bb396008c4d559adfbf378da6a..83ffb2be0a5608df7da2f68b8c633ddd0f1f1a16 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 bc3422cb033eb6b1ecdeaf970a9f9f25babf71fb..97018f8f88901bb7a52b9fdc995ad9501b0ed522 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 56e026fa2aa4d9b80c21fc1a222c7cde2a57017e..74773f6d834860a7a71ced92c51324fe499b3bd6 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 8df4daeff91efbdfa7df457789d2297e50503628..ce8940cfc812f06ccb05ea8aafb961c0506864a8 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 c4b214b9c84288ac7f72a8e192cf7b3bcabeff31..d504888466f54a5c64fbd7082fabd0989f29a94f 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 9e8c2ed7f0e5f34d7e0633addf8727f602409422..a19c84e8df259491043568afd0f2304b2e081f73 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 48fe9dcacfaf91ffb573f7190a45dc8c553a1708..d8c394dc0375e8ce1e5cad37a4b91618f587f154 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 be7f469949e825620ad90b2837c4ebdfec8162d7..906d3d6ef0f09824cb2cd403d7bd979e9dc066dd 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 082c833fffa723c22c1596dcbaf7cf94adcb78a8..2f4dce8a416c7cd65efb29c6b365f8f9bc2be0ce 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 ab3916a9584e49a7133d5ff2adc9f50a80eca191..8cc3f82bfda81923f7ce32c17fd9f5f725623977 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 0000000000000000000000000000000000000000..309986e844acc066226b6c2ec047b6f91a9edc1c
--- /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 283162cbb22171d1e9e324f6bb762a0978203e3d..d7744df7d08cd72025dc526c91b8a8e46b9ac53d 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 fb86b76e4ec50b89ec0e8974cca9b7d554204ddd..cfcccac331c7460dab2bdc17cddedd5ff9f3f68c 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 ba0c9fbacbd0e242b9284efc25244ec65de54f4e..631a58cf3070533d775f5f79aed7d75996824cd6 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 fd805abc13aa1292b04b91f19e46c5918356b591..d73d0b324ea0f19ec96e7e36ac81a049cb933b8e 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 7cac74b2a27e938d05cc41cb9db299597088b276..20aa7f51fd3a334d42d8a87ce4e13cd9224c81bf 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 4ed931e48697e853142c1806ff0a58768efaff5e..b19f2f09632c3592cf11f2cdbdadadd333df5841 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 e47aae46a72282ff143aef895c81825ea4fc9a73..76d3548bdc22d42292d9390e5420440e39281fbc 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 201f1a85e6ce6d0b7a85f862e85bdaa3d9f1cec8..1b4edc2b7c9cd22184bec3096af0691e58e5a775 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 6876eea71586f678f845dafaf6db099d50354c44..c22d2234a80a78468377ed5de6eb05059443c214 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 0025909b8835f8bbcc4124fface695d71872c9a8..2b47a647b30b9db734b3736e90147ce712855257 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 2c1071f4d30753fb9f1f709572e0935445004b3a..f5d1d66f0654d02a8aafb82a1a2bfa342aa400d3 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 d5b7dd77c350dc4fcb3814a6a8971348b2382b45..71444a2d0971b5bc924847585d565eaacb323144 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 320401e0ad405c9bf1361ea20534e16240fec386..e3130074e3e8ea15ec5cea59515ee2a4e6463e52 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 54725f8d910a5e47953c6593b856ce31835ed25d..5bd00b225470435942cf39432436a4c3cc1e9d65 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 2673c0828ea7a6931c661d77a9ed8dbef70c7410..ad084568bbefe93829379dcf7674d9431e790948 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 e10797f1733cbae2a77e2c78e6c8f26e2c5f2873..121099c4ddc1826f3ac15a8fc94af714790cd2a7 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 e0e16adc4833e0306998b3a6eeee8eab7f21ed27..894336af4a766641043acce8942f901ce37765a4 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 5c5a1d7a91631f6ae3b42bb7dce7e0c0cf1d33f9..12250f63a0e09769a8edd67179722e10798a8d51 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 90c4baf5b171cca0f309d2a155bed2d7493b4ef4..c18fdfeeaefec56241cc29e33b26f77a5d317ad9 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 a9401fb4b7599dbc048353d5b1c86b404af60334..572f8493cfd8701e11d8b805445185ff36ce123d 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 5637c1cf06d74d5fe23a0d18e334898e43efa142..a874dd98711f64746d750f392ae26f0000ac4149 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 f12d2f3e2668592caf00becf87affdf8b9c0aa0a..b99262b074b7d09a23ff2fc12bd56421d38629ec 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 fcad0c312c87e736055105de4c4d2476c386abee..bb5e343afeeda4b30ebf4ff87d047ca44658b142 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 8a52fb79691931774c1822d15d4e709dcf86d5ea..a6d1672d606054ce561c7f9e90ef56e1e81a0567 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 9093a850d699c2b155bb17a0e870350f4c7379fb..c76ba457243a747305fa18e138e293970f5aa744 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 076371a2e8e8468dcc423be3eaafa40125f495eb..90a8b3b0dce833e77d3f24c0399e73270b48902e 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 f810c8cfd345806ab0a588a585d6b895b28cfdd3..ce9bac51199c0a011423d0fb1dcecd366e733f8e 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 590737659ba278197c8a6bc15bfb634c613d9dc1..53c0c03b9732a948789466227e88b92be7f4c52a 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 e18322a3f7ca48a615e8dc5a8fd201abcdbdedfb..3b42ed26cd16468779c5e34afb287b66d7971bc3 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 bd05fb3f23e28333e59622ecd5a75a0fe7697315..de029e27d97c75b4ba8cffabbcebdc95f119443c 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 2e7e77320b2348a0ac8e8ec2c31785c38efb9ebf..097202ac0b83bb4653a120522a277a05ca1e3c83 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 47ca19490dec51e5ac1c9a84389831dbdbf1702f..b6e48fc5ff3c6671f5166a5f2fe17299e795fc43 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 e798a0a3f2ba85f2df9785170bf73f8cff6f09fd..2c861eac690cb958963c3febae4214aa1fe2916d 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 8f3a2d167311ecc863cd07282928d5ed7e397974..c8083fc30f3d4ef193845a04fa19110d3e5e45e8 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 6e8682f9a5f339d187ae5fd453d6ef489fcb85a3..b926a52258a7b47de01fbbc07e2cb8cd63ab7de2 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 c12382186c51c8afeafd2839cd340bc43d84679a..f48d3bf536778e5376feb8e22cbe36f89b07a2dc 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 23900560419cd21405df83df1063b22566d7e698..0f07e6d28ead7f2b1555c95f9285b9a5c16e7b57 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 d2a1fa4f9287fa966a1c17816d813f35dab7d2ac..47ae84174623da9419f03c14b835f9ab12d20f46 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 e68ad52661e1a7140c4f8d2aaa8d80ad21987c14..2dd4d2b46effc488532e50fcee4911d2d41ed547 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 1d688233367a94e74ca63297135df557b53f1ccb..3c04fcd176268bdfbee4e04a0ae3fdc998d8562b 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 679565099dfd377422538db0db6e7feea1c77172..21f69c1a887f1913cddb83b976d977cedc784bac 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 bd3764cbbbf16e341087dbd9dd91b7483f056382..3b1f83f9f648f7b71deb31c9c4f2c5b247e2fb05 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 e4852dcfaed4aac88a26bf6e81d07c1a8e62de1e..702f01cf0554027e28fe1ff9c82cd903b5a8a62c 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 76aa85ef1ca43a84710e1932029f7b9d722d3f51..54df5050ab524f44d564dc8e189d37aaac7834d4 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 2b63cdf690ae94edc0d2ee8e34ceb0df11c04f3a..856286374396c81edb440ddb10c36900ed5adbe0 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 c3dc57b34f1463c1e5b6392de0baecfd0a017f9c..1a69b41376e88eac0e206c6dbc4feb5b21d3b8e1 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 545db76f7f6b730d17efa62a0b549e2b4030e91d..0e49633f8469f65b341ef469630f3fe42caa9f44 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 8ece0fc573a1b1b6810ac5550a3912913b02185e..e0461c2068d0fa79474d10736cbf01ab08a1ac16 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 c8bccc09bbc1166a1c144b4b27ed0b45652c52fb..cdb2776a69871c46d584dc5f8e249af541c9a313 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 4d2ddaca9fa0a619d18b5b43043f4ccd0a926cf6..6ddf7871318b65a62b09ded0a69721d339d26edb 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 17b9667d503d54c8bc580f0bf2f81dd4e172e8a8..f73af62a83a857cae352931c027c78715844e439 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 854add80db1fbc54bcdffed9779f8b2f3b3ab2cf..c2a4132aa2b4261d4d3d87144c30e786c7e36390 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 ad9b550118b083eccd456aa9f5fffc699c0cffcc..56ba4b9388e3df3134ef472c40898b2914e7b3d5 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 ebfb46d47c7996d81eaf5e009ec5df55b614e21e..0a3b0ba1a00b2d0506ce0fe3e8fc31b716f1622f 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