diff --git a/relational/__init__.py b/relational/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/optimizer.py b/relational/optimizer.py
similarity index 100%
rename from optimizer.py
rename to relational/optimizer.py
diff --git a/parser.py b/relational/parser.py
similarity index 100%
rename from parser.py
rename to relational/parser.py
diff --git a/relation.py b/relational/relation.py
similarity index 100%
rename from relation.py
rename to relational/relation.py
diff --git a/rtypes.py b/relational/rtypes.py
similarity index 100%
rename from rtypes.py
rename to relational/rtypes.py
diff --git a/relational.py b/relational_gui.py
old mode 100755
new mode 100644
similarity index 91%
rename from relational.py
rename to relational_gui.py
index 66d18a5..7cd5f60
--- a/relational.py
+++ b/relational_gui.py
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 # coding=UTF-8
 # Relational
 # Copyright (C) 2008  Salvo "LtWorf" Tomaselli
@@ -20,9 +21,8 @@
 
 import sys
 from PyQt4 import QtCore, QtGui
-import parser
-import relation
-import maingui
+from relational_gui import maingui
+from relational import relation, parser
 
 version="0.9"
 
diff --git a/relational_gui/__init__.py b/relational_gui/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/about.py b/relational_gui/about.py
similarity index 100%
rename from about.py
rename to relational_gui/about.py
diff --git a/maingui.py b/relational_gui/maingui.py
similarity index 99%
rename from maingui.py
rename to relational_gui/maingui.py
index a6be497..0e81683 100644
--- a/maingui.py
+++ b/relational_gui/maingui.py
@@ -18,8 +18,6 @@
 # author Salvo "LtWorf" Tomaselli <tiposchi@tiscali.it>
 from PyQt4 import QtCore, QtGui
 
-import relation
-import parser
 import sys
 import about
 import survey
diff --git a/survey.py b/relational_gui/survey.py
similarity index 100%
rename from survey.py
rename to relational_gui/survey.py
diff --git a/survey.ui b/relational_gui/survey.ui
similarity index 100%
rename from survey.ui
rename to relational_gui/survey.ui
diff --git a/surveyForm.py b/relational_gui/surveyForm.py
similarity index 100%
rename from surveyForm.py
rename to relational_gui/surveyForm.py