diff --git a/extra/bubble-chamber/bubble-chamber.factor b/extra/bubble-chamber/bubble-chamber.factor
index 2b642b13ed..dcbd776292 100644
--- a/extra/bubble-chamber/bubble-chamber.factor
+++ b/extra/bubble-chamber/bubble-chamber.factor
@@ -1,9 +1,9 @@
 USING: accessors arrays ascii calendar colors colors.gray
-combinators.short-circuit frame-buffer fry kernel locals math
-math.constants math.functions math.libm math.order math.points
-math.ranges math.vectors namespaces opengl processing.shapes
-quotations random sequences splitting threads timers ui
-ui.gadgets ui.gadgets.borders ui.gadgets.buttons
+combinators.short-circuit fry kernel locals math math.constants
+math.functions math.libm math.order math.points math.ranges
+math.vectors namespaces opengl processing.shapes quotations
+random sequences splitting threads timers ui ui.gadgets
+ui.gadgets.borders ui.gadgets.buttons ui.gadgets.frame-buffer
 ui.gadgets.packs ui.gestures ;
 
 IN: bubble-chamber
diff --git a/extra/frame-buffer/frame-buffer.factor b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
similarity index 98%
rename from extra/frame-buffer/frame-buffer.factor
rename to extra/ui/gadgets/frame-buffer/frame-buffer.factor
index e2b13b162b..c66945cebd 100644
--- a/extra/frame-buffer/frame-buffer.factor
+++ b/extra/ui/gadgets/frame-buffer/frame-buffer.factor
@@ -2,7 +2,7 @@ USING: accessors alien.c-types alien.data combinators grouping
 kernel locals math math.vectors opengl opengl.gl sequences
 specialized-arrays ui.gadgets ui.render ;
 SPECIALIZED-ARRAY: uint
-IN: frame-buffer
+IN: ui.gadgets.frame-buffer
 
 TUPLE: frame-buffer < gadget pixels last-dim ;