diff --git a/src/P2P_JAVA_PROJECT_SERVER/bonjour b/src/P2P_JAVA_PROJECT_SERVER/bonjour
new file mode 100644
index 0000000..1cd909e
--- /dev/null
+++ b/src/P2P_JAVA_PROJECT_SERVER/bonjour
@@ -0,0 +1 @@
+bonjour
diff --git a/src/clientP2P/ClientManagementUDP.class b/src/clientP2P/ClientManagementUDP.class
index e4928ec..de712c0 100644
Binary files a/src/clientP2P/ClientManagementUDP.class and b/src/clientP2P/ClientManagementUDP.class differ
diff --git a/src/clientP2P/ClientManagementUDP.java b/src/clientP2P/ClientManagementUDP.java
index 63d4374..3cd83c3 100644
--- a/src/clientP2P/ClientManagementUDP.java
+++ b/src/clientP2P/ClientManagementUDP.java
@@ -125,7 +125,7 @@ public class ClientManagementUDP implements Runnable {
 	 * @throws	ProtocolError
 	 */
 	private void checkProtocolID(String msgProtocolID) throws ProtocolError {
-		if (protocolID != msgProtocolID) {
+		if (!protocolID.equals(msgProtocolID)) {
 			throw new ProtocolError();
 		}
 	}
@@ -143,8 +143,11 @@ public class ClientManagementUDP implements Runnable {
 			DatagramPacket reception = new DatagramPacket(buffer, buffer.length);
 			DatagramPacket emission = new DatagramPacket(buffer, buffer.length, dst, UDPPort);
 			socket.send(emission);
+			System.out.print(msg);
 			socket.receive(reception);
-			return new String(reception.getData(), 0, reception.getLength());
+			String tmp = new String(reception.getData(), 0, reception.getLength());
+			System.out.print(tmp);
+			return tmp;
 		} catch (Exception e){
 			throw new TransmissionError();
 		}
diff --git a/src/clientP2P/ClientP2P.class b/src/clientP2P/ClientP2P.class
index c0f85c6..bec0ac8 100644
Binary files a/src/clientP2P/ClientP2P.class and b/src/clientP2P/ClientP2P.class differ
diff --git a/src/clientP2P/ClientP2P.java b/src/clientP2P/ClientP2P.java
index e1a32c5..862b2d6 100644
--- a/src/clientP2P/ClientP2P.java
+++ b/src/clientP2P/ClientP2P.java
@@ -26,9 +26,10 @@ public class ClientP2P {
 		} else {
 			d = ".";
 		}
-		d += "P2P_JAVA_PROJECT_CLIENT/";
+		d += "/P2P_JAVA_PROJECT_CLIENT/";
 		// create directory if not already exists
 		new File(d).mkdirs();
+		directory = d;
 	}
 
 	public static void main(String [] args) {
diff --git a/src/serverP2P/ServerManagementUDP.class b/src/serverP2P/ServerManagementUDP.class
index da550c6..bf2411c 100644
Binary files a/src/serverP2P/ServerManagementUDP.class and b/src/serverP2P/ServerManagementUDP.class differ
diff --git a/src/serverP2P/ServerManagementUDP.java b/src/serverP2P/ServerManagementUDP.java
index 2eddedc..6397248 100644
--- a/src/serverP2P/ServerManagementUDP.java
+++ b/src/serverP2P/ServerManagementUDP.java
@@ -67,13 +67,16 @@ public class ServerManagementUDP implements Runnable {
 	 * @return	data to be send as response
 	 */
 	String processRequest(String request) {
+		System.out.print(request);
 		String res = protocolID + "\n";
 		String formattedRequest[] = request.split("\n");
 		try {
 			try {
 				checkProtocolID(formattedRequest[0]);
+				System.out.print("juste avant le switch");
 				switch (formattedRequest[1]) {
 					case "LIST":
+						System.out.print("liste detectee");
 						res += sendFileList();
 						break;
 					case "DOWNLOAD":
@@ -99,12 +102,13 @@ public class ServerManagementUDP implements Runnable {
 	/** Initialize local list of all files allowed to be shared.
 	 */
 	private void initFileList() {
+		System.out.println(baseDirectory);
 		File folder = new File(baseDirectory);
 		File[] files = folder.listFiles();
 		/* Add non-recursively files's names to fileList */
-		for (int i = 0; i < files.length; i++) {
-			if (files[i].isFile()) {
-				fileList.add(files[i].getName());
+		for (File f : files) {
+			if (f.isFile()) {
+				fileList.add(f.getName());
 			}
 		}
 	}
@@ -115,7 +119,8 @@ public class ServerManagementUDP implements Runnable {
 	 * @throws	ProtocolError
 	 */
 	private void checkProtocolID(String msgProtocolID) throws ProtocolError {
-		if (protocolID != msgProtocolID) {
+		System.out.print(msgProtocolID + "\n" + protocolID);
+		if (!protocolID.equals(msgProtocolID)) {
 			throw new ProtocolError();
 		}
 	}
@@ -146,9 +151,9 @@ public class ServerManagementUDP implements Runnable {
 	private String sendFileList() {
 		String res = "LIST\n";
 		for (String f : fileList) {
-			res += (f + '\n');
+			res += (f + "\n");
 		}
-		return res + '\n';
+		return res + "\n";
 	}
 
 	/** Prepare data to be send if protocol error is detected
diff --git a/src/serverP2P/ServerP2P.class b/src/serverP2P/ServerP2P.class
index aa96009..d2f34a8 100644
Binary files a/src/serverP2P/ServerP2P.class and b/src/serverP2P/ServerP2P.class differ
diff --git a/src/serverP2P/ServerP2P.java b/src/serverP2P/ServerP2P.java
index 33338e3..5517180 100644
--- a/src/serverP2P/ServerP2P.java
+++ b/src/serverP2P/ServerP2P.java
@@ -24,9 +24,10 @@ public class ServerP2P {
 		} else {
 			d = ".";
 		}
-		d += "P2P_JAVA_PROJECT_SERVER/";
+		d += "/P2P_JAVA_PROJECT_SERVER/";
 		// create directory if not already exists
 		new File(d).mkdirs();
+		directory = d;
 	}
 	public static void main(String [] args) {
 		ServerP2P s = new ServerP2P();