diff --git a/postscript-go/.project b/.project
similarity index 100%
rename from postscript-go/.project
rename to .project
diff --git a/postscript-go/cmd/Makefile b/cmd/Makefile
similarity index 100%
rename from postscript-go/cmd/Makefile
rename to cmd/Makefile
diff --git a/postscript-go/cmd/test.go b/cmd/test.go
similarity index 100%
rename from postscript-go/cmd/test.go
rename to cmd/test.go
diff --git a/postscript-go/cmd/testpostscript.go b/cmd/testpostscript.go
similarity index 100%
rename from postscript-go/cmd/testpostscript.go
rename to cmd/testpostscript.go
diff --git a/postscript-go/doc/PLRM.pdf b/doc/PLRM.pdf
similarity index 100%
rename from postscript-go/doc/PLRM.pdf
rename to doc/PLRM.pdf
diff --git a/postscript-go/fonts/COPYING b/fonts/COPYING
similarity index 100%
rename from postscript-go/fonts/COPYING
rename to fonts/COPYING
diff --git a/postscript-go/fonts/README b/fonts/README
similarity index 100%
rename from postscript-go/fonts/README
rename to fonts/README
diff --git a/postscript-go/fonts/luximb.ttf b/fonts/luximb.ttf
similarity index 100%
rename from postscript-go/fonts/luximb.ttf
rename to fonts/luximb.ttf
diff --git a/postscript-go/fonts/luximbi.ttf b/fonts/luximbi.ttf
similarity index 100%
rename from postscript-go/fonts/luximbi.ttf
rename to fonts/luximbi.ttf
diff --git a/postscript-go/fonts/luximr.ttf b/fonts/luximr.ttf
similarity index 100%
rename from postscript-go/fonts/luximr.ttf
rename to fonts/luximr.ttf
diff --git a/postscript-go/fonts/luximri.ttf b/fonts/luximri.ttf
similarity index 100%
rename from postscript-go/fonts/luximri.ttf
rename to fonts/luximri.ttf
diff --git a/postscript-go/fonts/luxirb.ttf b/fonts/luxirb.ttf
similarity index 100%
rename from postscript-go/fonts/luxirb.ttf
rename to fonts/luxirb.ttf
diff --git a/postscript-go/fonts/luxirbi.ttf b/fonts/luxirbi.ttf
similarity index 100%
rename from postscript-go/fonts/luxirbi.ttf
rename to fonts/luxirbi.ttf
diff --git a/postscript-go/fonts/luxirr.ttf b/fonts/luxirr.ttf
similarity index 100%
rename from postscript-go/fonts/luxirr.ttf
rename to fonts/luxirr.ttf
diff --git a/postscript-go/fonts/luxirri.ttf b/fonts/luxirri.ttf
similarity index 100%
rename from postscript-go/fonts/luxirri.ttf
rename to fonts/luxirri.ttf
diff --git a/postscript-go/fonts/luxisb.ttf b/fonts/luxisb.ttf
similarity index 100%
rename from postscript-go/fonts/luxisb.ttf
rename to fonts/luxisb.ttf
diff --git a/postscript-go/fonts/luxisbi.ttf b/fonts/luxisbi.ttf
similarity index 100%
rename from postscript-go/fonts/luxisbi.ttf
rename to fonts/luxisbi.ttf
diff --git a/postscript-go/fonts/luxisr.ttf b/fonts/luxisr.ttf
similarity index 100%
rename from postscript-go/fonts/luxisr.ttf
rename to fonts/luxisr.ttf
diff --git a/postscript-go/fonts/luxisri.ttf b/fonts/luxisri.ttf
similarity index 100%
rename from postscript-go/fonts/luxisri.ttf
rename to fonts/luxisri.ttf
diff --git a/postscript-go/postscript/Makefile b/postscript/Makefile
similarity index 100%
rename from postscript-go/postscript/Makefile
rename to postscript/Makefile
diff --git a/postscript-go/postscript/interpreter.go b/postscript/interpreter.go
similarity index 100%
rename from postscript-go/postscript/interpreter.go
rename to postscript/interpreter.go
diff --git a/postscript-go/postscript/operators.go b/postscript/operators.go
similarity index 100%
rename from postscript-go/postscript/operators.go
rename to postscript/operators.go
diff --git a/postscript-go/postscript/operators_array.go b/postscript/operators_array.go
similarity index 100%
rename from postscript-go/postscript/operators_array.go
rename to postscript/operators_array.go
diff --git a/postscript-go/postscript/operators_conflict.go b/postscript/operators_conflict.go
similarity index 100%
rename from postscript-go/postscript/operators_conflict.go
rename to postscript/operators_conflict.go
diff --git a/postscript-go/postscript/operators_control.go b/postscript/operators_control.go
similarity index 100%
rename from postscript-go/postscript/operators_control.go
rename to postscript/operators_control.go
diff --git a/postscript-go/postscript/operators_dictionary.go b/postscript/operators_dictionary.go
similarity index 100%
rename from postscript-go/postscript/operators_dictionary.go
rename to postscript/operators_dictionary.go
diff --git a/postscript-go/postscript/operators_graphics.go b/postscript/operators_graphics.go
similarity index 100%
rename from postscript-go/postscript/operators_graphics.go
rename to postscript/operators_graphics.go
diff --git a/postscript-go/postscript/operators_math.go b/postscript/operators_math.go
similarity index 100%
rename from postscript-go/postscript/operators_math.go
rename to postscript/operators_math.go
diff --git a/postscript-go/postscript/operators_misc.go b/postscript/operators_misc.go
similarity index 100%
rename from postscript-go/postscript/operators_misc.go
rename to postscript/operators_misc.go
diff --git a/postscript-go/postscript/operators_relational.go b/postscript/operators_relational.go
similarity index 100%
rename from postscript-go/postscript/operators_relational.go
rename to postscript/operators_relational.go
diff --git a/postscript-go/postscript/operators_stack.go b/postscript/operators_stack.go
similarity index 100%
rename from postscript-go/postscript/operators_stack.go
rename to postscript/operators_stack.go
diff --git a/postscript-go/postscript/procedure.go b/postscript/procedure.go
similarity index 100%
rename from postscript-go/postscript/procedure.go
rename to postscript/procedure.go
diff --git a/postscript-go/postscript/scanner.go b/postscript/scanner.go
similarity index 100%
rename from postscript-go/postscript/scanner.go
rename to postscript/scanner.go
diff --git a/postscript-go/resources/result/TestPostscript.png b/resources/result/TestPostscript.png
similarity index 100%
rename from postscript-go/resources/result/TestPostscript.png
rename to resources/result/TestPostscript.png
diff --git a/postscript-go/resources/test/3dcolor.ps b/resources/test/3dcolor.ps
similarity index 100%
rename from postscript-go/resources/test/3dcolor.ps
rename to resources/test/3dcolor.ps
diff --git a/postscript-go/resources/test/JavaPlatform.ps b/resources/test/JavaPlatform.ps
similarity index 100%
rename from postscript-go/resources/test/JavaPlatform.ps
rename to resources/test/JavaPlatform.ps
diff --git a/postscript-go/resources/test/Koch.ps b/resources/test/Koch.ps
similarity index 100%
rename from postscript-go/resources/test/Koch.ps
rename to resources/test/Koch.ps
diff --git a/postscript-go/resources/test/Mand.ps b/resources/test/Mand.ps
similarity index 100%
rename from postscript-go/resources/test/Mand.ps
rename to resources/test/Mand.ps
diff --git a/postscript-go/resources/test/bell_206.ps b/resources/test/bell_206.ps
similarity index 100%
rename from postscript-go/resources/test/bell_206.ps
rename to resources/test/bell_206.ps
diff --git a/postscript-go/resources/test/colorcir.ps b/resources/test/colorcir.ps
similarity index 100%
rename from postscript-go/resources/test/colorcir.ps
rename to resources/test/colorcir.ps
diff --git a/postscript-go/resources/test/doretree.ps b/resources/test/doretree.ps
similarity index 100%
rename from postscript-go/resources/test/doretree.ps
rename to resources/test/doretree.ps
diff --git a/postscript-go/resources/test/escher.ps b/resources/test/escher.ps
similarity index 100%
rename from postscript-go/resources/test/escher.ps
rename to resources/test/escher.ps
diff --git a/postscript-go/resources/test/golfer.ps b/resources/test/golfer.ps
similarity index 100%
rename from postscript-go/resources/test/golfer.ps
rename to resources/test/golfer.ps
diff --git a/postscript-go/resources/test/grade.ps b/resources/test/grade.ps
similarity index 100%
rename from postscript-go/resources/test/grade.ps
rename to resources/test/grade.ps
diff --git a/postscript-go/resources/test/grayalph.ps b/resources/test/grayalph.ps
similarity index 100%
rename from postscript-go/resources/test/grayalph.ps
rename to resources/test/grayalph.ps
diff --git a/postscript-go/resources/test/manylines.ps b/resources/test/manylines.ps
similarity index 100%
rename from postscript-go/resources/test/manylines.ps
rename to resources/test/manylines.ps
diff --git a/postscript-go/resources/test/maze.ps b/resources/test/maze.ps
similarity index 100%
rename from postscript-go/resources/test/maze.ps
rename to resources/test/maze.ps
diff --git a/postscript-go/resources/test/snowflak.ps b/resources/test/snowflak.ps
similarity index 100%
rename from postscript-go/resources/test/snowflak.ps
rename to resources/test/snowflak.ps
diff --git a/postscript-go/resources/test/test1.ps b/resources/test/test1.ps
similarity index 100%
rename from postscript-go/resources/test/test1.ps
rename to resources/test/test1.ps
diff --git a/postscript-go/resources/test/tiger.ps b/resources/test/tiger.ps
similarity index 100%
rename from postscript-go/resources/test/tiger.ps
rename to resources/test/tiger.ps
diff --git a/postscript-go/resources/test/vasarely.ps b/resources/test/vasarely.ps
similarity index 100%
rename from postscript-go/resources/test/vasarely.ps
rename to resources/test/vasarely.ps
diff --git a/postscript-go/resources/test/vw.ps b/resources/test/vw.ps
similarity index 100%
rename from postscript-go/resources/test/vw.ps
rename to resources/test/vw.ps
diff --git a/postscript-go/resources/test/whitepaper.ps b/resources/test/whitepaper.ps
similarity index 100%
rename from postscript-go/resources/test/whitepaper.ps
rename to resources/test/whitepaper.ps