diff --git a/src/Message.java b/src/chat/Message.java
similarity index 91%
rename from src/Message.java
rename to src/chat/Message.java
index 1f49f15..f8edf8a 100644
--- a/src/Message.java
+++ b/src/chat/Message.java
@@ -1,3 +1,4 @@
+package chat;
 public class Message {
 
 
diff --git a/src/User.java b/src/chat/User.java
similarity index 92%
rename from src/User.java
rename to src/chat/User.java
index 3ca6510..7165cf6 100644
--- a/src/User.java
+++ b/src/chat/User.java
@@ -1,3 +1,4 @@
+package chat;
 
 public class User {
 
diff --git a/src/chat/socket_client.class b/src/chat/socket_client.class
new file mode 100644
index 0000000..6ad3586
Binary files /dev/null and b/src/chat/socket_client.class differ
diff --git a/src/chat/socket_client.java b/src/chat/socket_client.java
index fb31fe4..07186e4 100644
--- a/src/chat/socket_client.java
+++ b/src/chat/socket_client.java
@@ -1,4 +1,4 @@
-package chat;
+//package chat;
 import java.net.*;
 
 import java.io.BufferedReader;
diff --git a/src/chat/socket_server.class b/src/chat/socket_server.class
new file mode 100644
index 0000000..294f771
Binary files /dev/null and b/src/chat/socket_server.class differ
diff --git a/src/chat/socket_server.java b/src/chat/socket_server.java
index d6b1415..cdda7b3 100644
--- a/src/chat/socket_server.java
+++ b/src/chat/socket_server.java
@@ -1,31 +1,37 @@
-package chat; 
+//package chat; 
 import java.net.*;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Date;
 
-public class mySocketClient {
-    public static void main (String [] args)
+public class socket_server {
+	public static void main (String [] args)
     {
         try
         {
-            System.out.println("Connecting to server...");
-            Socket link = new Socket("192.168.1.54", 1234);
-            System.out.println("Establishing I/O streams...");
+            Boolean exit = false;
+            ServerSocket servSocket = new ServerSocket(1234);
+            System.out.println("Awaiting connection ... ");
+            Socket link = servSocket.accept();
+            System.out.println("Awaiting data ... ");
             BufferedReader in = new BufferedReader(new InputStreamReader(link.getInputStream()));
             PrintWriter out = new PrintWriter(link.getOutputStream(),true);
-            BufferedReader console = new BufferedReader(new InputStreamReader(System.in));
-            while(true)
+            
+            while(!exit)
             {
-                String message = console.readLine();
-                out.println("CLIENT:" + message);
+                String message = in.readLine();
+                if(message == "exit")
+                    exit = true;
+                else
+                    System.out.println(message);
             }
+            link.close();
         }
         catch(IOException e)
         {
-            System.out.println("nik!");
+            System.out.println("nik !");
         }
+    }
+}