diff --git a/src/main/java/ui/GTURTLEModeling.java b/src/main/java/ui/GTURTLEModeling.java
index 47e33aef815848cbf96f668161a70750245c9194..886ec68137328ddad5e873f946216fbf86cea070 100755
--- a/src/main/java/ui/GTURTLEModeling.java
+++ b/src/main/java/ui/GTURTLEModeling.java
@@ -486,15 +486,15 @@ public class GTURTLEModeling {
         CCode.toTextFormat();
         
         try {
-            if( SpecConfigTTool.CCodeDirectory.equals("") )  {
+            if( directory.equals("") )  {
                 JOptionPane.showMessageDialog(  mgui.frame,
                                                 "No directory for C code generation found in config.xml. The C code cannot be generated.",
                                                 "Control code generation failed", JOptionPane.INFORMATION_MESSAGE );
                 return true;
             }
             else {
-            	FileUtils.checkAndCreateCCodeDir(SpecConfigTTool.CCodeDirectory);
-                CCode.saveFile( SpecConfigTTool.CCodeDirectory + File.separator, applicationName );
+            	FileUtils.checkAndCreateCCodeDir(directory);
+                CCode.saveFile( directory + File.separator, applicationName );
             }
         }
         catch( Exception e ) {
diff --git a/src/main/java/ui/MainGUI.java b/src/main/java/ui/MainGUI.java
index e08dde55473a4467cd8bb2286d9afbdf9d8a2932..88b27cc164df5d2f5430e944aeffd8b67ff0c1e5 100644
--- a/src/main/java/ui/MainGUI.java
+++ b/src/main/java/ui/MainGUI.java
@@ -4330,7 +4330,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
             adp = (AvatarDesignPanel) tp;
 			limit=false;
 		}
-        JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, SpecConfigTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath, adp,limit);
+        JDialogProverifVerification jgen = new JDialogProverifVerification(frame, this, "Security verification with ProVerif", ConfigurationTTool.ProVerifVerifierHost, SpecConfigTTool.ProVerifCodeDirectory, ConfigurationTTool.ProVerifVerifierPath, adp,limit, gtm.getCPUTaskMap());
         // jgen.setSize(500, 450);
         GraphicLib.centerOnParent(jgen, 600, 800);
         jgen.setVisible(true);
@@ -4339,7 +4339,7 @@ public  class MainGUI implements ActionListener, WindowListener, KeyListener, Pe
 
     public void dse(){
         TraceManager.addDev("Design space exploration");
-        JDialogDSE jdse= new JDialogDSE(frame, this, "Design Space Exploration", SpecConfigTTool.SystemCCodeDirectory, SpecConfigTTool.TMLCodeDirectory, gtm.getCPUTaskMap());
+        JDialogDSE jdse= new JDialogDSE(frame, this, "Design Space Exploration", SpecConfigTTool.SystemCCodeDirectory, SpecConfigTTool.TMLCodeDirectory);
         //   jdse.setSize(600,800);
         GraphicLib.centerOnParent(jdse, 600,800);
         jdse.setVisible(true);
diff --git a/src/main/java/ui/TGUIAction.java b/src/main/java/ui/TGUIAction.java
index 5472a921f62297f72a440d47ff639d0185b82487..1d0fbefde1a372cc389d981b9dda87fb68a104fe 100755
--- a/src/main/java/ui/TGUIAction.java
+++ b/src/main/java/ui/TGUIAction.java
@@ -67,7 +67,7 @@ public class TGUIAction extends AbstractAction {
 
     // Actions
     public static final int ACT_NEW = 0;
-    public static final int ACT_NEW_PROJECT = 464;
+    public static final int ACT_NEW_PROJECT = 465;
     public static final int ACT_NEW_DESIGN = 100;
     public static final int ACT_NEW_ANALYSIS = 101;
     public static final int ACT_OPEN = 1;
@@ -620,7 +620,7 @@ public class TGUIAction extends AbstractAction {
     public static final int MOVE_ENABLED = 463;
     public static final int FIRST_DIAGRAM = 464;
     
-    public static final int NB_ACTION = 465;
+    public static final int NB_ACTION = 466;
 
     private static final TAction [] actions = new TAction[NB_ACTION];
 
diff --git a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
index 6a372b47ab97cfec41827cf1e51c0b1971cff811..a637c9fe3070d2ef8889fb4f579e27db7d958ed9 100644
--- a/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
+++ b/src/main/java/ui/networkmodelloader/JDialogLoadingNetworkModel.java
@@ -314,7 +314,6 @@ public class JDialogLoadingNetworkModel extends javax.swing.JFrame implements Ac
                 // Wait 5seconds before refreshing panel
                 Thread.sleep(5000);
                 panel.repaint();
-            }
 
         } catch (Exception e) {
             jta.append("Error when retreiving file: " + url + "\n No internet connection?\n No right for the Java Virtual Machine to use http connections?\n\n");
diff --git a/ttool/src/test/java/launcher/TestRshClient.java b/ttool/src/test/java/launcher/TestRshClient.java
index 4a3dc390b00eff595e49db5c2802d237577773e4..a6ab1e75a866c58b0bdf7609523e570311a6502f 100644
--- a/ttool/src/test/java/launcher/TestRshClient.java
+++ b/ttool/src/test/java/launcher/TestRshClient.java
@@ -24,9 +24,9 @@ public class TestRshClient {
 
     private static final String EXPECTED_COMMAND_OUTPUT = "!!!Hello World!!!" + System.lineSeparator();
     private static final String TEST_PROGRAM_NAME = "helloWorld";
-    private static final String TEST_COMMAND = "./resources/test/launcher/" + TEST_PROGRAM_NAME;
-    private static final String TEST_COMMAND_NON_STOP = "./resources/test//launcher/helloWorldNonStop";
-    private static final String TEST_FILE_NAME = "./resources/test/launcher/test.txt";
+    private static final String TEST_COMMAND = "./resources/launcher/" + TEST_PROGRAM_NAME;
+    private static final String TEST_COMMAND_NON_STOP = "./resources/launcher/helloWorldNonStop";
+    private static final String TEST_FILE_NAME = "./resources/launcher/test.txt";
     private static final String TEST_FILE_DATA = "testDatafhkenomrcg ,jgh o";
 
 
diff --git a/ttool/src/test/java/ui/TestGTURTLEModeling.java b/ttool/src/test/java/ui/TestGTURTLEModeling.java
index e9c8e40823c74bb96c0d5c1559f4e526556b852c..1f8f184c7367fc486fdff092f0b6d6c5d4d0385a 100644
--- a/ttool/src/test/java/ui/TestGTURTLEModeling.java
+++ b/ttool/src/test/java/ui/TestGTURTLEModeling.java
@@ -16,7 +16,7 @@ import myutil.FileUtils;
 
 public class TestGTURTLEModeling extends AbstractUITest {
 	
-	private static final String RESOURCES_DIR = "resources/test/ui/generateccode/";
+	private static final String RESOURCES_DIR = "resources/ui/generateccode/";
 	
 	private final IComparator textComparator;