clean up bundle configs
diff --git a/NatTable/renderer.javafx.bnd b/NatTable/renderer.javafx.bnd
index a192f67..c9c89b7 100644
--- a/NatTable/renderer.javafx.bnd
+++ b/NatTable/renderer.javafx.bnd
@@ -1,6 +1,2 @@
Export-Package: org.eclipse.nebula.widgets.nattable.renderer.javafx,\
- org.eclipse.nebula.widgets.nattable.renderer.javafx.geometry,\
- org.eclipse.nebula.widgets.nattable.renderer.javafx.layer,\
- org.eclipse.nebula.widgets.nattable.renderer.javafx.layer.cell,\
- org.eclipse.nebula.widgets.nattable.renderer.javafx.layer.cell.impl,\
- org.eclipse.nebula.widgets.nattable.renderer.javafx.layer.impl
\ No newline at end of file
+ org.eclipse.nebula.widgets.nattable.renderer.javafx.graphics
\ No newline at end of file
diff --git a/NatTable/renderer.swt.bnd b/NatTable/renderer.swt.bnd
index 45325d2..9c6ca67 100644
--- a/NatTable/renderer.swt.bnd
+++ b/NatTable/renderer.swt.bnd
@@ -1,8 +1,7 @@
Export-Package: org.eclipse.nebula.widgets.nattable.renderer.swt,\
org.eclipse.nebula.widgets.nattable.renderer.swt.event,\
org.eclipse.nebula.widgets.nattable.renderer.swt.event.action,\
+ org.eclipse.nebula.widgets.nattable.renderer.swt.event.binding,\
+ org.eclipse.nebula.widgets.nattable.renderer.swt.event.matcher,\
org.eclipse.nebula.widgets.nattable.renderer.swt.event.mode,\
- org.eclipse.nebula.widgets.nattable.renderer.swt.layer,\
- org.eclipse.nebula.widgets.nattable.renderer.swt.layer.cell,\
- org.eclipse.nebula.widgets.nattable.renderer.swt.layer.cell.impl,\
- org.eclipse.nebula.widgets.nattable.renderer.swt.layer.impl
\ No newline at end of file
+ org.eclipse.nebula.widgets.nattable.renderer.swt.geometry
\ No newline at end of file
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/GeometryConversions.xtend b/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/GeometryConversions.xtend
deleted file mode 100644
index 48d2232..0000000
--- a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/GeometryConversions.xtend
+++ /dev/null
@@ -1,17 +0,0 @@
-package org.eclipse.nebula.widgets.nattable.renderer.javafx.geometry
-
-import javafx.scene.shape.Rectangle
-import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
-
-class GeometryConversions {
-
- def static Rectangle toJavaFXRectangle(PixelRectangle pixelRectangle) {
- new Rectangle(
- pixelRectangle.x,
- pixelRectangle.y,
- pixelRectangle.width,
- pixelRectangle.height
- )
- }
-
-}
\ No newline at end of file
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo b/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/graphics/packageinfo
similarity index 100%
rename from NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo
rename to NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/graphics/packageinfo
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo b/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/binding/packageinfo
similarity index 100%
copy from NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo
copy to NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/binding/packageinfo
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo b/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/matcher/packageinfo
similarity index 100%
copy from NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo
copy to NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/event/matcher/packageinfo
diff --git a/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo b/NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/geometry/packageinfo
similarity index 100%
copy from NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/javafx/geometry/packageinfo
copy to NatTable/src/org/eclipse/nebula/widgets/nattable/renderer/swt/geometry/packageinfo
