diff --git a/Dockerfile b/Dockerfile
index a186431..131ce9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,10 +2,10 @@ FROM alpine:3.11.3 AS stage
 MAINTAINER Nicolas Favre-Felix <n.favrefelix@gmail.com>
 
 RUN apk update && apk add wget make gcc libevent-dev msgpack-c-dev musl-dev bsd-compat-headers
-RUN wget https://github.com/nicolasff/webdis/archive/0.1.7.tar.gz -O webdis-0.1.7.tar.gz
-RUN tar -xvzf webdis-0.1.7.tar.gz
-RUN sed -i -e 's/-O0 -ggdb/-O3/g' ./webdis-0.1.7/Makefile
-RUN cd webdis-0.1.7 && make && make install && cd ..
+RUN wget https://github.com/nicolasff/webdis/archive/0.1.8.tar.gz -O webdis-0.1.8.tar.gz
+RUN tar -xvzf webdis-0.1.8.tar.gz
+RUN sed -i -e 's/-O0 -ggdb/-O3/g' ./webdis-0.1.8/Makefile
+RUN cd webdis-0.1.8 && make && make install && cd ..
 RUN sed -i -e 's/"daemonize":.*true,/"daemonize": false,/g' /etc/webdis.prod.json
 
 # main image
diff --git a/Makefile b/Makefile
index 0ac00ce..c625816 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
 OUT=webdis
-HIREDIS_OBJ?=hiredis/hiredis.o hiredis/sds.o hiredis/net.o hiredis/async.o hiredis/read.o hiredis/dict.o
-JANSSON_OBJ?=jansson/src/dump.o jansson/src/error.o jansson/src/hashtable.o jansson/src/load.o jansson/src/strbuffer.o jansson/src/utf.o jansson/src/value.o jansson/src/variadic.o
-B64_OBJS?=b64/cencode.o
-FORMAT_OBJS?=formats/json.o formats/raw.o formats/common.o formats/custom-type.o
-HTTP_PARSER_OBJS?=http-parser/http_parser.o
+HIREDIS_OBJ?=src/hiredis/hiredis.o src/hiredis/sds.o src/hiredis/net.o src/hiredis/async.o src/hiredis/read.o src/hiredis/dict.o
+JANSSON_OBJ?=src/jansson/src/dump.o src/jansson/src/error.o src/jansson/src/hashtable.o src/jansson/src/load.o src/jansson/src/strbuffer.o src/jansson/src/utf.o src/jansson/src/value.o src/jansson/src/variadic.o
+B64_OBJS?=src/b64/cencode.o
+FORMAT_OBJS?=src/formats/json.o src/formats/raw.o src/formats/common.o src/formats/custom-type.o
+HTTP_PARSER_OBJS?=src/http-parser/http_parser.o
 
-CFLAGS ?= -O0 -ggdb -Wall -Wextra -I. -Ijansson/src -Ihttp-parser -MD
+CFLAGS ?= -O3 -Wall -Wextra -Isrc -Isrc/jansson/src -Isrc/http-parser -MD
 LDFLAGS ?= -levent -pthread
 
 # check for MessagePack
@@ -20,7 +20,7 @@ endif
 
 OBJS_DEPS=$(wildcard *.d)
 DEPS=$(FORMAT_OBJS) $(HIREDIS_OBJ) $(JANSSON_OBJ) $(HTTP_PARSER_OBJS) $(B64_OBJS)
-OBJS=webdis.o cmd.o worker.o slog.o server.o acl.o md5/md5.o sha1/sha1.o http.o client.o websocket.o pool.o conf.o $(DEPS)
+OBJS=src/webdis.o src/cmd.o src/worker.o src/slog.o src/server.o src/acl.o src/md5/md5.o src/sha1/sha1.o src/http.o src/client.o src/websocket.o src/pool.o src/conf.o $(DEPS)
 
 
 
diff --git a/acl.c b/src/acl.c
similarity index 100%
rename from acl.c
rename to src/acl.c
diff --git a/acl.h b/src/acl.h
similarity index 100%
rename from acl.h
rename to src/acl.h
diff --git a/b64/cencode.c b/src/b64/cencode.c
similarity index 100%
rename from b64/cencode.c
rename to src/b64/cencode.c
diff --git a/b64/cencode.h b/src/b64/cencode.h
similarity index 100%
rename from b64/cencode.h
rename to src/b64/cencode.h
diff --git a/client.c b/src/client.c
similarity index 100%
rename from client.c
rename to src/client.c
diff --git a/client.h b/src/client.h
similarity index 100%
rename from client.h
rename to src/client.h
diff --git a/cmd.c b/src/cmd.c
similarity index 100%
rename from cmd.c
rename to src/cmd.c
diff --git a/cmd.h b/src/cmd.h
similarity index 100%
rename from cmd.h
rename to src/cmd.h
diff --git a/conf.c b/src/conf.c
similarity index 100%
rename from conf.c
rename to src/conf.c
diff --git a/conf.h b/src/conf.h
similarity index 100%
rename from conf.h
rename to src/conf.h
diff --git a/formats/common.c b/src/formats/common.c
similarity index 100%
rename from formats/common.c
rename to src/formats/common.c
diff --git a/formats/common.h b/src/formats/common.h
similarity index 100%
rename from formats/common.h
rename to src/formats/common.h
diff --git a/formats/custom-type.c b/src/formats/custom-type.c
similarity index 100%
rename from formats/custom-type.c
rename to src/formats/custom-type.c
diff --git a/formats/custom-type.h b/src/formats/custom-type.h
similarity index 100%
rename from formats/custom-type.h
rename to src/formats/custom-type.h
diff --git a/formats/json.c b/src/formats/json.c
similarity index 100%
rename from formats/json.c
rename to src/formats/json.c
diff --git a/formats/json.h b/src/formats/json.h
similarity index 100%
rename from formats/json.h
rename to src/formats/json.h
diff --git a/formats/msgpack.c b/src/formats/msgpack.c
similarity index 100%
rename from formats/msgpack.c
rename to src/formats/msgpack.c
diff --git a/formats/msgpack.h b/src/formats/msgpack.h
similarity index 100%
rename from formats/msgpack.h
rename to src/formats/msgpack.h
diff --git a/formats/raw.c b/src/formats/raw.c
similarity index 100%
rename from formats/raw.c
rename to src/formats/raw.c
diff --git a/formats/raw.h b/src/formats/raw.h
similarity index 100%
rename from formats/raw.h
rename to src/formats/raw.h
diff --git a/hiredis/.gitignore b/src/hiredis/.gitignore
similarity index 100%
rename from hiredis/.gitignore
rename to src/hiredis/.gitignore
diff --git a/hiredis/.travis.yml b/src/hiredis/.travis.yml
similarity index 100%
rename from hiredis/.travis.yml
rename to src/hiredis/.travis.yml
diff --git a/hiredis/CHANGELOG.md b/src/hiredis/CHANGELOG.md
similarity index 100%
rename from hiredis/CHANGELOG.md
rename to src/hiredis/CHANGELOG.md
diff --git a/hiredis/COPYING b/src/hiredis/COPYING
similarity index 100%
rename from hiredis/COPYING
rename to src/hiredis/COPYING
diff --git a/hiredis/Makefile b/src/hiredis/Makefile
similarity index 100%
rename from hiredis/Makefile
rename to src/hiredis/Makefile
diff --git a/hiredis/README.md b/src/hiredis/README.md
similarity index 100%
rename from hiredis/README.md
rename to src/hiredis/README.md
diff --git a/hiredis/adapters/ae.h b/src/hiredis/adapters/ae.h
similarity index 100%
rename from hiredis/adapters/ae.h
rename to src/hiredis/adapters/ae.h
diff --git a/hiredis/adapters/glib.h b/src/hiredis/adapters/glib.h
similarity index 100%
rename from hiredis/adapters/glib.h
rename to src/hiredis/adapters/glib.h
diff --git a/hiredis/adapters/libev.h b/src/hiredis/adapters/libev.h
similarity index 100%
rename from hiredis/adapters/libev.h
rename to src/hiredis/adapters/libev.h
diff --git a/hiredis/adapters/libevent.h b/src/hiredis/adapters/libevent.h
similarity index 100%
rename from hiredis/adapters/libevent.h
rename to src/hiredis/adapters/libevent.h
diff --git a/hiredis/adapters/libuv.h b/src/hiredis/adapters/libuv.h
similarity index 100%
rename from hiredis/adapters/libuv.h
rename to src/hiredis/adapters/libuv.h
diff --git a/hiredis/async.c b/src/hiredis/async.c
similarity index 100%
rename from hiredis/async.c
rename to src/hiredis/async.c
diff --git a/hiredis/async.h b/src/hiredis/async.h
similarity index 100%
rename from hiredis/async.h
rename to src/hiredis/async.h
diff --git a/hiredis/dict.c b/src/hiredis/dict.c
similarity index 100%
rename from hiredis/dict.c
rename to src/hiredis/dict.c
diff --git a/hiredis/dict.h b/src/hiredis/dict.h
similarity index 100%
rename from hiredis/dict.h
rename to src/hiredis/dict.h
diff --git a/hiredis/examples/example-ae.c b/src/hiredis/examples/example-ae.c
similarity index 100%
rename from hiredis/examples/example-ae.c
rename to src/hiredis/examples/example-ae.c
diff --git a/hiredis/examples/example-glib.c b/src/hiredis/examples/example-glib.c
similarity index 100%
rename from hiredis/examples/example-glib.c
rename to src/hiredis/examples/example-glib.c
diff --git a/hiredis/examples/example-libev.c b/src/hiredis/examples/example-libev.c
similarity index 100%
rename from hiredis/examples/example-libev.c
rename to src/hiredis/examples/example-libev.c
diff --git a/hiredis/examples/example-libevent.c b/src/hiredis/examples/example-libevent.c
similarity index 100%
rename from hiredis/examples/example-libevent.c
rename to src/hiredis/examples/example-libevent.c
diff --git a/hiredis/examples/example-libuv.c b/src/hiredis/examples/example-libuv.c
similarity index 100%
rename from hiredis/examples/example-libuv.c
rename to src/hiredis/examples/example-libuv.c
diff --git a/hiredis/examples/example.c b/src/hiredis/examples/example.c
similarity index 100%
rename from hiredis/examples/example.c
rename to src/hiredis/examples/example.c
diff --git a/hiredis/fmacros.h b/src/hiredis/fmacros.h
similarity index 100%
rename from hiredis/fmacros.h
rename to src/hiredis/fmacros.h
diff --git a/hiredis/hiredis.c b/src/hiredis/hiredis.c
similarity index 100%
rename from hiredis/hiredis.c
rename to src/hiredis/hiredis.c
diff --git a/hiredis/hiredis.h b/src/hiredis/hiredis.h
similarity index 100%
rename from hiredis/hiredis.h
rename to src/hiredis/hiredis.h
diff --git a/hiredis/net.c b/src/hiredis/net.c
similarity index 100%
rename from hiredis/net.c
rename to src/hiredis/net.c
diff --git a/hiredis/net.h b/src/hiredis/net.h
similarity index 100%
rename from hiredis/net.h
rename to src/hiredis/net.h
diff --git a/hiredis/read.c b/src/hiredis/read.c
similarity index 100%
rename from hiredis/read.c
rename to src/hiredis/read.c
diff --git a/hiredis/read.h b/src/hiredis/read.h
similarity index 100%
rename from hiredis/read.h
rename to src/hiredis/read.h
diff --git a/hiredis/sds.c b/src/hiredis/sds.c
similarity index 100%
rename from hiredis/sds.c
rename to src/hiredis/sds.c
diff --git a/hiredis/sds.h b/src/hiredis/sds.h
similarity index 100%
rename from hiredis/sds.h
rename to src/hiredis/sds.h
diff --git a/hiredis/test.c b/src/hiredis/test.c
similarity index 100%
rename from hiredis/test.c
rename to src/hiredis/test.c
diff --git a/hiredis/win32.h b/src/hiredis/win32.h
similarity index 100%
rename from hiredis/win32.h
rename to src/hiredis/win32.h
diff --git a/http-parser/.gitignore b/src/http-parser/.gitignore
similarity index 100%
rename from http-parser/.gitignore
rename to src/http-parser/.gitignore
diff --git a/http-parser/CONTRIBUTIONS b/src/http-parser/CONTRIBUTIONS
similarity index 100%
rename from http-parser/CONTRIBUTIONS
rename to src/http-parser/CONTRIBUTIONS
diff --git a/http-parser/LICENSE-MIT b/src/http-parser/LICENSE-MIT
similarity index 100%
rename from http-parser/LICENSE-MIT
rename to src/http-parser/LICENSE-MIT
diff --git a/http-parser/README.md b/src/http-parser/README.md
similarity index 100%
rename from http-parser/README.md
rename to src/http-parser/README.md
diff --git a/http-parser/http_parser.c b/src/http-parser/http_parser.c
similarity index 100%
rename from http-parser/http_parser.c
rename to src/http-parser/http_parser.c
diff --git a/http-parser/http_parser.h b/src/http-parser/http_parser.h
similarity index 100%
rename from http-parser/http_parser.h
rename to src/http-parser/http_parser.h
diff --git a/http.c b/src/http.c
similarity index 100%
rename from http.c
rename to src/http.c
diff --git a/http.h b/src/http.h
similarity index 100%
rename from http.h
rename to src/http.h
diff --git a/jansson/.gitignore b/src/jansson/.gitignore
similarity index 100%
rename from jansson/.gitignore
rename to src/jansson/.gitignore
diff --git a/jansson/CHANGES b/src/jansson/CHANGES
similarity index 100%
rename from jansson/CHANGES
rename to src/jansson/CHANGES
diff --git a/jansson/LICENSE b/src/jansson/LICENSE
similarity index 100%
rename from jansson/LICENSE
rename to src/jansson/LICENSE
diff --git a/jansson/Makefile.am b/src/jansson/Makefile.am
similarity index 100%
rename from jansson/Makefile.am
rename to src/jansson/Makefile.am
diff --git a/jansson/README.rst b/src/jansson/README.rst
similarity index 100%
rename from jansson/README.rst
rename to src/jansson/README.rst
diff --git a/jansson/configure.ac b/src/jansson/configure.ac
similarity index 100%
rename from jansson/configure.ac
rename to src/jansson/configure.ac
diff --git a/jansson/jansson.pc.in b/src/jansson/jansson.pc.in
similarity index 100%
rename from jansson/jansson.pc.in
rename to src/jansson/jansson.pc.in
diff --git a/jansson/src/Makefile.am b/src/jansson/src/Makefile.am
similarity index 100%
rename from jansson/src/Makefile.am
rename to src/jansson/src/Makefile.am
diff --git a/jansson/src/dump.c b/src/jansson/src/dump.c
similarity index 100%
rename from jansson/src/dump.c
rename to src/jansson/src/dump.c
diff --git a/jansson/src/error.c b/src/jansson/src/error.c
similarity index 100%
rename from jansson/src/error.c
rename to src/jansson/src/error.c
diff --git a/jansson/src/hashtable.c b/src/jansson/src/hashtable.c
similarity index 100%
rename from jansson/src/hashtable.c
rename to src/jansson/src/hashtable.c
diff --git a/jansson/src/hashtable.h b/src/jansson/src/hashtable.h
similarity index 100%
rename from jansson/src/hashtable.h
rename to src/jansson/src/hashtable.h
diff --git a/jansson/src/jansson.h b/src/jansson/src/jansson.h
similarity index 100%
rename from jansson/src/jansson.h
rename to src/jansson/src/jansson.h
diff --git a/jansson/src/jansson_config.h b/src/jansson/src/jansson_config.h
similarity index 100%
rename from jansson/src/jansson_config.h
rename to src/jansson/src/jansson_config.h
diff --git a/jansson/src/jansson_config.h.in b/src/jansson/src/jansson_config.h.in
similarity index 100%
rename from jansson/src/jansson_config.h.in
rename to src/jansson/src/jansson_config.h.in
diff --git a/jansson/src/jansson_config.h.win32 b/src/jansson/src/jansson_config.h.win32
similarity index 100%
rename from jansson/src/jansson_config.h.win32
rename to src/jansson/src/jansson_config.h.win32
diff --git a/jansson/src/jansson_private.h b/src/jansson/src/jansson_private.h
similarity index 100%
rename from jansson/src/jansson_private.h
rename to src/jansson/src/jansson_private.h
diff --git a/jansson/src/load.c b/src/jansson/src/load.c
similarity index 100%
rename from jansson/src/load.c
rename to src/jansson/src/load.c
diff --git a/jansson/src/strbuffer.c b/src/jansson/src/strbuffer.c
similarity index 100%
rename from jansson/src/strbuffer.c
rename to src/jansson/src/strbuffer.c
diff --git a/jansson/src/strbuffer.h b/src/jansson/src/strbuffer.h
similarity index 100%
rename from jansson/src/strbuffer.h
rename to src/jansson/src/strbuffer.h
diff --git a/jansson/src/utf.c b/src/jansson/src/utf.c
similarity index 100%
rename from jansson/src/utf.c
rename to src/jansson/src/utf.c
diff --git a/jansson/src/utf.h b/src/jansson/src/utf.h
similarity index 100%
rename from jansson/src/utf.h
rename to src/jansson/src/utf.h
diff --git a/jansson/src/value.c b/src/jansson/src/value.c
similarity index 100%
rename from jansson/src/value.c
rename to src/jansson/src/value.c
diff --git a/jansson/src/variadic.c b/src/jansson/src/variadic.c
similarity index 100%
rename from jansson/src/variadic.c
rename to src/jansson/src/variadic.c
diff --git a/md5/md5.c b/src/md5/md5.c
similarity index 100%
rename from md5/md5.c
rename to src/md5/md5.c
diff --git a/md5/md5.h b/src/md5/md5.h
similarity index 100%
rename from md5/md5.h
rename to src/md5/md5.h
diff --git a/pool.c b/src/pool.c
similarity index 100%
rename from pool.c
rename to src/pool.c
diff --git a/pool.h b/src/pool.h
similarity index 100%
rename from pool.h
rename to src/pool.h
diff --git a/server.c b/src/server.c
similarity index 100%
rename from server.c
rename to src/server.c
diff --git a/server.h b/src/server.h
similarity index 100%
rename from server.h
rename to src/server.h
diff --git a/sha1/sha1.c b/src/sha1/sha1.c
similarity index 100%
rename from sha1/sha1.c
rename to src/sha1/sha1.c
diff --git a/sha1/sha1.h b/src/sha1/sha1.h
similarity index 100%
rename from sha1/sha1.h
rename to src/sha1/sha1.h
diff --git a/slog.c b/src/slog.c
similarity index 100%
rename from slog.c
rename to src/slog.c
diff --git a/slog.h b/src/slog.h
similarity index 100%
rename from slog.h
rename to src/slog.h
diff --git a/version.h b/src/version.h
similarity index 72%
rename from version.h
rename to src/version.h
index 1575407..10429ab 100644
--- a/version.h
+++ b/src/version.h
@@ -2,7 +2,7 @@
 #define VERSION_H
 
 #ifndef WEBDIS_VERSION
-#define WEBDIS_VERSION "0.1.8-dev"
+#define WEBDIS_VERSION "0.1.8"
 #endif
 
 #endif /* VERSION_H */
diff --git a/webdis.c b/src/webdis.c
similarity index 100%
rename from webdis.c
rename to src/webdis.c
diff --git a/websocket.c b/src/websocket.c
similarity index 100%
rename from websocket.c
rename to src/websocket.c
diff --git a/websocket.h b/src/websocket.h
similarity index 100%
rename from websocket.h
rename to src/websocket.h
diff --git a/worker.c b/src/worker.c
similarity index 100%
rename from worker.c
rename to src/worker.c
diff --git a/worker.h b/src/worker.h
similarity index 100%
rename from worker.h
rename to src/worker.h