diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..4241b9a
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,16 @@
+
+include $(GOROOT)/src/Make.inc
+
+all:	install
+
+install:
+	cd draw2d && make install
+	cd postscript && make install
+
+clean:
+	cd draw2d && make clean
+	cd postscript && make clean
+
+nuke:
+	cd draw2d && make nuke
+	cd postscript && make nuke
diff --git a/cmd/Makefile b/cmd/Makefile
index 7084b3c..6c456a3 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -1,7 +1,7 @@
 
 include $(GOROOT)/src/Make.inc
 
-TARG=gettingStarted testdraw2d testX11draw testandroid testgopher testpostscript
+TARG=gettingStarted testdraw2d testX11draw testandroid testgopher testimage testpostscript
 
 OFILES=$(TARG:%=%.$O)
 
diff --git a/cmd/gettingStarted.go b/cmd/gettingStarted.go
index 1dddcc4..000c23f 100644
--- a/cmd/gettingStarted.go
+++ b/cmd/gettingStarted.go
@@ -11,8 +11,7 @@ import (
 
 	"image"
 	"image/png"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 
diff --git a/cmd/test.go b/cmd/test.go
deleted file mode 100644
index 6d15322..0000000
--- a/cmd/test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-func main() {
-	toto := make([]int, 2, 2)
-	toto[0] = 1
-	toto[1] = 2
-	fmt.Printf("%v\n", toto)
-	toto = toto[0:0]
-	fmt.Printf("%v\n", toto)
-	fmt.Printf("%v\n", cap(toto))
-}
diff --git a/cmd/testX11draw.go b/cmd/testX11draw.go
index 718978a..97b741e 100644
--- a/cmd/testX11draw.go
+++ b/cmd/testX11draw.go
@@ -6,8 +6,7 @@ import (
 	"exp/draw/x11"
 	"image"
 	"math"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 func main() {
diff --git a/cmd/testandroid.go b/cmd/testandroid.go
index 6dbd1c9..28b0962 100644
--- a/cmd/testandroid.go
+++ b/cmd/testandroid.go
@@ -11,8 +11,7 @@ import (
 	"math"
 	"image"
 	"image/png"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 const (
@@ -21,7 +20,7 @@ const (
 
 var (
 	lastTime int64
-	folder   = "../../../../wiki/test_results/"
+	folder   = "../resource/result/"
 )
 
 func initGc(w, h int) (image.Image, *draw2d.GraphicContext) {
diff --git a/cmd/testdraw2d.go b/cmd/testdraw2d.go
index 66f1385..227c1c8 100644
--- a/cmd/testdraw2d.go
+++ b/cmd/testdraw2d.go
@@ -13,8 +13,7 @@ import (
 	"math"
 	"image"
 	"image/png"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 const (
@@ -23,7 +22,7 @@ const (
 
 var (
 	lastTime int64
-	folder   = "../../../../wiki/test_results/"
+	folder   = "../resource/result/"
 )
 
 func initGc(w, h int) (image.Image, *draw2d.GraphicContext) {
@@ -489,7 +488,7 @@ func TestPathTransform() {
 }
 
 func TestFillString() {
-	draw2d.SetFontFolder("../../fonts/")
+	draw2d.SetFontFolder("../resource/font/")
 	i, gc := initGc(100, 100)
 	draw2d.RoundRect(gc, 5, 5, 95, 95, 10, 10)
 	gc.FillStroke()
diff --git a/cmd/testgopher.go b/cmd/testgopher.go
index f7351f5..5b6fb41 100644
--- a/cmd/testgopher.go
+++ b/cmd/testgopher.go
@@ -11,8 +11,7 @@ import (
 
 	"image"
 	"image/png"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 const (
@@ -21,7 +20,7 @@ const (
 
 var (
 	lastTime int64
-	folder   = "../../../../wiki/test_results/"
+	folder   = "../resource/result/"
 )
 
 func initGc(w, h int) (image.Image, *draw2d.GraphicContext) {
diff --git a/cmd/testimage.go b/cmd/testimage.go
index b714a4b..d2b0530 100644
--- a/cmd/testimage.go
+++ b/cmd/testimage.go
@@ -9,8 +9,7 @@ import (
 	"image"
 	"time"
 	"image/png"
-	//"draw2d"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 
@@ -67,7 +66,7 @@ func testBubble(gc *draw2d.GraphicContext) {
 
 func main() {
 
-	source := loadFromPngFile("../../Varna_Railway_Station_HDR.png")
+	source := loadFromPngFile("../resource/image/Varna_Railway_Station_HDR.png")
 	i := image.NewRGBA(1024, 768)
 	gc := draw2d.NewGraphicContext(i)
 	gc.Scale(2, 0.5)
@@ -77,5 +76,5 @@ func main() {
 	gc.DrawImage(source)
 	dt := time.Nanoseconds() - lastTime
 	fmt.Printf("Draw image: %f ms\n", float64(dt)*1e-6)
-	saveToPngFile("../../TestDrawImage.png", i)
+	saveToPngFile("../resource/result/TestDrawImage.png", i)
 }
diff --git a/cmd/testpostscript.go b/cmd/testpostscript.go
index 80a780f..49656c7 100644
--- a/cmd/testpostscript.go
+++ b/cmd/testpostscript.go
@@ -11,9 +11,8 @@ import (
 	"strings"
 	"image"
 	"image/png"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
-	"postscript"
-	//"postscript-go.googlecode.com/svn/trunk/postscript-go/src/pkg/postscript"
+	"draw2d.googlecode.com/hg/draw2d"
+	"draw2d.googlecode.com/hg/postscript"
 )
 
 
@@ -45,7 +44,7 @@ func main() {
 	gc.Scale(1, -1)
 	gc.Translate(0, -380)
 	lastTime := time.Nanoseconds()
-	src, err := os.Open("../../test_files/tiger.ps", 0, 0)
+	src, err := os.Open("../resource/postscript/tiger.ps", 0, 0)
 	if err != nil {
 		return 
 	}
@@ -56,5 +55,5 @@ func main() {
 	interpreter.Execute(reader)
 	dt := time.Nanoseconds() - lastTime
 	fmt.Printf("Draw image: %f ms\n", float64(dt)*1e-6)
-	saveToPngFile("../../TestPostscript.png", i)
+	saveToPngFile("../resource/result/TestPostscript.png", i)
 }
diff --git a/draw2d/Makefile b/draw2d/Makefile
index 48aeb81..d4873bd 100644
--- a/draw2d/Makefile
+++ b/draw2d/Makefile
@@ -1,6 +1,6 @@
 include $(GOROOT)/src/Make.inc
 
-TARG=draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d
+TARG=draw2d.googlecode.com/hg/draw2d
 GOFILES=\
 	arc.go\
 	curves.go\
diff --git a/draw2d/font.go b/draw2d/font.go
index a128520..57025bb 100644
--- a/draw2d/font.go
+++ b/draw2d/font.go
@@ -14,7 +14,7 @@ import (
 
 
 var (
-	fontFolder = "../../fonts/"
+	fontFolder = "../resource/font/"
 	fonts      = make(map[string]*truetype.Font)
 )
 
diff --git a/draw2d/path_storage.go b/draw2d/path_storage.go
index 40f2f73..fff521a 100644
--- a/draw2d/path_storage.go
+++ b/draw2d/path_storage.go
@@ -85,7 +85,7 @@ func (p *PathStorage) QuadCurveTo(cx, cy, x, y float64) *PathStorage {
 
 func (p *PathStorage) RQuadCurveTo(dcx, dcy, dx, dy float64) *PathStorage {
 	x, y := p.LastPoint()
-	p.RQuadCurveTo(x+dcx, y+dcy, x+dx, y+dy)
+	p.QuadCurveTo(x+dcx, y+dcy, x+dx, y+dy)
 	return p
 }
 
@@ -98,7 +98,7 @@ func (p *PathStorage) CubicCurveTo(cx1, cy1, cx2, cy2, x, y float64) *PathStorag
 
 func (p *PathStorage) RCubicCurveTo(dcx1, dcy1, dcx2, dcy2, dx, dy float64) *PathStorage {
 	x, y := p.LastPoint()
-	p.RCubicCurveTo(x+dcx1, y+dcy1, x+dcx2, y+dcy2, x+dx, y+dy)
+	p.CubicCurveTo(x+dcx1, y+dcy1, x+dcx2, y+dcy2, x+dx, y+dy)
 	return p
 }
 
@@ -133,7 +133,7 @@ func (p *PathStorage) ArcTo(cx, cy, rx, ry, startAngle, angle float64) *PathStor
 
 func (p *PathStorage) RArcTo(dcx, dcy, rx, ry, startAngle, angle float64) *PathStorage {
 	x, y := p.LastPoint()
-	p.RArcTo(x+dcx, y+dcy, rx, ry, startAngle, angle)
+	p.ArcTo(x+dcx, y+dcy, rx, ry, startAngle, angle)
 	return p
 }
 
diff --git a/postscript/Makefile b/postscript/Makefile
index 1739d3b..1afc401 100644
--- a/postscript/Makefile
+++ b/postscript/Makefile
@@ -1,6 +1,6 @@
 include $(GOROOT)/src/Make.inc
 
-TARG=postscript-go.googlecode.com/svn/trunk/postscript-go/src/pkg/postscript
+TARG=draw2d.googlecode.com/hg/postscript
 GOFILES=operators_array.go\
 	operators_dictionary.go\
 	operators_misc.go\
diff --git a/postscript/interpreter.go b/postscript/interpreter.go
index 9987b2f..a5ccb2d 100644
--- a/postscript/interpreter.go
+++ b/postscript/interpreter.go
@@ -8,7 +8,7 @@ import (
 	"log"
 	"strconv"
 	"io"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 )
 
 
diff --git a/postscript/operators_graphics.go b/postscript/operators_graphics.go
index 6335755..0ed7c63 100644
--- a/postscript/operators_graphics.go
+++ b/postscript/operators_graphics.go
@@ -6,7 +6,7 @@ package postscript
 
 import (
 	"image"
-	"draw2d.googlecode.com/svn/trunk/draw2d/src/pkg/draw2d"
+	"draw2d.googlecode.com/hg/draw2d"
 	"math"
 	"log"
 )
diff --git a/resources/fonts/COPYING b/resource/font/COPYING
similarity index 100%
rename from resources/fonts/COPYING
rename to resource/font/COPYING
diff --git a/resources/fonts/README b/resource/font/README
similarity index 100%
rename from resources/fonts/README
rename to resource/font/README
diff --git a/resources/fonts/luximb.ttf b/resource/font/luximb.ttf
similarity index 100%
rename from resources/fonts/luximb.ttf
rename to resource/font/luximb.ttf
diff --git a/resources/fonts/luximbi.ttf b/resource/font/luximbi.ttf
similarity index 100%
rename from resources/fonts/luximbi.ttf
rename to resource/font/luximbi.ttf
diff --git a/resources/fonts/luximr.ttf b/resource/font/luximr.ttf
similarity index 100%
rename from resources/fonts/luximr.ttf
rename to resource/font/luximr.ttf
diff --git a/resources/fonts/luximri.ttf b/resource/font/luximri.ttf
similarity index 100%
rename from resources/fonts/luximri.ttf
rename to resource/font/luximri.ttf
diff --git a/resources/fonts/luxirb.ttf b/resource/font/luxirb.ttf
similarity index 100%
rename from resources/fonts/luxirb.ttf
rename to resource/font/luxirb.ttf
diff --git a/resources/fonts/luxirbi.ttf b/resource/font/luxirbi.ttf
similarity index 100%
rename from resources/fonts/luxirbi.ttf
rename to resource/font/luxirbi.ttf
diff --git a/resources/fonts/luxirr.ttf b/resource/font/luxirr.ttf
similarity index 100%
rename from resources/fonts/luxirr.ttf
rename to resource/font/luxirr.ttf
diff --git a/resources/fonts/luxirri.ttf b/resource/font/luxirri.ttf
similarity index 100%
rename from resources/fonts/luxirri.ttf
rename to resource/font/luxirri.ttf
diff --git a/resources/fonts/luxisb.ttf b/resource/font/luxisb.ttf
similarity index 100%
rename from resources/fonts/luxisb.ttf
rename to resource/font/luxisb.ttf
diff --git a/resources/fonts/luxisbi.ttf b/resource/font/luxisbi.ttf
similarity index 100%
rename from resources/fonts/luxisbi.ttf
rename to resource/font/luxisbi.ttf
diff --git a/resources/fonts/luxisr.ttf b/resource/font/luxisr.ttf
similarity index 100%
rename from resources/fonts/luxisr.ttf
rename to resource/font/luxisr.ttf
diff --git a/resources/fonts/luxisri.ttf b/resource/font/luxisri.ttf
similarity index 100%
rename from resources/fonts/luxisri.ttf
rename to resource/font/luxisri.ttf
diff --git a/resources/Tests.html b/resource/image/Tests.html
similarity index 100%
rename from resources/Tests.html
rename to resource/image/Tests.html
diff --git a/resources/Tests.ps b/resource/image/Tests.ps
similarity index 100%
rename from resources/Tests.ps
rename to resource/image/Tests.ps
diff --git a/resources/Varna_Railway_Station_HDR.png b/resource/image/Varna_Railway_Station_HDR.png
similarity index 100%
rename from resources/Varna_Railway_Station_HDR.png
rename to resource/image/Varna_Railway_Station_HDR.png
diff --git a/resources/test.js b/resource/image/test.js
similarity index 100%
rename from resources/test.js
rename to resource/image/test.js
diff --git a/resources/test/3dcolor.ps b/resource/postscript/3dcolor.ps
similarity index 100%
rename from resources/test/3dcolor.ps
rename to resource/postscript/3dcolor.ps
diff --git a/resources/test/JavaPlatform.ps b/resource/postscript/JavaPlatform.ps
similarity index 100%
rename from resources/test/JavaPlatform.ps
rename to resource/postscript/JavaPlatform.ps
diff --git a/resources/test/Koch.ps b/resource/postscript/Koch.ps
similarity index 100%
rename from resources/test/Koch.ps
rename to resource/postscript/Koch.ps
diff --git a/resources/test/Mand.ps b/resource/postscript/Mand.ps
similarity index 100%
rename from resources/test/Mand.ps
rename to resource/postscript/Mand.ps
diff --git a/resources/test/bell_206.ps b/resource/postscript/bell_206.ps
similarity index 100%
rename from resources/test/bell_206.ps
rename to resource/postscript/bell_206.ps
diff --git a/resources/test/colorcir.ps b/resource/postscript/colorcir.ps
similarity index 100%
rename from resources/test/colorcir.ps
rename to resource/postscript/colorcir.ps
diff --git a/resources/test/doretree.ps b/resource/postscript/doretree.ps
similarity index 100%
rename from resources/test/doretree.ps
rename to resource/postscript/doretree.ps
diff --git a/resources/test/escher.ps b/resource/postscript/escher.ps
similarity index 100%
rename from resources/test/escher.ps
rename to resource/postscript/escher.ps
diff --git a/resources/test/golfer.ps b/resource/postscript/golfer.ps
similarity index 100%
rename from resources/test/golfer.ps
rename to resource/postscript/golfer.ps
diff --git a/resources/test/grade.ps b/resource/postscript/grade.ps
similarity index 100%
rename from resources/test/grade.ps
rename to resource/postscript/grade.ps
diff --git a/resources/test/grayalph.ps b/resource/postscript/grayalph.ps
similarity index 100%
rename from resources/test/grayalph.ps
rename to resource/postscript/grayalph.ps
diff --git a/resources/test/manylines.ps b/resource/postscript/manylines.ps
similarity index 100%
rename from resources/test/manylines.ps
rename to resource/postscript/manylines.ps
diff --git a/resources/test/maze.ps b/resource/postscript/maze.ps
similarity index 100%
rename from resources/test/maze.ps
rename to resource/postscript/maze.ps
diff --git a/resources/test/snowflak.ps b/resource/postscript/snowflak.ps
similarity index 100%
rename from resources/test/snowflak.ps
rename to resource/postscript/snowflak.ps
diff --git a/resources/test/test1.ps b/resource/postscript/test1.ps
similarity index 100%
rename from resources/test/test1.ps
rename to resource/postscript/test1.ps
diff --git a/resources/test/tiger.ps b/resource/postscript/tiger.ps
similarity index 100%
rename from resources/test/tiger.ps
rename to resource/postscript/tiger.ps
diff --git a/resources/test/vasarely.ps b/resource/postscript/vasarely.ps
similarity index 100%
rename from resources/test/vasarely.ps
rename to resource/postscript/vasarely.ps
diff --git a/resources/test/vw.ps b/resource/postscript/vw.ps
similarity index 100%
rename from resources/test/vw.ps
rename to resource/postscript/vw.ps
diff --git a/resources/test/whitepaper.ps b/resource/postscript/whitepaper.ps
similarity index 100%
rename from resources/test/whitepaper.ps
rename to resource/postscript/whitepaper.ps
diff --git a/resource/result/TestAndroid.png b/resource/result/TestAndroid.png
new file mode 100644
index 0000000..b0294d0
Binary files /dev/null and b/resource/result/TestAndroid.png differ
diff --git a/resource/result/TestBubble.png b/resource/result/TestBubble.png
new file mode 100644
index 0000000..60ee2a3
Binary files /dev/null and b/resource/result/TestBubble.png differ
diff --git a/resource/result/TestCurveRectangle.png b/resource/result/TestCurveRectangle.png
new file mode 100644
index 0000000..7919116
Binary files /dev/null and b/resource/result/TestCurveRectangle.png differ
diff --git a/resource/result/TestDash.png b/resource/result/TestDash.png
new file mode 100644
index 0000000..a68e5e2
Binary files /dev/null and b/resource/result/TestDash.png differ
diff --git a/resource/result/TestDrawArc.png b/resource/result/TestDrawArc.png
new file mode 100644
index 0000000..d75e227
Binary files /dev/null and b/resource/result/TestDrawArc.png differ
diff --git a/resource/result/TestDrawArcNegative.png b/resource/result/TestDrawArcNegative.png
new file mode 100644
index 0000000..25ec344
Binary files /dev/null and b/resource/result/TestDrawArcNegative.png differ
diff --git a/resource/result/TestDrawCubicCurve.png b/resource/result/TestDrawCubicCurve.png
new file mode 100644
index 0000000..a02d2c4
Binary files /dev/null and b/resource/result/TestDrawCubicCurve.png differ
diff --git a/resource/result/TestDrawImage.png b/resource/result/TestDrawImage.png
new file mode 100644
index 0000000..3100ab7
Binary files /dev/null and b/resource/result/TestDrawImage.png differ
diff --git a/resource/result/TestFillString.png b/resource/result/TestFillString.png
new file mode 100644
index 0000000..71b4928
Binary files /dev/null and b/resource/result/TestFillString.png differ
diff --git a/resource/result/TestFillStroke.png b/resource/result/TestFillStroke.png
new file mode 100644
index 0000000..0af3fa7
Binary files /dev/null and b/resource/result/TestFillStroke.png differ
diff --git a/resource/result/TestFillStyle.png b/resource/result/TestFillStyle.png
new file mode 100644
index 0000000..5d1cea6
Binary files /dev/null and b/resource/result/TestFillStyle.png differ
diff --git a/resource/result/TestGopher.png b/resource/result/TestGopher.png
new file mode 100644
index 0000000..f7b8a2e
Binary files /dev/null and b/resource/result/TestGopher.png differ
diff --git a/resource/result/TestLineCap.png b/resource/result/TestLineCap.png
new file mode 100644
index 0000000..5da584e
Binary files /dev/null and b/resource/result/TestLineCap.png differ
diff --git a/resource/result/TestLineJoin.png b/resource/result/TestLineJoin.png
new file mode 100644
index 0000000..c00002a
Binary files /dev/null and b/resource/result/TestLineJoin.png differ
diff --git a/resource/result/TestMultiSegmentCaps.png b/resource/result/TestMultiSegmentCaps.png
new file mode 100644
index 0000000..139b648
Binary files /dev/null and b/resource/result/TestMultiSegmentCaps.png differ
diff --git a/resource/result/TestPath.png b/resource/result/TestPath.png
new file mode 100644
index 0000000..696ecfe
Binary files /dev/null and b/resource/result/TestPath.png differ
diff --git a/resource/result/TestPathTransform.png b/resource/result/TestPathTransform.png
new file mode 100644
index 0000000..6fb0d41
Binary files /dev/null and b/resource/result/TestPathTransform.png differ
diff --git a/resources/result/TestPostscript.png b/resource/result/TestPostscript.png
similarity index 100%
rename from resources/result/TestPostscript.png
rename to resource/result/TestPostscript.png
diff --git a/resource/result/TestRoundRectangle.png b/resource/result/TestRoundRectangle.png
new file mode 100644
index 0000000..1d40b23
Binary files /dev/null and b/resource/result/TestRoundRectangle.png differ
diff --git a/resource/result/TestStar.png b/resource/result/TestStar.png
new file mode 100644
index 0000000..c4f9cf9
Binary files /dev/null and b/resource/result/TestStar.png differ
diff --git a/resource/result/TestTransform.png b/resource/result/TestTransform.png
new file mode 100644
index 0000000..2a495cb
Binary files /dev/null and b/resource/result/TestTransform.png differ
diff --git a/resources/TestDrawImage.png b/resources/TestDrawImage.png
deleted file mode 100644
index b0859f8..0000000
Binary files a/resources/TestDrawImage.png and /dev/null differ
diff --git a/resources/TestSourceDrawImage.png b/resources/TestSourceDrawImage.png
deleted file mode 100644
index f712f46..0000000
Binary files a/resources/TestSourceDrawImage.png and /dev/null differ