diff --git a/configure.ac b/configure.ac
index 0ac0b25..5f8009a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,11 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ([2.68])
-AC_INIT([cclass], [0.0.1], [Georg Hopp <georg@steffers.org>])
+AC_INIT([webgameserver], [0.0.1], [Georg Hopp <georg@steffers.org>])
 AM_INIT_AUTOMAKE
 AC_COPYRIGHT([Copyright (C) 2012 Georg Hopp])
 AC_REVISION([$Revision: 0.01 $])
-AC_CONFIG_SRCDIR([src/testserver.c])
+AC_CONFIG_SRCDIR([src/webgameserver.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 884af16..d8729f6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -55,11 +55,11 @@ UTILS  = utils/hash.c \
 
 AM_CFLAGS = -Wall -I ../include/
 
-bin_PROGRAMS = testserver
+bin_PROGRAMS = webgameserver
 
-testserver_SOURCES = testserver.c \
-		     $(IFACE) $(SOCKET) $(SERVER) $(LOGGER) $(MSG) $(REQ) \
-		     $(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
-		     $(UTILS) $(MSGQ) $(SESSION)
-testserver_CFLAGS  = -Wall -I ../include/
-testserver_LDFLAGS = -lrt
+webgameserver_SOURCES = webgameserver.c \
+			$(IFACE) $(SOCKET) $(SERVER) $(LOGGER) $(MSG) $(REQ) \
+			$(WRITER) $(RESP) $(HEADER) $(PARSER) $(WORKER) $(CB) \
+			$(UTILS) $(MSGQ) $(SESSION)
+webgameserver_CFLAGS  = -Wall -I ../include/
+webgameserver_LDFLAGS = -lrt
diff --git a/src/testserver.c b/src/webgameserver.c
similarity index 100%
rename from src/testserver.c
rename to src/webgameserver.c
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7fe0217..d3c0391 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,17 +1,18 @@
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 TESTS_ENVIRONMENT = valgrind --error-exitcode=123 --leak-check=full --quiet
 TESTS = cclassTest loggerTest socketTest serverTest
 check_PROGRAMS = cclassTest loggerTest socketTest serverTest
 
-COMMON = runtest.c ../src/cclass.c
+COMMON = runtest.c ../src/interface/class.c
 CCLASS = $(COMMON) mock/class.c
-LOGGER = $(COMMON) ../src/logger.c ../src/logger/add.c \
-	 ../src/logger/log.c ../src/logger/syslog.c
+LOGGER = $(COMMON) ../src/logger.c ../src/interface/logger.c \
+	 ../src/logger/stderr.c ../src/logger/syslog.c
 SOCKET = $(LOGGER) ../src/socket.c ../src/socket/listen.c \
 	 ../src/socket/accept.c ../src/socket/connect.c
 SERVER = $(SOCKET) ../src/server.c ../src/server/run.c \
-	 ../src/server/close_conn.c ../src/signalHandling.c
+	 ../src/server/close_conn.c ../src/utils/signalHandling.c
 
 cclassTest_SOURCES = $(CCLASS) cclassTest.c
 cclassTest_CFLAGS  = -Wall -ggdb -O0 -finline-functions -I ../include -I .. -I .