diff --git a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
index 15c5f9c26da246003797d1f05bab605a06e444d4..9d91b44b710dc9a604ab2ab02b4e6873b84bf47b 100644
--- a/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
+++ b/src/main/java/bdv/tools/RecordMaxProjectionDialog.java
@@ -73,7 +73,7 @@ import net.imglib2.img.Img;
 import net.imglib2.img.array.ArrayImgs;
 import net.imglib2.realtransform.AffineTransform3D;
 import net.imglib2.type.numeric.ARGBType;
-import net.imglib2.ui.OverlayRenderer;
+import bdv.viewer.OverlayRenderer;
 import net.imglib2.ui.PainterThread;
 import bdv.viewer.render.RenderTarget;
 import net.imglib2.util.LinAlgHelpers;
diff --git a/src/main/java/bdv/tools/RecordMovieDialog.java b/src/main/java/bdv/tools/RecordMovieDialog.java
index 3c1ee091e778a7fbf9612960c9e030ca466d87c6..c4adb030d275a3154f5478927908db03c02d5cf5 100644
--- a/src/main/java/bdv/tools/RecordMovieDialog.java
+++ b/src/main/java/bdv/tools/RecordMovieDialog.java
@@ -67,7 +67,7 @@ import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import net.imglib2.realtransform.AffineTransform3D;
-import net.imglib2.ui.OverlayRenderer;
+import bdv.viewer.OverlayRenderer;
 import net.imglib2.ui.PainterThread;
 import bdv.viewer.render.RenderTarget;
 
diff --git a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
index 2b274641327f97916c6f5c37e2ff67395c663b1f..7439703cad1b91241acfb288388da9e8d0c20e4c 100644
--- a/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
+++ b/src/main/java/bdv/tools/boundingbox/TransformedBoxOverlay.java
@@ -45,7 +45,7 @@ import java.awt.geom.GeneralPath;
 import net.imglib2.Interval;
 import net.imglib2.RealInterval;
 import net.imglib2.realtransform.AffineTransform3D;
-import net.imglib2.ui.OverlayRenderer;
+import bdv.viewer.OverlayRenderer;
 import bdv.viewer.TransformListener;
 
 import org.scijava.listeners.ChangeListener;
diff --git a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java b/src/main/java/bdv/viewer/InteractiveDisplayCanvas.java
similarity index 99%
rename from src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java
rename to src/main/java/bdv/viewer/InteractiveDisplayCanvas.java
index 3819f9fa1753d51edd6eff8dc69ce8f9f00372af..2f2b6a228049909241f9e1e86b97b2aaac4d67dd 100644
--- a/src/main/java/net/imglib2/ui/InteractiveDisplayCanvas.java
+++ b/src/main/java/bdv/viewer/InteractiveDisplayCanvas.java
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imglib2.ui;
+package bdv.viewer;
 
 import bdv.TransformEventHandler;
 import java.awt.Component;
@@ -134,7 +134,6 @@ public class InteractiveDisplayCanvas extends JComponent
 	 *
 	 * @param h handler to remove
 	 */
-//	@Override
 	public void addHandler( final Object h )
 	{
 		if ( h instanceof KeyListener )
@@ -163,7 +162,6 @@ public class InteractiveDisplayCanvas extends JComponent
 	 *
 	 * @param h handler to remove
 	 */
-//	@Override
 	public void removeHandler( final Object h )
 	{
 		if ( h instanceof KeyListener )
diff --git a/src/main/java/net/imglib2/ui/OverlayRenderer.java b/src/main/java/bdv/viewer/OverlayRenderer.java
similarity index 99%
rename from src/main/java/net/imglib2/ui/OverlayRenderer.java
rename to src/main/java/bdv/viewer/OverlayRenderer.java
index 590b9abc96151f07721f24340a172b5a3d88b833..7b8ba718fabe2be2b91285103018f357b7b34525 100644
--- a/src/main/java/net/imglib2/ui/OverlayRenderer.java
+++ b/src/main/java/bdv/viewer/OverlayRenderer.java
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  * #L%
  */
-package net.imglib2.ui;
+package bdv.viewer;
 
 import java.awt.Graphics;
 
diff --git a/src/main/java/bdv/viewer/ViewerPanel.java b/src/main/java/bdv/viewer/ViewerPanel.java
index 61012f1ec433de167c4178e795b464b57d3a4795..338c6988c9c0956d47b8ab715f75e5ff517dc957 100644
--- a/src/main/java/bdv/viewer/ViewerPanel.java
+++ b/src/main/java/bdv/viewer/ViewerPanel.java
@@ -82,8 +82,6 @@ import net.imglib2.RealLocalizable;
 import net.imglib2.RealPoint;
 import net.imglib2.RealPositionable;
 import net.imglib2.realtransform.AffineTransform3D;
-import net.imglib2.ui.InteractiveDisplayCanvas;
-import net.imglib2.ui.OverlayRenderer;
 import net.imglib2.ui.PainterThread;
 import net.imglib2.util.LinAlgHelpers;
 import org.scijava.listeners.Listeners;
diff --git a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
index 505f5d2d94376047201155947c77250835beada1..eea8ee9d005689c629bceddfd95c513f380378c1 100644
--- a/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
+++ b/src/main/java/net/imglib2/ui/overlay/BufferedImageOverlayRenderer.java
@@ -41,7 +41,7 @@ import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.image.BufferedImage;
 import net.imglib2.realtransform.AffineTransform3D;
-import net.imglib2.ui.OverlayRenderer;
+import bdv.viewer.OverlayRenderer;
 import bdv.viewer.render.RenderTarget;
 import bdv.viewer.TransformListener;
 import org.scijava.listeners.Listeners;
diff --git a/src/test/java/bdv/IntervalPaintingExample.java b/src/test/java/bdv/IntervalPaintingExample.java
index 61e711b069bd38625b70ca0228c4d47791aab5a3..54cb871c475372dcf70271316bcb2ebea537c1a4 100644
--- a/src/test/java/bdv/IntervalPaintingExample.java
+++ b/src/test/java/bdv/IntervalPaintingExample.java
@@ -39,7 +39,7 @@ import java.awt.Graphics2D;
 import java.io.File;
 import mpicbg.spim.data.SpimDataException;
 import net.imglib2.Interval;
-import net.imglib2.ui.OverlayRenderer;
+import bdv.viewer.OverlayRenderer;
 import net.imglib2.util.Intervals;
 import org.scijava.ui.behaviour.DragBehaviour;
 import org.scijava.ui.behaviour.io.InputTriggerConfig;