diff --git a/client/Makefile b/client/Makefile
index 13fa9e6d..160e1766 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,4 +1,4 @@
-CFLAGS=-g -Og -std=gnu99 -march=native -Wall -Werror
+CFLAGS=-g -Og -std=gnu99 -march=native -Wall -Werror -I./
 LDFLAGS=-lrt -lGL
 
 CFLAGS+=`pkg-config --cflags sdl2`
@@ -10,4 +10,4 @@ LDFLAGS+=`pkg-config --libs libssl openssl`
 CFLAGS+=`pkg-config --cflags spice-protocol`
 
 all:
-	gcc ${CFLAGS} -o main main.c spice.c ${LDFLAGS}
+	gcc ${CFLAGS} -o main main.c spice/spice.c ${LDFLAGS}
diff --git a/client/main b/client/main
index 6af428ba..8455a1be 100755
Binary files a/client/main and b/client/main differ
diff --git a/client/main.c b/client/main.c
index 04578cda..e78052dc 100644
--- a/client/main.c
+++ b/client/main.c
@@ -16,7 +16,7 @@
 #define DEBUG
 #include "debug.h"
 #include "KVMGFXHeader.h"
-#include "spice.h"
+#include "spice/spice.h"
 #include "kb.h"
 
 #define MAP_SIZE (16*1024*1024)
diff --git a/client/spice.c b/client/spice/spice.c
similarity index 100%
rename from client/spice.c
rename to client/spice/spice.c
diff --git a/client/spice.h b/client/spice/spice.h
similarity index 100%
rename from client/spice.h
rename to client/spice/spice.h