diff --git a/src/main/java/ui/graph/AUTBlock.java b/src/main/java/graph/AUTBlock.java
similarity index 99%
rename from src/main/java/ui/graph/AUTBlock.java
rename to src/main/java/graph/AUTBlock.java
index 583de0e0c991ef4a4f33029e1492a668b0db1c93..c0ebab67e008e0296937d76965b2ffe5ee2dd6c6 100755
--- a/src/main/java/ui/graph/AUTBlock.java
+++ b/src/main/java/graph/AUTBlock.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTElement.java b/src/main/java/graph/AUTElement.java
similarity index 99%
rename from src/main/java/ui/graph/AUTElement.java
rename to src/main/java/graph/AUTElement.java
index 0b4c28d4fc7489621b48e6cdaacd281047eb65b3..e441b6068b721fc7110a03be1c478cb3e3a5f4fc 100755
--- a/src/main/java/ui/graph/AUTElement.java
+++ b/src/main/java/graph/AUTElement.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 /**
    * Class AUTElement
diff --git a/src/main/java/ui/graph/AUTGraph.java b/src/main/java/graph/AUTGraph.java
similarity index 99%
rename from src/main/java/ui/graph/AUTGraph.java
rename to src/main/java/graph/AUTGraph.java
index d0a2e458c65eb877019813da76d9efd35205010d..c48a9d14516d4d87c496af6a9bd8c78a3415ff3a 100755
--- a/src/main/java/ui/graph/AUTGraph.java
+++ b/src/main/java/graph/AUTGraph.java
@@ -37,7 +37,7 @@
  */
 
 
-package ui.graph;
+package graph;
 
 import myutil.Conversion;
 import myutil.DijkstraState;
diff --git a/src/main/java/ui/graph/AUTGraphDisplay.java b/src/main/java/graph/AUTGraphDisplay.java
similarity index 99%
rename from src/main/java/ui/graph/AUTGraphDisplay.java
rename to src/main/java/graph/AUTGraphDisplay.java
index d0d2de9a0d29bc15f30dfbf8d21c534a4800858b..2c018dae074fcaf269710d02c1727b82e2e3d6b4 100755
--- a/src/main/java/ui/graph/AUTGraphDisplay.java
+++ b/src/main/java/graph/AUTGraphDisplay.java
@@ -37,7 +37,7 @@
  */
 
 
-package ui.graph;
+package graph;
 
 import common.ConfigurationTTool;
 import common.SpecConfigTTool;
diff --git a/src/main/java/ui/graph/AUTMappingGraph.java b/src/main/java/graph/AUTMappingGraph.java
similarity index 99%
rename from src/main/java/ui/graph/AUTMappingGraph.java
rename to src/main/java/graph/AUTMappingGraph.java
index 84d993b739a8edbc808bd0e6d623b1d01b8c6bc6..f4f3c30c723979095f6f4a2526f7f030d2978dfe 100755
--- a/src/main/java/ui/graph/AUTMappingGraph.java
+++ b/src/main/java/graph/AUTMappingGraph.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 import java.awt.*;
 import java.util.ArrayList;
diff --git a/src/main/java/ui/graph/AUTPartition.java b/src/main/java/graph/AUTPartition.java
similarity index 99%
rename from src/main/java/ui/graph/AUTPartition.java
rename to src/main/java/graph/AUTPartition.java
index 1494c55a275d9c566f5615d2e06fe51a549989b8..56f684f4aec57ab902b7ee47b142fd103bc58e45 100755
--- a/src/main/java/ui/graph/AUTPartition.java
+++ b/src/main/java/graph/AUTPartition.java
@@ -37,7 +37,7 @@
  */
 
 
-package ui.graph;
+package graph;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTSplitter.java b/src/main/java/graph/AUTSplitter.java
similarity index 99%
rename from src/main/java/ui/graph/AUTSplitter.java
rename to src/main/java/graph/AUTSplitter.java
index a2c9fe6fc2aabb547daba031e9de5b682f77b543..1e6142342548a6bad0f277d76a141c0059fd0f76 100755
--- a/src/main/java/ui/graph/AUTSplitter.java
+++ b/src/main/java/graph/AUTSplitter.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/src/main/java/ui/graph/AUTState.java b/src/main/java/graph/AUTState.java
similarity index 99%
rename from src/main/java/ui/graph/AUTState.java
rename to src/main/java/graph/AUTState.java
index 57036c16569f757de4f291fab23f8b8243efea85..e8661ead8849f08d85e5c45fe0f416dccfe9d768 100755
--- a/src/main/java/ui/graph/AUTState.java
+++ b/src/main/java/graph/AUTState.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
diff --git a/src/main/java/ui/graph/AUTTransition.java b/src/main/java/graph/AUTTransition.java
similarity index 99%
rename from src/main/java/ui/graph/AUTTransition.java
rename to src/main/java/graph/AUTTransition.java
index b8caa136e4a0e071cd85f1bcc9bf4fbad4355e9e..94a233aeefc5fac59d8bcbc6bd3dde56faf457f6 100755
--- a/src/main/java/ui/graph/AUTTransition.java
+++ b/src/main/java/graph/AUTTransition.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 /**
    * Class AUTTransition
diff --git a/src/main/java/ui/graph/CorePowerConsumption.java b/src/main/java/graph/CorePowerConsumption.java
similarity index 99%
rename from src/main/java/ui/graph/CorePowerConsumption.java
rename to src/main/java/graph/CorePowerConsumption.java
index 09e92b1bc835fc55096033cf815573ed982ddbf3..9cbecf0bda22c41c2db4b0c514ee0ce29dd2f61b 100755
--- a/src/main/java/ui/graph/CorePowerConsumption.java
+++ b/src/main/java/graph/CorePowerConsumption.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 /**
 * Class CorePowerConsumption
diff --git a/src/main/java/ui/graph/RG.java b/src/main/java/graph/RG.java
similarity index 99%
rename from src/main/java/ui/graph/RG.java
rename to src/main/java/graph/RG.java
index 8857ad24ab3eaca54f7df9ee64dc53cc657ffe88..3d28cefc6519ac1fac3d05426bd2d45a1794a277 100755
--- a/src/main/java/ui/graph/RG.java
+++ b/src/main/java/graph/RG.java
@@ -37,7 +37,7 @@
  */
 
 
-package ui.graph;
+package graph;
 
 import myutil.*;
 
diff --git a/src/main/java/ui/graph/VCDGenerator.java b/src/main/java/graph/VCDGenerator.java
similarity index 99%
rename from src/main/java/ui/graph/VCDGenerator.java
rename to src/main/java/graph/VCDGenerator.java
index 78939cbe64a3305995ed0346851cb86b21930ae3..e2aca0c158d19d7715d284dabfbc5bde7c46cf97 100755
--- a/src/main/java/ui/graph/VCDGenerator.java
+++ b/src/main/java/graph/VCDGenerator.java
@@ -39,7 +39,7 @@
 
 
 
-package ui.graph;
+package graph;
 
 import myutil.FileException;
 import myutil.FileUtils;
diff --git a/src/main/java/tmatrix/Requirements.java b/src/main/java/tmatrix/Requirements.java
index 9973deee979429a257ae7b31652f15a8f9d97c02..bb8204c420b6707834a6a651f57808e8c6229b14 100755
--- a/src/main/java/tmatrix/Requirements.java
+++ b/src/main/java/tmatrix/Requirements.java
@@ -43,7 +43,7 @@
 package tmatrix;
 
 import translator.TURTLEModeling;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
 import ui.req.Requirement;
 import ui.req.RequirementObserver;
 
diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 01a9f89601bdcd14a1aebb98b9a2bd4812bfceb8..8f6efb92ac2ea586dc938c41987754fea095dd68 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -103,7 +103,7 @@ import ui.dd.TDeploymentDiagramPanel;
 import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
 import ui.ftd.FaultTreeDiagramPanel;
-import ui.graph.RG;
+import graph.RG;
 import ui.het.CAMSBlockDiagramPanel;
 import ui.iod.InteractionOverviewDiagramPanel;
 import ui.ncdd.NCDiagramPanel;
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index c20566797d72b05df3434faa16aa37f23abb44f0..f9fd36a4998e385e824fd0204a5adc359d3430cd 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -68,8 +68,8 @@ import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
 import ui.file.*;
 import ui.ftd.FaultTreeDiagramPanel;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
 import ui.het.CAMSBlockDiagramPanel;
 import ui.interactivesimulation.JFrameInteractiveSimulation;
 import ui.interactivesimulation.SimulationTransaction;
diff --git a/src/main/java/ui/ThreadGUIElement.java b/src/main/java/ui/ThreadGUIElement.java
index 465d27634cebe55d52b62ed9e12da145bb094b40..0aea14de0588419109385dee778147db654ea1f5 100755
--- a/src/main/java/ui/ThreadGUIElement.java
+++ b/src/main/java/ui/ThreadGUIElement.java
@@ -45,8 +45,8 @@ package ui;
 import myutil.ExternalCall;
 import myutil.GraphicLib;
 import myutil.TraceManager;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
 import ui.util.IconManager;
 import ui.window.JDialogCancel;
 import ui.window.JFrameStatistics;
diff --git a/src/main/java/ui/tree/DiagramTreeRenderer.java b/src/main/java/ui/tree/DiagramTreeRenderer.java
index 283beed298474a6999f713603e91501bf1aec510..35223ee58a4c9f1d51b27cbe8cfde4c2976739d5 100755
--- a/src/main/java/ui/tree/DiagramTreeRenderer.java
+++ b/src/main/java/ui/tree/DiagramTreeRenderer.java
@@ -60,7 +60,7 @@ import ui.cd.TClassDiagramPanel;
 import ui.dd.TDeploymentDiagramPanel;
 import ui.diplodocusmethodology.DiplodocusMethodologyDiagramPanel;
 import ui.ebrdd.EBRDDPanel;
-import ui.graph.RG;
+import graph.RG;
 import ui.iod.InteractionOverviewDiagramPanel;
 import ui.ncdd.NCDiagramPanel;
 import ui.osad.TURTLEOSActivityDiagramPanel;
diff --git a/src/main/java/ui/tree/GraphTree.java b/src/main/java/ui/tree/GraphTree.java
index a45581867f12a0a630629b1257b10bca9bbdb3e8..b447817351d149b0ec91f2965017372d0ba91474 100755
--- a/src/main/java/ui/tree/GraphTree.java
+++ b/src/main/java/ui/tree/GraphTree.java
@@ -43,7 +43,7 @@ package ui.tree;
 
 import myutil.GenericTree;
 import ui.MainGUI;
-import ui.graph.RG;
+import graph.RG;
 
 import java.util.List;
 
diff --git a/src/main/java/ui/tree/JDiagramTree.java b/src/main/java/ui/tree/JDiagramTree.java
index 3d964908a797d58d28946aa15b82d9cf496245fb..53ca2e22c77f55c19f226d55a59c9fe37214eadf 100755
--- a/src/main/java/ui/tree/JDiagramTree.java
+++ b/src/main/java/ui/tree/JDiagramTree.java
@@ -44,7 +44,7 @@ package ui.tree;
 import translator.CheckingError;
 import tmltranslator.TMLCheckingError;
 import ui.*;
-import ui.graph.RG;
+import graph.RG;
 import myutil.*;
 
 import javax.swing.*;
diff --git a/src/main/java/ui/window/DeadlockTableModel.java b/src/main/java/ui/window/DeadlockTableModel.java
index a56b9ae47d4e270ab4b8685801cf922f18542528..84a7a6819b41b86ca417ce72b9ef34f9b9c29daf 100755
--- a/src/main/java/ui/window/DeadlockTableModel.java
+++ b/src/main/java/ui/window/DeadlockTableModel.java
@@ -43,8 +43,8 @@ package ui.window;
 
 import myutil.DijkstraState;
 import myutil.GraphAlgorithms;
-import ui.graph.AUTGraph;
-import ui.graph.AUTTransition;
+import graph.AUTGraph;
+import graph.AUTTransition;
 
 import javax.swing.table.AbstractTableModel;
 import java.util.Collections;
diff --git a/src/main/java/ui/window/JDialogAvatarModelChecker.java b/src/main/java/ui/window/JDialogAvatarModelChecker.java
index 285e898807d92faac7de8d7c2f4bb66e73aa6a66..1ccb7b7aef0c1db184adc08ba16dbe9a885336e6 100644
--- a/src/main/java/ui/window/JDialogAvatarModelChecker.java
+++ b/src/main/java/ui/window/JDialogAvatarModelChecker.java
@@ -48,7 +48,7 @@ import myutil.*;
 import ui.util.IconManager;
 import ui.MainGUI;
 import ui.TGComponent;
-import ui.graph.RG;
+import graph.RG;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ui/window/JDialogGraphModification.java b/src/main/java/ui/window/JDialogGraphModification.java
index 3c85a4916d23b9a29d2a0552b9f924449bba0548..ea7777b750fab405360b2d16f997efcdc9959a35 100755
--- a/src/main/java/ui/window/JDialogGraphModification.java
+++ b/src/main/java/ui/window/JDialogGraphModification.java
@@ -48,7 +48,7 @@ import myutil.ScrolledJTextArea;
 import common.SpecConfigTTool;
 import ui.util.IconManager;
 import ui.file.AUTFileFilter;
-import ui.graph.AUTMappingGraph;
+import graph.AUTMappingGraph;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ui/window/JFrameDeadlock.java b/src/main/java/ui/window/JFrameDeadlock.java
index 7ab32fc6b3024c728fb6d7c229b9779fa04a0c3d..4df0481621183121b9b142730e0fc4a91519c222 100755
--- a/src/main/java/ui/window/JFrameDeadlock.java
+++ b/src/main/java/ui/window/JFrameDeadlock.java
@@ -46,7 +46,7 @@ package ui.window;
 import myutil.TableSorter;
 import ui.FormatManager;
 import ui.util.IconManager;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
 
 import javax.swing.*;
 import javax.swing.table.AbstractTableModel;
diff --git a/src/main/java/ui/window/JFrameMinimize.java b/src/main/java/ui/window/JFrameMinimize.java
index 3cc73fabeaee332a1a6ad2977f42099f0d5445e1..a2f07000a7f647690a61aa1f19bc578d22d478e8 100755
--- a/src/main/java/ui/window/JFrameMinimize.java
+++ b/src/main/java/ui/window/JFrameMinimize.java
@@ -44,8 +44,8 @@ import myutil.FileException;
 import myutil.FileUtils;
 import myutil.ScrolledJTextArea;
 import ui.MainGUI;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
 import ui.util.IconManager;
 
 import javax.swing.*;
diff --git a/src/main/java/ui/window/JFramePowerManagementAnalysis.java b/src/main/java/ui/window/JFramePowerManagementAnalysis.java
index ed1c1b57cf28ec586ad9c8f8c2ca6cda25bafe11..20686ea40e8e1504e6632d46f2cd081a6292c2a8 100755
--- a/src/main/java/ui/window/JFramePowerManagementAnalysis.java
+++ b/src/main/java/ui/window/JFramePowerManagementAnalysis.java
@@ -49,8 +49,8 @@ import common.SpecConfigTTool;
 import ui.FormatManager;
 import ui.util.IconManager;
 import ui.StoppableGUIElement;
-import ui.graph.AUTGraph;
-import ui.graph.VCDGenerator;
+import graph.AUTGraph;
+import graph.VCDGenerator;
 
 import javax.swing.*;
 import java.awt.*;
diff --git a/src/main/java/ui/window/JFrameRefusalGraph.java b/src/main/java/ui/window/JFrameRefusalGraph.java
index 2d962b614926b557d178c3d12de1e99a4ebd1f56..eb116475318e297309ca0a4bf9879c8586dbda0d 100755
--- a/src/main/java/ui/window/JFrameRefusalGraph.java
+++ b/src/main/java/ui/window/JFrameRefusalGraph.java
@@ -45,8 +45,8 @@ import myutil.FileUtils;
 import myutil.ScrolledJTextArea;
 import ui.util.IconManager;
 import ui.MainGUI;
-import ui.graph.AUTGraph;
-import ui.graph.RG;
+import graph.AUTGraph;
+import graph.RG;
 
 import javax.swing.*;
 import javax.swing.event.ListSelectionEvent;
diff --git a/src/main/java/ui/window/JFrameStatistics.java b/src/main/java/ui/window/JFrameStatistics.java
index a19ee81a7ebf87fb7d532f0440311c805e37715e..ba75785937848ca9add01e0dd94cf7ed83a114e1 100755
--- a/src/main/java/ui/window/JFrameStatistics.java
+++ b/src/main/java/ui/window/JFrameStatistics.java
@@ -50,7 +50,7 @@ import ui.util.IconManager;
 import ui.StoppableGUIElement;
 import ui.ThreadGUIElement;
 import ui.file.AUTFileFilter;
-import ui.graph.AUTGraph;
+import graph.AUTGraph;
 
 import javax.swing.*;
 import javax.swing.table.AbstractTableModel;
diff --git a/src/main/java/ui/window/StatisticsTableModel.java b/src/main/java/ui/window/StatisticsTableModel.java
index 9da3089d367cd5f7f54deac55480c6e95ec487dc..2ed4b3a1bb8c92eb22d0befd07b64cf3f2bdd525 100755
--- a/src/main/java/ui/window/StatisticsTableModel.java
+++ b/src/main/java/ui/window/StatisticsTableModel.java
@@ -42,9 +42,9 @@
 package ui.window;
 
 import myutil.SteppedAlgorithm;
-import ui.graph.AUTGraph;
-import ui.graph.AUTTransition;
+import graph.AUTGraph;
 
+import graph.AUTTransition;
 import javax.swing.table.AbstractTableModel;
 import java.io.BufferedReader;
 import java.io.StringReader;
diff --git a/ttool/src/test/java/ui/graph/AUTGraphTest.java b/ttool/src/test/java/ui/graph/AUTGraphTest.java
index 4ea6b29b1eda76f2806634c0b1c97d8ab678523b..9cf3154c48eec874ab2779788bc1993158357722 100755
--- a/ttool/src/test/java/ui/graph/AUTGraphTest.java
+++ b/ttool/src/test/java/ui/graph/AUTGraphTest.java
@@ -35,7 +35,7 @@ same conditions as regards security.
 The fact that you are presently reading this means that you have had
 knowledge of the CeCILL license and that you accept its terms.
  */
-package ui.graph;
+package graph;
 
 import org.junit.Test;