diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -4,3 +4,5 @@
 ^out/
 \.pyc$
 ^build/
+^dist/
+.egg-info/
diff --git a/src/diana/__main__.py b/src/diana/__main__.py
new file mode 100644
--- /dev/null
+++ b/src/diana/__main__.py
@@ -0,0 +1,4 @@
+from .diana import main
+
+if __name__ == "__main__":
+	main()
diff --git a/src/diana/diana.py b/src/diana/diana.py
--- a/src/diana/diana.py
+++ b/src/diana/diana.py
@@ -1,13 +1,13 @@
 import os
 import re
 
-import config as cfg
-import go
-from go import BLACK,WHITE,EMPTY
-from sgfParser import ParserError
-from sgfParser.collection import Collection
-from drawer.svg import Svg
-from drawer.tikz import Tikz
+from . import config as cfg
+from . import go
+from .go import BLACK,WHITE,EMPTY
+from .sgfParser import ParserError
+from .sgfParser.collection import Collection
+from .drawer.svg import Svg
+from .drawer.tikz import Tikz
 
 
 def collectMoves(root):
@@ -116,7 +116,7 @@ W: {PW} {WR}
 		return True
 
 
-if __name__=="__main__":
+def main():
 	cfg.parseArgs()
 	print("processing:")
 	files=cfg.inputFiles[:]
diff --git a/src/diana/sgfParser/collection.py b/src/diana/sgfParser/collection.py
--- a/src/diana/sgfParser/collection.py
+++ b/src/diana/sgfParser/collection.py
@@ -1,6 +1,6 @@
 from .node import Node
 from . import skipWhitespace, ParserError
-from gameRecord import GameRecord
+from .gameRecord import GameRecord
 
 
 class Collection:
diff --git a/src/diana/gameRecord.py b/src/diana/sgfParser/gameRecord.py
rename from src/diana/gameRecord.py
rename to src/diana/sgfParser/gameRecord.py
--- a/src/diana/gameRecord.py
+++ b/src/diana/sgfParser/gameRecord.py
@@ -1,4 +1,4 @@
-from sgfParser.node import Node
+from .node import Node
 
 
 ## Wrapper around a Node tree.
diff --git a/src/diana/tests/testSgfParser.py b/src/diana/tests/testSgfParser.py
--- a/src/diana/tests/testSgfParser.py
+++ b/src/diana/tests/testSgfParser.py
@@ -4,10 +4,10 @@ import unittest
 from unittest import TestCase
 import os
 
-from sgfParser import strRowCol
-from sgfParser.collection import Collection
-from sgfParser.property import Property,DateProperty,DateException
-from sgfParser.propValues import text,compose
+from diana.sgfParser import strRowCol
+from diana.sgfParser.collection import Collection
+from diana.sgfParser.property import Property,DateProperty,DateException
+from diana.sgfParser.propValues import text,compose
 
 
 dataDir=os.path.join(os.path.dirname(__file__), "data")