moved big stuff to separate package namespace
diff --git a/org.eclipse.nebula.widgets.nattable.core.example/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core.example/META-INF/MANIFEST.MF
index ca0c31a..cbc391e 100644
--- a/org.eclipse.nebula.widgets.nattable.core.example/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core.example/META-INF/MANIFEST.MF
@@ -9,7 +9,6 @@
com.google.guava,
org.eclipse.xtext.xbase.lib
Export-Package: org.eclipse.nebula.widgets.nattable.core.example,
- org.eclipse.nebula.widgets.nattable.core.example.impl,
org.eclipse.nebula.widgets.nattable.core.example.index,
org.eclipse.nebula.widgets.nattable.core.example.index.node
diff --git a/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/impl/big/BigLayerExample.xtend b/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/impl/big/BigLayerExample.xtend
index 4e306a2..6c66d17 100644
--- a/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/impl/big/BigLayerExample.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core.example/src/org/eclipse/nebula/widgets/nattable/core/example/impl/big/BigLayerExample.xtend
@@ -2,9 +2,9 @@
import java.math.BigDecimal
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl.BigAxisImpl
+import org.eclipse.nebula.widgets.nattable.core.big.layer.impl.BigDummyLayer
import org.eclipse.nebula.widgets.nattable.core.example.impl.AbstractNatExample
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.BigAxisImpl
-import org.eclipse.nebula.widgets.nattable.core.layer.impl.BigDummyLayer
import org.eclipse.nebula.widgets.nattable.core.layer.impl.DimensionallyDependentLayer
import org.eclipse.nebula.widgets.nattable.core.layer.impl.LayerDataAccessorImpl
import org.eclipse.nebula.widgets.nattable.core.layer.impl.composite.CompositeLayer
diff --git a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxisTest.xtend b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxisTest.xtend
index 99d1e9e..d7b98ce 100644
--- a/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxisTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core.test/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxisTest.xtend
@@ -1,11 +1,12 @@
package org.eclipse.nebula.widgets.nattable.core.layer.impl.viewport
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl.NotSoBigAxis
import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AxisImpl
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.NotSoBigAxis
import org.junit.Before
import org.junit.Test
import static org.eclipse.nebula.widgets.nattable.core.layer.AxisTest.*
+
import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.AxisInvariants.*
class ViewportAxisTest {
diff --git a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
index 5220b92..3d9f254 100644
--- a/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
+++ b/org.eclipse.nebula.widgets.nattable.core/META-INF/MANIFEST.MF
@@ -8,7 +8,14 @@
com.google.guava,
org.eclipse.xtext.xbase.lib,
javax.inject;bundle-version="1.0.0"
-Export-Package: org.eclipse.nebula.widgets.nattable.core.command,
+Export-Package: org.eclipse.nebula.widgets.nattable.core.big.layer,
+ org.eclipse.nebula.widgets.nattable.core.big.layer.axis,
+ org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl,
+ org.eclipse.nebula.widgets.nattable.core.big.layer.cell,
+ org.eclipse.nebula.widgets.nattable.core.big.layer.cell.impl,
+ org.eclipse.nebula.widgets.nattable.core.big.layer.impl,
+ org.eclipse.nebula.widgets.nattable.core.big.math,
+ org.eclipse.nebula.widgets.nattable.core.command,
org.eclipse.nebula.widgets.nattable.core.data,
org.eclipse.nebula.widgets.nattable.core.event,
org.eclipse.nebula.widgets.nattable.core.geometry,
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/BigLayer.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/BigLayer.xtend
similarity index 79%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/BigLayer.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/BigLayer.xtend
index 7132c19..1bf4331 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/BigLayer.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/BigLayer.xtend
@@ -1,11 +1,11 @@
-package org.eclipse.nebula.widgets.nattable.core.layer
+package org.eclipse.nebula.widgets.nattable.core.big.layer
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.cell.BigCell
import org.eclipse.nebula.widgets.nattable.core.command.CommandHandler
import org.eclipse.nebula.widgets.nattable.core.event.EventListener
import org.eclipse.nebula.widgets.nattable.core.event.EventSource
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.cell.BigCell
/**
* A two-dimensional rectangular region of cells.
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxis.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxis.xtend
similarity index 96%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxis.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxis.xtend
index 5562c61..a83c3ca 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxis.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxis.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.axis
+package org.eclipse.nebula.widgets.nattable.core.big.layer.axis
import java.io.Serializable
import java.math.BigDecimal
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxisInvariants.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxisInvariants.xtend
similarity index 93%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxisInvariants.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxisInvariants.xtend
index 4ee0083..56522f5 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/BigAxisInvariants.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/BigAxisInvariants.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.axis
+package org.eclipse.nebula.widgets.nattable.core.big.layer.axis
import java.math.BigDecimal
import java.math.BigInteger
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/BigAxisImpl.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/BigAxisImpl.xtend
similarity index 90%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/BigAxisImpl.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/BigAxisImpl.xtend
index 9a04513..03fd39d 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/BigAxisImpl.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/BigAxisImpl.xtend
@@ -1,12 +1,12 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.axis.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl
import java.io.Serializable
import java.math.BigDecimal
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
import org.eclipse.nebula.widgets.nattable.core.event.AbstractEventSourceSink
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxisInvariants.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxisInvariants.*
/**
* A simple Axis implementation.
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/NotSoBigAxis.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/NotSoBigAxis.xtend
similarity index 88%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/NotSoBigAxis.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/NotSoBigAxis.xtend
index 164f288..c25b6ef 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/axis/impl/NotSoBigAxis.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/axis/impl/NotSoBigAxis.xtend
@@ -1,14 +1,14 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.axis.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl
import java.io.Serializable
import java.math.BigDecimal
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
import org.eclipse.nebula.widgets.nattable.core.event.Event
import org.eclipse.nebula.widgets.nattable.core.event.EventListener
import org.eclipse.nebula.widgets.nattable.core.layer.axis.Axis
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import static extension org.eclipse.nebula.widgets.nattable.core.math.BigIntegerExtensions.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.math.BigIntegerExtensions.*
class NotSoBigAxis implements BigAxis {
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/BigCell.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/BigCell.xtend
similarity index 83%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/BigCell.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/BigCell.xtend
index d2ce45b..aca4f61 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/BigCell.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/BigCell.xtend
@@ -1,7 +1,7 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.cell
+package org.eclipse.nebula.widgets.nattable.core.big.layer.cell
+import org.eclipse.nebula.widgets.nattable.core.big.layer.BigLayer
import org.eclipse.nebula.widgets.nattable.core.geometry.BigPositionRectangle
-import org.eclipse.nebula.widgets.nattable.core.layer.BigLayer
/**
* Represents a particular cell within a Layer.
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/BigReadOnlyCell.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/BigReadOnlyCell.xtend
similarity index 80%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/BigReadOnlyCell.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/BigReadOnlyCell.xtend
index 8e90db8..277cf0b 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/BigReadOnlyCell.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/BigReadOnlyCell.xtend
@@ -1,9 +1,9 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.cell.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.cell.impl
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.BigLayer
+import org.eclipse.nebula.widgets.nattable.core.big.layer.cell.BigCell
import org.eclipse.nebula.widgets.nattable.core.geometry.BigPositionRectangle
-import org.eclipse.nebula.widgets.nattable.core.layer.BigLayer
-import org.eclipse.nebula.widgets.nattable.core.layer.cell.BigCell
/**
* A simple Cell that supports reading but not writing its data value.
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/NotSoBigCell.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/NotSoBigCell.xtend
similarity index 76%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/NotSoBigCell.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/NotSoBigCell.xtend
index dd244f1..5f30b5e 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/cell/impl/NotSoBigCell.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/cell/impl/NotSoBigCell.xtend
@@ -1,10 +1,10 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.cell.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.cell.impl
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.cell.BigCell
+import org.eclipse.nebula.widgets.nattable.core.big.layer.impl.NotSoBigLayer
import org.eclipse.nebula.widgets.nattable.core.geometry.BigPositionRectangle
-import org.eclipse.nebula.widgets.nattable.core.layer.cell.BigCell
import org.eclipse.nebula.widgets.nattable.core.layer.cell.Cell
-import org.eclipse.nebula.widgets.nattable.core.layer.impl.NotSoBigLayer
class NotSoBigCell implements BigCell {
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/BigDummyLayer.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/BigDummyLayer.xtend
similarity index 81%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/BigDummyLayer.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/BigDummyLayer.xtend
index 02f9bac..efb9f59 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/BigDummyLayer.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/BigDummyLayer.xtend
@@ -1,11 +1,11 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.impl
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.BigLayer
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.cell.impl.BigReadOnlyCell
import org.eclipse.nebula.widgets.nattable.core.command.Command
import org.eclipse.nebula.widgets.nattable.core.event.AbstractEventSourceSink
-import org.eclipse.nebula.widgets.nattable.core.layer.BigLayer
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.cell.impl.BigReadOnlyCell
/**
* A layer whose cell data values are strings indicating their column and row identifiers.
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/NotSoBigLayer.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/NotSoBigLayer.xtend
similarity index 76%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/NotSoBigLayer.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/NotSoBigLayer.xtend
index ed21098..557a2b0 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/NotSoBigLayer.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/layer/impl/NotSoBigLayer.xtend
@@ -1,16 +1,16 @@
-package org.eclipse.nebula.widgets.nattable.core.layer.impl
+package org.eclipse.nebula.widgets.nattable.core.big.layer.impl
import java.math.BigInteger
+import org.eclipse.nebula.widgets.nattable.core.big.layer.BigLayer
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl.NotSoBigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.cell.impl.NotSoBigCell
import org.eclipse.nebula.widgets.nattable.core.command.Command
import org.eclipse.nebula.widgets.nattable.core.event.Event
import org.eclipse.nebula.widgets.nattable.core.event.EventListener
-import org.eclipse.nebula.widgets.nattable.core.layer.BigLayer
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.NotSoBigAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.cell.impl.NotSoBigCell
-import static extension org.eclipse.nebula.widgets.nattable.core.math.BigIntegerExtensions.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.math.BigIntegerExtensions.*
class NotSoBigLayer implements BigLayer {
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/math/BigIntegerExtensions.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/math/BigIntegerExtensions.xtend
similarity index 90%
rename from org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/math/BigIntegerExtensions.xtend
rename to org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/math/BigIntegerExtensions.xtend
index 06ae77e..1a9bbc9 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/math/BigIntegerExtensions.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/big/math/BigIntegerExtensions.xtend
@@ -1,4 +1,4 @@
-package org.eclipse.nebula.widgets.nattable.core.math
+package org.eclipse.nebula.widgets.nattable.core.big.math
import java.math.BigInteger
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxis.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxis.xtend
index ee390d5..4615418 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxis.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportAxis.xtend
@@ -3,11 +3,11 @@
import java.io.Serializable
import java.math.BigDecimal
import java.math.BigInteger
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.AbstractAxis
-import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxisInvariants.*
-import static extension org.eclipse.nebula.widgets.nattable.core.math.BigIntegerExtensions.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxisInvariants.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.math.BigIntegerExtensions.*
class ViewportAxis extends AbstractAxis {
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportCell.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportCell.xtend
index 13e9e51..8f6e27d 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportCell.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportCell.xtend
@@ -4,7 +4,7 @@
import org.eclipse.nebula.widgets.nattable.core.geometry.PositionRectangle
import org.eclipse.nebula.widgets.nattable.core.layer.cell.Cell
-import static extension org.eclipse.nebula.widgets.nattable.core.math.BigIntegerExtensions.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.math.BigIntegerExtensions.*
class ViewportCell implements Cell {
diff --git a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportLayer.xtend b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportLayer.xtend
index 7f79f19..21eac2c 100644
--- a/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportLayer.xtend
+++ b/org.eclipse.nebula.widgets.nattable.core/src/org/eclipse/nebula/widgets/nattable/core/layer/impl/viewport/ViewportLayer.xtend
@@ -1,10 +1,10 @@
package org.eclipse.nebula.widgets.nattable.core.layer.impl.viewport
+import org.eclipse.nebula.widgets.nattable.core.big.layer.BigLayer
+import org.eclipse.nebula.widgets.nattable.core.big.layer.impl.NotSoBigLayer
import org.eclipse.nebula.widgets.nattable.core.geometry.PixelRectangle
-import org.eclipse.nebula.widgets.nattable.core.layer.BigLayer
import org.eclipse.nebula.widgets.nattable.core.layer.Layer
import org.eclipse.nebula.widgets.nattable.core.layer.impl.AbstractLayer
-import org.eclipse.nebula.widgets.nattable.core.layer.impl.NotSoBigLayer
class ViewportLayer extends AbstractLayer {
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/AbstractScrollBarHandlerTest.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/AbstractScrollBarHandlerTest.xtend
index 6a94a4e..2e2d1c1 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/AbstractScrollBarHandlerTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/AbstractScrollBarHandlerTest.xtend
@@ -2,8 +2,8 @@
import java.math.BigDecimal
import java.math.BigInteger
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxis
-import org.eclipse.nebula.widgets.nattable.core.layer.axis.impl.BigAxisImpl
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxis
+import org.eclipse.nebula.widgets.nattable.core.big.layer.axis.impl.BigAxisImpl
import org.eclipse.nebula.widgets.nattable.core.layer.impl.viewport.ViewportAxis
import org.eclipse.swt.widgets.ScrollBar
import org.junit.Before
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeLargerThanIntTest.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeLargerThanIntTest.xtend
index 59f4aca..954346e 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeLargerThanIntTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeLargerThanIntTest.xtend
@@ -10,7 +10,7 @@
import static org.junit.Assert.*
import static org.mockito.Mockito.*
-import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxisInvariants.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxisInvariants.*
@RunWith(typeof(MockitoJUnitRunner))
class ScrollBarHandlerRangeLargerThanIntTest extends AbstractScrollBarHandlerTest {
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeSmallerThanIntTest.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeSmallerThanIntTest.xtend
index f9cc2c9..9029f22 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeSmallerThanIntTest.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt.test/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandlerRangeSmallerThanIntTest.xtend
@@ -9,7 +9,7 @@
import static org.junit.Assert.*
import static org.mockito.Mockito.*
-import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxisInvariants.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxisInvariants.*
@RunWith(typeof(MockitoJUnitRunner))
class ScrollBarHandlerRangeSmallerThanIntTest extends AbstractScrollBarHandlerTest {
diff --git a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandler.xtend b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandler.xtend
index bdbc006..e1bf49e 100644
--- a/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandler.xtend
+++ b/org.eclipse.nebula.widgets.nattable.renderer.swt/src/org/eclipse/nebula/widgets/nattable/renderer/swt/layer/viewport/ScrollBarHandler.xtend
@@ -7,8 +7,8 @@
import org.eclipse.swt.widgets.ScrollBar
import static extension java.lang.Math.*
+import static extension org.eclipse.nebula.widgets.nattable.core.big.layer.axis.BigAxisInvariants.*
import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.AxisInvariants.*
-import static extension org.eclipse.nebula.widgets.nattable.core.layer.axis.BigAxisInvariants.*
class ScrollBarHandler implements Listener {
