diff --git a/lib/pubsub.c b/lib/pubsub.c
index 42fc559..69e9c36 100644
--- a/lib/pubsub.c
+++ b/lib/pubsub.c
@@ -49,7 +49,7 @@ void pubsubd_msg_unserialize (struct pubsub_msg *msg, const char *buf, size_t ml
     cbor_item_t * item = cbor_load ((unsigned char *) buf, mlen, &result);
 
     struct cbor_pair * pair = cbor_map_handle (item);
-    cbor_mutable_data *data = cbor_bytestring_handle (pair->value);
+    cbor_mutable_data data = cbor_bytestring_handle (pair->value);
 
     msg->type = cbor_get_uint8 (pair->key);
     if (msg->type != PUBSUB_TYPE_DISCONNECT) {
diff --git a/pingpong/Makefile b/pingpong/Makefile
index 17b1352..d0864dc 100644
--- a/pingpong/Makefile
+++ b/pingpong/Makefile
@@ -10,7 +10,7 @@ TESTS=$(addsuffix .test, $(EXEC))
 all: $(SOURCES) $(EXEC)
 
 $(EXEC): $(OBJECTS) $(CFILES)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $@.c -o $@.bin
+	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJECTS) $@.c -lcbor -o $@.bin
 
 .c.o:
 	$(CC) -c $(CFLAGS) $< -o $@
diff --git a/pubsub/Makefile b/pubsub/app/Makefile
similarity index 92%
rename from pubsub/Makefile
rename to pubsub/app/Makefile
index 4da897d..f6276d4 100644
--- a/pubsub/Makefile
+++ b/pubsub/app/Makefile
@@ -3,7 +3,7 @@ CFLAGS=-Wall -g -Wextra
 LDFLAGS= -pthread
 CFILES=$(wildcard *.c) # CFILES => recompiles everything on a C file change
 EXEC=$(basename $(wildcard *.c))
-SOURCES=$(wildcard ../lib/*.c)
+SOURCES=$(wildcard ../lib/*.c ../../lib/*.c)
 OBJECTS=$(SOURCES:.c=.o)
 TESTS=$(addsuffix .test, $(EXEC))
 
diff --git a/pubsub/msg-serialize.c b/pubsub/app/msg-serialize.c
similarity index 100%
rename from pubsub/msg-serialize.c
rename to pubsub/app/msg-serialize.c
diff --git a/pubsub/msg-unserialize.c b/pubsub/app/msg-unserialize.c
similarity index 100%
rename from pubsub/msg-unserialize.c
rename to pubsub/app/msg-unserialize.c
diff --git a/pubsub/pubsub-test-send-params.c b/pubsub/app/pubsub-test-send-params.c
similarity index 100%
rename from pubsub/pubsub-test-send-params.c
rename to pubsub/app/pubsub-test-send-params.c
diff --git a/pubsub/pubsub-test-send.c b/pubsub/app/pubsub-test-send.c
similarity index 100%
rename from pubsub/pubsub-test-send.c
rename to pubsub/app/pubsub-test-send.c
diff --git a/pubsub/pubsubc.c b/pubsub/app/pubsubc.c
similarity index 100%
rename from pubsub/pubsubc.c
rename to pubsub/app/pubsubc.c
diff --git a/pubsub/pubsubd.c b/pubsub/app/pubsubd.c
similarity index 100%
rename from pubsub/pubsubd.c
rename to pubsub/app/pubsubd.c
diff --git a/pubsub/test-chan-lists.c b/pubsub/app/test-chan-lists.c
similarity index 100%
rename from pubsub/test-chan-lists.c
rename to pubsub/app/test-chan-lists.c
diff --git a/pubsub/test-gen-new-process.c b/pubsub/app/test-gen-new-process.c
similarity index 100%
rename from pubsub/test-gen-new-process.c
rename to pubsub/app/test-gen-new-process.c
diff --git a/pubsub/test-gen-new-process.sh b/pubsub/app/test-gen-new-process.sh
similarity index 100%
rename from pubsub/test-gen-new-process.sh
rename to pubsub/app/test-gen-new-process.sh
diff --git a/pubsub/test-pipe-read.c b/pubsub/app/test-pipe-read.c
similarity index 100%
rename from pubsub/test-pipe-read.c
rename to pubsub/app/test-pipe-read.c
diff --git a/pubsub/test-pipe-write.c b/pubsub/app/test-pipe-write.c
similarity index 100%
rename from pubsub/test-pipe-write.c
rename to pubsub/app/test-pipe-write.c
diff --git a/pubsub/test-subscribers.c b/pubsub/app/test-subscribers.c
similarity index 100%
rename from pubsub/test-subscribers.c
rename to pubsub/app/test-subscribers.c
diff --git a/pubsub/test-test-send-params.sh b/pubsub/app/test-test-send-params.sh
similarity index 100%
rename from pubsub/test-test-send-params.sh
rename to pubsub/app/test-test-send-params.sh
diff --git a/lib/pubsubd.c b/pubsub/lib/pubsubd.c
similarity index 100%
rename from lib/pubsubd.c
rename to pubsub/lib/pubsubd.c
diff --git a/lib/pubsubd.h b/pubsub/lib/pubsubd.h
similarity index 99%
rename from lib/pubsubd.h
rename to pubsub/lib/pubsubd.h
index fad9cd5..0bd9d6f 100644
--- a/lib/pubsubd.h
+++ b/pubsub/lib/pubsubd.h
@@ -1,7 +1,7 @@
 #ifndef __PUBSUBD_H__
 #define __PUBSUBD_H__
 
-#include "pubsub.h"
+#include "../../lib/pubsub.h"
 #include <pthread.h>
 
 struct channel;