diff --git a/src/diana/diana.py b/src/diana.py
rename from src/diana/diana.py
rename to src/diana.py
--- a/src/diana/diana.py
+++ b/src/diana.py
@@ -2,8 +2,8 @@
 import re
 import sys
 
+import go
 import sgf
-import go
 
 if len(sys.argv)>1:
 	files=sys.argv[1:]
@@ -130,7 +130,7 @@ class Tikz:
 def processFile(fileName):
 	shortName="".join(re.split(r'[/\\]',fileName)[-1].split('.')[:-1])
 	
-	game=go.Go()
+	game= go.Go()
 	global t
 	
 	record= sgf.Sgf(open(fileName, 'r', encoding="utf-8").read())
diff --git a/src/diana/__init__.py b/src/diana/__init__.py
deleted file mode 100755
diff --git a/src/diana/go.py b/src/go.py
rename from src/diana/go.py
rename to src/go.py
diff --git a/src/diana/sgf.py b/src/sgf.py
rename from src/diana/sgf.py
rename to src/sgf.py
diff --git a/src/diana/sgfParser.py b/src/sgfParser.py
rename from src/diana/sgfParser.py
rename to src/sgfParser.py
diff --git a/src/diana/tests/__init__.py b/src/tests/__init__.py
rename from src/diana/tests/__init__.py
rename to src/tests/__init__.py
diff --git a/src/diana/tests/data/kogos.sgf b/src/tests/data/kogos.sgf
rename from src/diana/tests/data/kogos.sgf
rename to src/tests/data/kogos.sgf
diff --git a/src/diana/tests/data/simple.sgf b/src/tests/data/simple.sgf
rename from src/diana/tests/data/simple.sgf
rename to src/tests/data/simple.sgf
diff --git a/src/diana/tests/sgfParser.py b/src/tests/testSgfParser.py
rename from src/diana/tests/sgfParser.py
rename to src/tests/testSgfParser.py