diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 72ffbf3..9c0e5ad 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -62,7 +62,7 @@ include_directories(./openalpr )
 set(CMAKE_CSS_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -Wall ")
 ADD_EXECUTABLE( alpr  main.cpp videobuffer.cpp )
 
-ADD_EXECUTABLE( alprd  daemon.cpp videobuffer.cpp beanstalk.c beanstalk.cc uuid.cpp )
+ADD_EXECUTABLE( alprd  daemon.cpp videobuffer.cpp daemon/beanstalk.c daemon/beanstalk.cc daemon/uuid.cpp )
 
 
 TARGET_LINK_LIBRARIES(alpr
diff --git a/src/beanstalk.c b/src/daemon/beanstalk.c
similarity index 100%
rename from src/beanstalk.c
rename to src/daemon/beanstalk.c
diff --git a/src/beanstalk.cc b/src/daemon/beanstalk.cc
similarity index 100%
rename from src/beanstalk.cc
rename to src/daemon/beanstalk.cc
diff --git a/src/beanstalk.h b/src/daemon/beanstalk.h
similarity index 100%
rename from src/beanstalk.h
rename to src/daemon/beanstalk.h
diff --git a/src/beanstalk.hpp b/src/daemon/beanstalk.hpp
similarity index 100%
rename from src/beanstalk.hpp
rename to src/daemon/beanstalk.hpp
diff --git a/src/uuid.cpp b/src/daemon/uuid.cpp
similarity index 100%
rename from src/uuid.cpp
rename to src/daemon/uuid.cpp
diff --git a/src/uuid.h b/src/daemon/uuid.h
similarity index 100%
rename from src/uuid.h
rename to src/daemon/uuid.h