--- a/biro/routines.d	Wed Jul 15 23:33:54 2009 +0930
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-module biro.routines;
-
-public {
-    import tk.geometry;
-    import cairo.Context;
-}
-
-void rectangle(Context cr, Rectangle rectangle) {
-    cr.rectangle(rectangle.position.x, rectangle.position.y,
-                 rectangle.size.x, rectangle.size.y);
-}

--- a/build.sh	Wed Jul 15 23:33:54 2009 +0930
+++ b/build.sh	Wed Jul 15 23:39:29 2009 +0930
@@ -4,7 +4,7 @@
         -ofdoodle \
         -od.obj \
         doodle.d \
-        biro/routines.d \
+        cairo/routines.d \
         dia/grid_layer.d dia/icanvas.d dia/page_layer.d dia/standard_tools.d dia/tool.d dia/tool_layer.d \
         gtk/canvas.d gtk/conversions.d \
         tk/events.d tk/geometry.d tk/misc.d tk/types.d \

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/cairo/routines.d	Wed Jul 15 23:39:29 2009 +0930
@@ -0,0 +1,11 @@
+module cairo.routines;
+
+public {
+    import tk.geometry;
+    import cairo.Context;
+}
+
+void rectangle(Context cr, Rectangle rectangle) {
+    cr.rectangle(rectangle.position.x, rectangle.position.y,
+                 rectangle.size.x, rectangle.size.y);
+}

--- a/dia/grid_layer.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/dia/grid_layer.d	Wed Jul 15 23:39:29 2009 +0930
@@ -1,26 +1,33 @@
 module dia.grid_layer;
 
-// TODO fix imports
-import icanvas;
-import tk.geometry;
-import cairo.Context;
-import cairo_support;
-import std.math;
+public {
+    import dia.icanvas;
+}
+
+private {
+    import cairo.routines;
+    import std.math;
+}
 
 interface Grid {
 }
 
 class GridLayer : Layer, Grid {
+    this(in string name) {
+        super(name);
+    }
+
     override Rectangle bounds() const {
         // We don't require any geometry
         return Rectangle();
     }
 
-    override void draw(const Viewport viewport, in Rectangle damage,
-                       Context model_cr, Context screen_cr) const {
+    override void draw(const Viewport viewport,
+                       in Rectangle pixel_damage, scope Context pixel_cr,
+                       in Rectangle model_damage, scope Context model_cr) const {
         double zoom = viewport.zoom;
 
-        double start_x = modf(damage.min_corner.x, zoom);
+        //double start_x = modf(damage.min_corner.x, zoom);
     }
 
     private {

--- a/dia/page_layer.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/dia/page_layer.d	Wed Jul 15 23:39:29 2009 +0930
@@ -1,11 +1,11 @@
 module dia.page_layer;
 
 private {
-    import cairo_support;
+    import cairo.routines;
 }
 
 public {
-    import icanvas;
+    import dia.icanvas;
 }
 
 interface Page {

--- a/dia/standard_tools.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/dia/standard_tools.d	Wed Jul 15 23:39:29 2009 +0930
@@ -1,11 +1,11 @@
 module dia.standard_tools;
 
 public {
-    import tool;
+    import dia.tool;
 }
 
 private {
-    import cairo_support;
+    import cairo.routines;
     import std.math;
     import std.stdio;
 }

--- a/dia/tool.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/dia/tool.d	Wed Jul 15 23:39:29 2009 +0930
@@ -1,8 +1,8 @@
 module dia.tool;
 
 public {
-    import cairo_support;
-    import icanvas;
+    import cairo.Context;
+    import dia.icanvas;
     import tk.events;
 }
 

--- a/dia/tool_layer.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/dia/tool_layer.d	Wed Jul 15 23:39:29 2009 +0930
@@ -2,11 +2,11 @@
 
 private {
     import std.stdio;
-    import cairo_support;
+    import cairo.routines;
 }
 
 public {
-    import tool;
+    import dia.tool;
 }
 
 class ToolLayer : Layer, EventHandler {

--- a/gtk/canvas.d	Wed Jul 15 23:33:54 2009 +0930
+++ b/gtk/canvas.d	Wed Jul 15 23:39:29 2009 +0930
@@ -2,16 +2,15 @@
 
 public {
     import dia.icanvas;
-    import tk.geometry;
     import tk.events;
 }
 
 private {
-    import tk.gtk_support;
+    import gtk.conversions;
     import tk.misc;
+    import cairo.routines;
 
     import cairo.Surface;
-    import cairo_support;
 
     import std.math;
     import std.stdio;