diff --git a/src/Makefile.am b/src/Makefile.am
index c1cf958..060c286 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,11 @@
 ACLOCAL_AMFLAGS = -I m4
 
-CCLASS = cclass.c
+CLASS  = class.c interface.c interface/class.c
 SOCKET = socket.c socket/accept.c socket/connect.c socket/listen.c
 SERVER = server.c server/run.c server/close_conn.c
-LOGGER = logger.c logger/add.c logger/log.c logger/syslog.c
+LOGGER = logger.c interface/logger.c logger/stderr.c logger/syslog.c
 
 bin_PROGRAMS = testserver
 
-testserver_SOURCES = testserver.c $(CCLASS) $(SOCKET) $(SERVER) $(LOGGER) signalHandling.c
+testserver_SOURCES = testserver.c $(CCLASS) $(SOCKET) $(SERVER) $(LOGGER) signalHandling.c daemonize.c
 testserver_CFLAGS  = -Wall -I ../include