diff --git a/src/app/App.java b/src/app/App.java
index f652d66..34c91ff 100644
--- a/src/app/App.java
+++ b/src/app/App.java
@@ -4,20 +4,12 @@ import org.manzerbredes.open_klm.args.ArgsManager;
 import org.manzerbredes.open_klm.client.MainWindow;
 import org.manzerbredes.open_klm.drivers.*;
 
-
-
 /**
- * Open KLM Application
+ * Hello world!
  *
  */
 public class App 
 {
-	
-	/**
-	 * Entry point
-	 * 
-	 * @param args
-	 */
     public static void main( String[] args ) 
     {
     	// Get driver
@@ -33,7 +25,7 @@ public class App
     		
     		// Else run GUI
     		try {
-				new MainWindow(aDriver);
+				MainWindow mw = new MainWindow(aDriver);
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
diff --git a/src/args/ArgsManager.java b/src/args/ArgsManager.java
index f43edde..332553c 100644
--- a/src/args/ArgsManager.java
+++ b/src/args/ArgsManager.java
@@ -1,7 +1,8 @@
 package org.manzerbredes.open_klm.args;
 
 import org.manzerbredes.open_klm.drivers.Driver;
-
+import org.manzerbredes.open_klm.drivers.DriverTypeA;
+import org.manzerbredes.open_klm.drivers.Driver_1770_ff00;
 
 /**
  * 
diff --git a/src/client/DriverJPanel.java b/src/client/DriverJPanel.java
deleted file mode 100644
index a88af43..0000000
--- a/src/client/DriverJPanel.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.manzerbredes.open_klm.client;
-
-import org.manzerbredes.open_klm.drivers.Driver;
-
-/**
- * JPanel for a specific driver. Each panel who manage
- * a driver must implement this interface.
- * 
- * @author Manzerbredes
- *
- */
-public interface DriverJPanel{
-	
-	
-	/**
-	 * Get the type of driver handled by the JPanel
-	 * 
-	 * @return class Class that represent the type of the driver the JPanel handle
-	 */
-	public Class<?> getType();
-	
-	/**
-	 * 
-	 * Init the JPanel with a driver (driver must have the correct type)
-	 * 
-	 * @param driver The driver to manage
-	 * @return True if success to init, False else
-	 */
-	public boolean initUI(Driver driver);
-}
\ No newline at end of file
diff --git a/src/client/GUI.java b/src/client/GUI.java
new file mode 100644
index 0000000..8c561ee
--- /dev/null
+++ b/src/client/GUI.java
@@ -0,0 +1,22 @@
+package org.manzerbredes.open_klm.client;
+
+import org.manzerbredes.open_klm.drivers.Driver;
+
+public interface GUI{
+	
+	/**
+	 * Get the type of driver the GUI handle
+	 * 
+	 * @return class that represent the type of the driver the GUI handle
+	 */
+	public Class<?> getType();
+	
+	/**
+	 * 
+	 * Init the GUI with driver
+	 * 
+	 * @param driver
+	 * @return
+	 */
+	public boolean initGUI(Driver driver);
+}
\ No newline at end of file
diff --git a/src/client/JPanelTypeA.java b/src/client/GUITypeA.java
similarity index 94%
rename from src/client/JPanelTypeA.java
rename to src/client/GUITypeA.java
index 15c9800..dcca028 100644
--- a/src/client/JPanelTypeA.java
+++ b/src/client/GUITypeA.java
@@ -15,7 +15,7 @@ import org.manzerbredes.open_klm.drivers.DriverTypeA.Color;
 import org.manzerbredes.open_klm.drivers.DriverTypeA.Intensity;
 import org.manzerbredes.open_klm.drivers.DriverTypeA.Region;
 
-public class JPanelTypeA extends JPanel implements DriverJPanel{
+public class GUITypeA extends JPanel implements GUI{
 	
 	
 	private JComboBox<Color> left;
@@ -25,7 +25,7 @@ public class JPanelTypeA extends JPanel implements DriverJPanel{
 	private DriverTypeA keyboardTypeA;
 
 	@Override
-	public boolean initUI(Driver driver){
+	public boolean initGUI(Driver driver){
 		
 		if(driver.getType().equals(DriverTypeA.class)){
 			
diff --git a/src/client/MainWindow.java b/src/client/MainWindow.java
index f3fbf63..f42ecef 100644
--- a/src/client/MainWindow.java
+++ b/src/client/MainWindow.java
@@ -1,51 +1,43 @@
 package org.manzerbredes.open_klm.client;
 
+import java.awt.EventQueue;
+import java.awt.GridLayout;
+import java.awt.Label;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
 
-import javax.swing.*;
 import org.manzerbredes.open_klm.drivers.*;
+import org.manzerbredes.open_klm.drivers.DriverTypeA.*;
 
 
-/**
- * Main Window
- * 
- * @author Manzerbredes
- *
- */
 public class MainWindow extends JFrame {
 	
 
-	/**
-	 * Define serial Version UID
-	 */
-	private static final long serialVersionUID = 8058826286308946977L;
 	
-	
-	/**
-	 * Contain all JPanel corresponding to each driver type
-	 */
-	private Class<?>[] driverJPanels={
-			JPanelTypeA.class
+	private Class<?>[] availableGUI={
+			GUITypeA.class
 	};
 	
-	
-	/**
-	 * Build a main window
-	 * @param aDriver
-	 */
 	public MainWindow(Driver aDriver){
-		// Configure main window
-		this.initUI();
+		// Configure MainWindow
+		this.setTitle("Open KLM");
+		this.setSize(700, 500);
+        setLocationRelativeTo(null);
+        setDefaultCloseOperation(EXIT_ON_CLOSE);
 	
-        // Add driver panel
-        for(int i=0;i<this.driverJPanels.length;i++){
+        
+        for(int i=0;i<this.availableGUI.length;i++){
         	try {
-        		// Build a panel
-				DriverJPanel driverJPanel=(DriverJPanel) driverJPanels[i].newInstance();
-				// If the panel have the same type of the driver try to init it
-				if(driverJPanel.getType().equals(aDriver.getType())){
-					// If init success add it to the main window
-					if(driverJPanel.initUI(aDriver)){
-						this.add((JPanel) driverJPanel);
+				GUI gui=(GUI) availableGUI[i].newInstance();
+				if(gui.getType().equals(aDriver.getType())){
+					if(gui.initGUI(aDriver)){
+						this.add((JPanel) gui);
 					}
 				}
 				
@@ -54,21 +46,9 @@ public class MainWindow extends JFrame {
 			}
         }
         
-        // Display the main window
+        
 		this.setVisible(true);
 	}
-	
-	
-	/**
-	 * Configure main window
-	 */
-	private void initUI(){
-		// Configure MainWindow
-		this.setTitle("Open KLM");
-		this.setSize(700, 500);
-        setLocationRelativeTo(null);
-        setDefaultCloseOperation(EXIT_ON_CLOSE);
-	}
 
 	
 }
\ No newline at end of file