diff --git a/Makefile b/Makefile
index 83aec30..29beb61 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@ MODS = $(wildcard src/*.erl)
 BEAMS = $(MODS:src/%.erl=ebin/%.beam)
 TEST_MODS = $(wildcard test/*.erl)
 TEST_BEAMS = $(TEST_MODS:test/%.erl=test/%.beam)
-YAWS_ROOT=/usr/lib/yaws/timestamper
+TS_ROOT=/usr/lib/yaws/jdb-labs/timestamper
 
 all : compile test
 
@@ -41,12 +41,13 @@ test/%.beam : test/%.erl
 deploy: compile
 	@service yaws stop
 	@echo Removing existing artifacts.
-	@rm -r $(YAWS_ROOT)/*
+	- @rm -r $(TS_ROOT)
 	@echo Copying current artifacts.
-	@cp -r www $(YAWS_ROOT)
-	@cp -r ebin $(YAWS_ROOT)
-	@mkdir $(YAWS_ROOT)/include
-	@cp -r src/ts_db_records.hrl $(YAWS_ROOT)/include/.
-	@cp yaws.prod.conf $(YAWS_ROOT)/yaws.conf
+	@mkdir -p $(TS_ROOT)
+	@cp -r www $(TS_ROOT)
+	@cp -r ebin $(TS_ROOT)
+	@mkdir $(TS_ROOT)/include
+	@cp -r src/ts_db_records.hrl $(TS_ROOT)/include/.
+	@cp yaws.prod.conf $(TS_ROOT)/yaws.conf
 	@service yaws start
 	@echo Done.
diff --git a/yaws.dev.conf b/yaws.dev.conf
index 4b0061c..c0d49ea 100644
--- a/yaws.dev.conf
+++ b/yaws.dev.conf
@@ -3,7 +3,7 @@ ebin_dir = /home/jdbernard/projects/timestamper/web-app/ebin
 
 runmod = timestamper
 
-<server timestamper-test>
+<server timestamper.jdb-labs-local>
     port = 8000
     listen = 127.0.0.1
     docroot = /home/jdbernard/projects/timestamper/web-app/www
diff --git a/yaws.prod.conf b/yaws.prod.conf
index 0e2c8cc..79ea0c9 100644
--- a/yaws.prod.conf
+++ b/yaws.prod.conf
@@ -1,11 +1,11 @@
-ebin_dir = /usr/lib/yaws/timestamper/ebin
-include_dir = /usr/lib/yaws/timestamper/include
+ebin_dir = /usr/lib/yaws/jdb-labs/timestamper/ebin
+include_dir = /usr/lib/yaws/jdb-labs/timestamper/include
 
 runmod = timestamper
 
-<server timestamper.jdbernard.com>
+<server timestamper.jdb-labs.com>
     port = 80
     listen = 0.0.0.0
-    docroot = /usr/lib/yaws/timestamper/www
+    docroot = /usr/lib/yaws/jdb-labs/timestamper/www
     appmods = ts_api
 </server>