diff --git a/Makefile b/Makefile
index 2b01d4e..c2e60c4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,21 @@
+OBJS=main.o window.o screen.o config.o graphic.o \
+	 notif.o queue.o timer.o fifo.o
+include ../param.mk
 
-all : server client
+all : $(SERVER)
 
-client :
-	make -C client
+$(SERVER) : $(OBJS)
+	$(CC) $(CFLAGS)    -o $@ $^ $(LDFLAGS)
 
-server :
-	make -C server
+%.o : %.c
+	$(CC) $(CFLAGS) -c -o $@ $<
 
 clean :
-	make clean -C client
-	make clean -C server
+	@touch $(OBJS) $(SERVER)
+	rm $(OBJS) $(SERVER)
 
 rec : clean all
 
-.PHONY: all client server clean rec
+.PHONY: all clean rec
 
 
diff --git a/client/Makefile b/client/Makefile
deleted file mode 100644
index 8a2e9e9..0000000
--- a/client/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-OBJS=main.o
-include ../param.mk
-
-all : $(CLIENT)
-
-$(CLIENT) : $(OBJS)
-	$(CC) $(CFLAGS)    -o $@ $^ $(LDFLAGS)
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean :
-	@touch $(OBJS) $(SERVER)
-	rm $(OBJS) $(SERVER)
-
-rec : clean all
-
-.PHONY: all clean rec
-
-
diff --git a/client/main.c b/client/main.c
deleted file mode 100644
index d2ffcd0..0000000
--- a/client/main.c
+++ /dev/null
@@ -1,8 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-
-int main(int argc, char *argv[])
-{
-    return 0;
-}
-
diff --git a/server/config.c b/config.c
similarity index 100%
rename from server/config.c
rename to config.c
diff --git a/server/config.h b/config.h
similarity index 100%
rename from server/config.h
rename to config.h
diff --git a/server/fifo.c b/fifo.c
similarity index 100%
rename from server/fifo.c
rename to fifo.c
diff --git a/server/fifo.h b/fifo.h
similarity index 100%
rename from server/fifo.h
rename to fifo.h
diff --git a/server/graphic.c b/graphic.c
similarity index 100%
rename from server/graphic.c
rename to graphic.c
diff --git a/server/graphic.h b/graphic.h
similarity index 100%
rename from server/graphic.h
rename to graphic.h
diff --git a/server/main.c b/main.c
similarity index 100%
rename from server/main.c
rename to main.c
diff --git a/server/notif.c b/notif.c
similarity index 100%
rename from server/notif.c
rename to notif.c
diff --git a/server/notif.h b/notif.h
similarity index 100%
rename from server/notif.h
rename to notif.h
diff --git a/server/queue.c b/queue.c
similarity index 100%
rename from server/queue.c
rename to queue.c
diff --git a/server/queue.h b/queue.h
similarity index 100%
rename from server/queue.h
rename to queue.h
diff --git a/server/screen.c b/screen.c
similarity index 100%
rename from server/screen.c
rename to screen.c
diff --git a/server/screen.h b/screen.h
similarity index 100%
rename from server/screen.h
rename to screen.h
diff --git a/server/Makefile b/server/Makefile
deleted file mode 100644
index c2e60c4..0000000
--- a/server/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-OBJS=main.o window.o screen.o config.o graphic.o \
-	 notif.o queue.o timer.o fifo.o
-include ../param.mk
-
-all : $(SERVER)
-
-$(SERVER) : $(OBJS)
-	$(CC) $(CFLAGS)    -o $@ $^ $(LDFLAGS)
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-clean :
-	@touch $(OBJS) $(SERVER)
-	rm $(OBJS) $(SERVER)
-
-rec : clean all
-
-.PHONY: all clean rec
-
-
diff --git a/server/timer.c b/timer.c
similarity index 100%
rename from server/timer.c
rename to timer.c
diff --git a/server/timer.h b/timer.h
similarity index 100%
rename from server/timer.h
rename to timer.h
diff --git a/server/window.c b/window.c
similarity index 100%
rename from server/window.c
rename to window.c
diff --git a/server/window.h b/window.h
similarity index 100%
rename from server/window.h
rename to window.h