diff --git a/fluents b/bin/fluents
similarity index 100%
rename from fluents
rename to bin/fluents
diff --git a/system/__init__.py b/fluents/__init__.py
similarity index 100%
rename from system/__init__.py
rename to fluents/__init__.py
diff --git a/system/dataset.py b/fluents/dataset.py
similarity index 100%
rename from system/dataset.py
rename to fluents/dataset.py
diff --git a/system/dialogs.py b/fluents/dialogs.py
similarity index 96%
rename from system/dialogs.py
rename to fluents/dialogs.py
index b09a11e..8250755 100644
--- a/system/dialogs.py
+++ b/fluents/dialogs.py
@@ -4,10 +4,10 @@ import gtk
 import sys
 import os
 import gobject
-from system import logger, project, workflow
+import logger, project, workflow
 import workflows
 
-DATADIR = os.path.dirname(sys.modules['system'].__file__)
+DATADIR = os.path.dirname(sys.modules['fluents'].__file__)
 GLADEFILENAME = os.path.join(DATADIR, 'fluents.glade')
 
 class CreateProjectDruid(gtk.Window):
diff --git a/system/fluents.glade b/fluents/fluents.glade
similarity index 100%
rename from system/fluents.glade
rename to fluents/fluents.glade
diff --git a/system/fluents.py b/fluents/fluents.py
similarity index 100%
rename from system/fluents.py
rename to fluents/fluents.py
diff --git a/system/logger.py b/fluents/logger.py
similarity index 100%
rename from system/logger.py
rename to fluents/logger.py
diff --git a/system/navigator.py b/fluents/navigator.py
similarity index 100%
rename from system/navigator.py
rename to fluents/navigator.py
diff --git a/system/plots.py b/fluents/plots.py
similarity index 100%
rename from system/plots.py
rename to fluents/plots.py
diff --git a/system/project.py b/fluents/project.py
similarity index 100%
rename from system/project.py
rename to fluents/project.py
diff --git a/system/selections.py b/fluents/selections.py
similarity index 100%
rename from system/selections.py
rename to fluents/selections.py
diff --git a/system/workflow.py b/fluents/workflow.py
similarity index 100%
rename from system/workflow.py
rename to fluents/workflow.py