diff --git a/.gitignore b/.gitignore
index c6127b3..42dea9d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,6 +36,19 @@
 *.x86_64
 *.hex
 
+# CMake
+CMakeLists.txt.user
+CMakeCache.txt
+CMakeFiles
+CMakeScripts
+Testing
+Makefile
+cmake_install.cmake
+install_manifest.txt
+compile_commands.json
+CTestTestfile.cmake
+_deps
+
 # Debug files
 *.dSYM/
 *.su
diff --git a/CMakeLists.txt b/CMakeLists.txt
new file mode 100644
index 0000000..26c451c
--- /dev/null
+++ b/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 2.8)
+project(pingpong)
+add_executable(./bin/server ./src/server.c)
+add_executable(./bin/client ./src/client.c)
diff --git a/Transmissão de Buffers entre Cliente e Servidor via Conexão por Socket.png b/Transmissão de Buffers entre Cliente e Servidor via Conexão por Socket.png
deleted file mode 100644
index e543331..0000000
Binary files a/Transmissão de Buffers entre Cliente e Servidor via Conexão por Socket.png and /dev/null differ
diff --git a/graphic.py b/data/graphic.py
similarity index 100%
rename from graphic.py
rename to data/graphic.py
diff --git a/requirements.txt b/data/requirements.txt
similarity index 100%
rename from requirements.txt
rename to data/requirements.txt
diff --git a/data/time_file1 b/data/time_file1
new file mode 100644
index 0000000..e5b7482
--- /dev/null
+++ b/data/time_file1
@@ -0,0 +1,3 @@
+make[1]: Entrando no diretório '/home/silva/pingpong'
+0.000912
+make[1]: Saindo do diretório '/home/silva/pingpong'
diff --git a/makefile b/makefile
deleted file mode 100644
index e5ff3d8..0000000
--- a/makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-CC=gcc
-
-all:
-	@$(CC) client.c -o client
-	@$(CC) server.c -o server
-	@./server $(buffer_size)&
-	@./client $(buffer_size)
-
-clean:
-	@rm server client
-
-run_client:
-	@$(CC) client.c -o client
-	@./client $(buffer_size)
-	@rm server client
-
-run_server:
-	@$(CC) server.c -o server
-	@./server $(buffer_size)&
-
-graphic:
-	@python graphic.py
\ No newline at end of file
diff --git a/client.c b/src/client.c
similarity index 98%
rename from client.c
rename to src/client.c
index 6532db9..bec978d 100644
--- a/client.c
+++ b/src/client.c
@@ -11,7 +11,7 @@
 #define TRUE               1
 #define FALSE              0
 #define HOST_IP            "127.0.0.1"   // IPV4 loopback address
-#define SERVER_PORT        8099         // Server port
+#define SERVER_PORT        8481         // Server port
 #define PORT_USED_CODE     256
 #define SOCKET_ERROR_CODE  -1         // Socket create, Connection server, Receive buffer to server code error
 #define SYSTEM_EXIT_FAILED  1        // Operating System program error response 
@@ -160,4 +160,4 @@ int main(int argc, char** argv)
     printf("%lf\n", (float)(average/(float)N));
     
     return SYSTEM_EXIT_SUCCESS;
-}
\ No newline at end of file
+}
diff --git a/server.c b/src/server.c
similarity index 98%
rename from server.c
rename to src/server.c
index 0b215b9..5c708d4 100644
--- a/server.c
+++ b/src/server.c
@@ -9,7 +9,7 @@
 #define FALSE              0
 #define TRUE               1
 #define HOST_IP            "127.0.0.1"    // IPV4 loopback address
-#define SERVER_PORT        8099          // Server port
+#define SERVER_PORT        8481          // Server port
 #define MAX_CONNECTIONS     10          // Num max client connected simultaneously 
 #define SOCKET_ERROR_CODE  -1         // Socket create, Connection server, Receive buffer to server code error
 #define SYSTEM_EXIT_FAILED  1        // Operating System program error response