diff --git a/TODO b/TODO
index a0d789fb..a5f56f88 100644
--- a/TODO
+++ b/TODO
@@ -16,22 +16,5 @@ Image:
   - Handle pitch in SDL codec (and all others, actually)
   - Fix the Floyd-Steinberg code in pixels.cpp
   - Add gamma handling in pixels.cpp
-  - Make some Image::Lock2D method that returns an Array2D
-  - port libpipi files:
-     · analysis/measure.cpp
-     · codec/coreimage.cpp
-     · codec/coreimage.h
-     · codec/jpeg.cpp
-     · combine/blit.cpp
-     · combine/rgb.cpp
-     · context.cpp
-     · filter/blur.cpp
-     · filter/rotate.cpp
-     · filter/transform.cpp
-     · filter/wave.cpp
-     · paint/bezier.cpp
-     · paint/floodfill.cpp
-     · paint/line.cpp
-     · quantize/reduce.cpp
-     · sequence.cpp
+  - Port remaining libpipi files from src/image/todo/:
 
diff --git a/src/image/paint/bezier.cpp b/src/image/todo/bezier.cpp
similarity index 100%
rename from src/image/paint/bezier.cpp
rename to src/image/todo/bezier.cpp
diff --git a/src/image/combine/blit.cpp b/src/image/todo/blit.cpp
similarity index 100%
rename from src/image/combine/blit.cpp
rename to src/image/todo/blit.cpp
diff --git a/src/image/filter/blur.cpp b/src/image/todo/blur.cpp
similarity index 100%
rename from src/image/filter/blur.cpp
rename to src/image/todo/blur.cpp
diff --git a/src/image/context.cpp b/src/image/todo/context.cpp
similarity index 100%
rename from src/image/context.cpp
rename to src/image/todo/context.cpp
diff --git a/src/image/codec/coreimage.cpp b/src/image/todo/coreimage.cpp
similarity index 100%
rename from src/image/codec/coreimage.cpp
rename to src/image/todo/coreimage.cpp
diff --git a/src/image/codec/coreimage.h b/src/image/todo/coreimage.h
similarity index 100%
rename from src/image/codec/coreimage.h
rename to src/image/todo/coreimage.h
diff --git a/src/image/paint/floodfill.cpp b/src/image/todo/floodfill.cpp
similarity index 100%
rename from src/image/paint/floodfill.cpp
rename to src/image/todo/floodfill.cpp
diff --git a/src/image/codec/jpeg.cpp b/src/image/todo/jpeg.cpp
similarity index 100%
rename from src/image/codec/jpeg.cpp
rename to src/image/todo/jpeg.cpp
diff --git a/src/image/paint/line.cpp b/src/image/todo/line.cpp
similarity index 100%
rename from src/image/paint/line.cpp
rename to src/image/todo/line.cpp
diff --git a/src/image/analysis/measure.cpp b/src/image/todo/measure.cpp
similarity index 100%
rename from src/image/analysis/measure.cpp
rename to src/image/todo/measure.cpp
diff --git a/src/image/quantize/reduce.cpp b/src/image/todo/reduce.cpp
similarity index 100%
rename from src/image/quantize/reduce.cpp
rename to src/image/todo/reduce.cpp
diff --git a/src/image/combine/rgb.cpp b/src/image/todo/rgb.cpp
similarity index 100%
rename from src/image/combine/rgb.cpp
rename to src/image/todo/rgb.cpp
diff --git a/src/image/filter/rotate.cpp b/src/image/todo/rotate.cpp
similarity index 100%
rename from src/image/filter/rotate.cpp
rename to src/image/todo/rotate.cpp
diff --git a/src/image/sequence.cpp b/src/image/todo/sequence.cpp
similarity index 100%
rename from src/image/sequence.cpp
rename to src/image/todo/sequence.cpp
diff --git a/src/image/filter/transform.cpp b/src/image/todo/transform.cpp
similarity index 100%
rename from src/image/filter/transform.cpp
rename to src/image/todo/transform.cpp
diff --git a/src/image/filter/wave.cpp b/src/image/todo/wave.cpp
similarity index 100%
rename from src/image/filter/wave.cpp
rename to src/image/todo/wave.cpp