diff --git a/Makefile b/client/Makefile
similarity index 100%
rename from Makefile
rename to client/Makefile
diff --git a/doubleBuffer.h b/client/doubleBuffer.h
similarity index 100%
rename from doubleBuffer.h
rename to client/doubleBuffer.h
diff --git a/snapClient.cpp b/client/snapClient.cpp
similarity index 100%
rename from snapClient.cpp
rename to client/snapClient.cpp
diff --git a/stream.cpp b/client/stream.cpp
similarity index 100%
rename from stream.cpp
rename to client/stream.cpp
diff --git a/stream.h b/client/stream.h
similarity index 100%
rename from stream.h
rename to client/stream.h
diff --git a/server/Makefile b/server/Makefile
new file mode 100644
index 00000000..d91370af
--- /dev/null
+++ b/server/Makefile
@@ -0,0 +1,25 @@
+VERSION = 0.01
+CC      = /usr/bin/g++
+CFLAGS  = -std=gnu++0x -Wall -Wno-unused-function -g -O3 -D_REENTRANT -DVERSION=\"$(VERSION)\"
+LDFLAGS = -lrt -lpthread -lportaudio -lboost_system
+
+OBJ_SERVER = blocking_tcp_echo_server.o
+BIN_SERVER = server
+OBJ_CLIENT = client.o stream.o chunk.o
+BIN_CLIENT = client
+OBJ = $(OBJ_SERVER) $(OBJ_CLIENT)
+
+all:	server client
+
+server: $(OBJ)
+	$(CC) $(CFLAGS) -o $(BIN_SERVER) $(OBJ_SERVER) $(LDFLAGS)
+
+client: $(OBJ)
+	$(CC) $(CFLAGS) -o $(BIN_CLIENT) $(OBJ_CLIENT) $(LDFLAGS)
+
+%.o: %.cpp
+	$(CC) $(CFLAGS) -c $<
+
+clean:
+	rm -rf $(BIN_SERVER) $(BIN_CLIENT) $(OBJ) $(OBJ_SERVER) $(OBJ_CLIENT)
+
diff --git a/snapServer.cpp b/server/snapServer.cpp
similarity index 100%
rename from snapServer.cpp
rename to server/snapServer.cpp