diff --git a/src/main/java/server/Server.java b/src/main/java/ChatServer.java
similarity index 79%
rename from src/main/java/server/Server.java
rename to src/main/java/ChatServer.java
index 70c24c9..cfdbca3 100644
--- a/src/main/java/server/Server.java
+++ b/src/main/java/ChatServer.java
@@ -1,14 +1,13 @@
-package server;
 
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
 
-public class Server {
+public class ChatServer {
 	
 	private ServerSocket serverSocket;
 	
-	public void ChatServer(int port) {
+	public ChatServer(int port) {
 		try {
 		serverSocket = new ServerSocket(port);
 		System.out.println("Started ChatServer on port " + port);
@@ -22,7 +21,7 @@ public class Server {
 	}
 
 	public static void main(String[] args) {
-		// TODO Auto-generated method stub
+		new ChatServer(3141);
 
 	}