diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.classpath b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.classpath
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.classpath
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.classpath
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/.project b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.project
similarity index 91%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/.project
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.project
index 5d2c470..312e8a4 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/.project
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.nebula.widgets.nattable.renderer.swt.test</name>
+	<name>org.eclipse.nebula.widgets.nattable.renderer.javafx.example</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/CSSScratchPadWindow.java b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/CSSScratchPadWindow.java
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/CSSScratchPadWindow.java
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/CSSScratchPadWindow.java
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/META-INF/MANIFEST.MF
similarity index 94%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/META-INF/MANIFEST.MF
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/META-INF/MANIFEST.MF
index 4371473..aea7455 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable JavaFX Renderer Test
-Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.renderer.javafx.test
+Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.renderer.javafx.example
 Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.renderer.javafx;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/build.properties b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/build.properties
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/build.properties
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/build.properties
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/src/org/eclipse/nebula/widgets/nattable/renderer/e4/default.css b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/e4/default.css
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/src/org/eclipse/nebula/widgets/nattable/renderer/e4/default.css
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/e4/default.css
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXExample.xtend b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
similarity index 87%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXExample.xtend
rename to org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
index 1a3aaa7..656aceb 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/JavaFXExample.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.javafx.example/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/example/JavaFXExample.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.nebula.widgets.nattable.renderer.javafx
+package org.eclipse.nebula.widgets.nattable.renderer.javafx.example
 
 import javafx.application.Application
 import javafx.scene.Scene
@@ -7,6 +7,7 @@
 import org.eclipse.nebula.widgets.nattable.core.layer.Layer
 import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.DummyLayer
+import org.eclipse.nebula.widgets.nattable.renderer.javafx.JavaFXNatTable
 
 class JavaFXExample extends Application {
 	
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/.classpath b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/.classpath
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/.classpath
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/.classpath
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.project b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/.project
similarity index 92%
rename from org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.project
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/.project
index 8f65853..aaead77 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.javafx.test/.project
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.nebula.widgets.nattable.renderer.javafx.test</name>
+	<name>org.eclipse.nebula.widgets.nattable.renderer.swt.example</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/.settings/org.eclipse.core.resources.prefs b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/.settings/org.eclipse.core.resources.prefs
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/.settings/org.eclipse.jdt.core.prefs
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/META-INF/MANIFEST.MF
similarity index 95%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/META-INF/MANIFEST.MF
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/META-INF/MANIFEST.MF
index 8795d0d..bc864f9 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: NatTable SWT Renderer Tests
-Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.renderer.swt.test
+Bundle-SymbolicName: org.eclipse.nebula.widgets.nattable.renderer.swt.example
 Bundle-Version: 2.0.0.qualifier
 Fragment-Host: org.eclipse.nebula.widgets.nattable.renderer.swt;bundle-version="2.0.0"
 Bundle-RequiredExecutionEnvironment: JavaSE-1.7
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/build.properties b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/build.properties
similarity index 100%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/build.properties
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/build.properties
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/src/org/eclipse/nebula/widgets/nattable/renderer/swt/example/SWTExample.xtend
similarity index 92%
rename from org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend
rename to org.eclipse.nebula.widgets.nattable.renderer.swt.example/src/org/eclipse/nebula/widgets/nattable/renderer/swt/example/SWTExample.xtend
index 2deaadd..0d4e719 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/SWTExample.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.example/src/org/eclipse/nebula/widgets/nattable/renderer/swt/example/SWTExample.xtend
@@ -1,10 +1,8 @@
-package org.eclipse.nebula.widgets.nattable.renderer.swt
+package org.eclipse.nebula.widgets.nattable.renderer.swt.example
 
 import com.google.inject.Guice
 import com.google.inject.Injector
 import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.hideshow.HideShowAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.reorder.ReorderAxis
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.DimensionallyDependentLayer
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.DummyLayer
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.LayerDataAccessorImpl
@@ -12,6 +10,7 @@
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.header.ColumnHeaderLayer
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.header.RowHeaderLayer
 import org.eclipse.nebula.widgets.nattable.core.layer.impl.viewport.ViewportLayer
+import org.eclipse.nebula.widgets.nattable.renderer.swt.SWTNatTable
 import org.eclipse.nebula.widgets.nattable.renderer.swt.event.binding.KeyBinding
 import org.eclipse.nebula.widgets.nattable.renderer.swt.event.binding.UiBindings
 import org.eclipse.nebula.widgets.nattable.renderer.swt.event.binding.UiBindingsImpl