diff --git a/src/core/core.pri b/src/core/core.pri
new file mode 100644
index 00000000..796083b6
--- /dev/null
+++ b/src/core/core.pri
@@ -0,0 +1,82 @@
+include(qzmq/src/src.pri)
+
+HEADERS += $$PWD/processquit.h
+SOURCES += $$PWD/processquit.cpp
+
+HEADERS += \
+	$$PWD/tnetstring.h \
+	$$PWD/httpheaders.h \
+	$$PWD/zhttprequestpacket.h \
+	$$PWD/zhttpresponsepacket.h \
+	$$PWD/log.h \
+	$$PWD/bufferlist.h \
+	$$PWD/layertracker.h
+
+SOURCES += \
+	$$PWD/tnetstring.cpp \
+	$$PWD/httpheaders.cpp \
+	$$PWD/zhttprequestpacket.cpp \
+	$$PWD/zhttpresponsepacket.cpp \
+	$$PWD/log.cpp \
+	$$PWD/bufferlist.cpp \
+	$$PWD/layertracker.cpp
+
+HEADERS += \
+	$$PWD/packet/httprequestdata.h \
+	$$PWD/packet/httpresponsedata.h \
+	$$PWD/packet/retryrequestpacket.h \
+	$$PWD/packet/wscontrolpacket.h \
+	$$PWD/packet/statspacket.h \
+	$$PWD/packet/zrpcrequestpacket.h \
+	$$PWD/packet/zrpcresponsepacket.h
+
+SOURCES += \
+	$$PWD/packet/retryrequestpacket.cpp \
+	$$PWD/packet/wscontrolpacket.cpp \
+	$$PWD/packet/statspacket.cpp \
+	$$PWD/packet/zrpcrequestpacket.cpp \
+	$$PWD/packet/zrpcresponsepacket.cpp
+
+HEADERS += \
+	$$PWD/callback.h \
+	$$PWD/config.h \
+	$$PWD/timerwheel.h \
+	$$PWD/jwt.h \
+	$$PWD/rtimer.h \
+	$$PWD/logutil.h \
+	$$PWD/uuidutil.h \
+	$$PWD/zutil.h \
+	$$PWD/httprequest.h \
+	$$PWD/websocket.h \
+	$$PWD/zhttpmanager.h \
+	$$PWD/zhttprequest.h \
+	$$PWD/zwebsocket.h \
+	$$PWD/zrpcmanager.h \
+	$$PWD/zrpcrequest.h \
+	$$PWD/statusreasons.h \
+	$$PWD/inspectdata.h \
+	$$PWD/cors.h \
+	$$PWD/simplehttpserver.h \
+	$$PWD/stats.h \
+	$$PWD/statsmanager.h \
+	$$PWD/settings.h
+
+SOURCES += \
+	$$PWD/config.cpp \
+	$$PWD/timerwheel.cpp \
+	$$PWD/jwt.cpp \
+	$$PWD/rtimer.cpp \
+	$$PWD/logutil.cpp \
+	$$PWD/uuidutil.cpp \
+	$$PWD/zutil.cpp \
+	$$PWD/zhttpmanager.cpp \
+	$$PWD/zhttprequest.cpp \
+	$$PWD/zwebsocket.cpp \
+	$$PWD/zrpcmanager.cpp \
+	$$PWD/zrpcrequest.cpp \
+	$$PWD/statusreasons.cpp \
+	$$PWD/cors.cpp \
+	$$PWD/simplehttpserver.cpp \
+	$$PWD/stats.cpp \
+	$$PWD/statsmanager.cpp \
+	$$PWD/settings.cpp
diff --git a/src/core/tests.pri b/src/core/tests.pri
new file mode 100644
index 00000000..39130029
--- /dev/null
+++ b/src/core/tests.pri
@@ -0,0 +1,6 @@
+INCLUDES += \
+	$$PWD/coretests.h
+
+SOURCES += \
+	$$PWD/httpheaderstest.cpp \
+	$$PWD/jwttest.cpp
diff --git a/src/cpp.pri b/src/cpp.pri
deleted file mode 100644
index 52854605..00000000
--- a/src/cpp.pri
+++ /dev/null
@@ -1,250 +0,0 @@
-QMAKE_CXXFLAGS += $$(CXXFLAGS)
-QMAKE_CFLAGS += $$(CFLAGS)
-QMAKE_LFLAGS += $$(LDFLAGS)
-
-INCLUDEPATH += $$PWD/../target/include
-
-SRC_DIR = $$PWD
-QZMQ_DIR = $$SRC_DIR/core/qzmq
-
-INCLUDEPATH += $$SRC_DIR/core
-INCLUDEPATH += $$QZMQ_DIR/src
-include($$QZMQ_DIR/src/src.pri)
-
-CSRC_DIR = $$SRC_DIR/core
-
-DEFINES += NO_IRISNET
-HEADERS += $$CSRC_DIR/processquit.h
-SOURCES += $$CSRC_DIR/processquit.cpp
-
-HEADERS += \
-	$$CSRC_DIR/tnetstring.h \
-	$$CSRC_DIR/httpheaders.h \
-	$$CSRC_DIR/zhttprequestpacket.h \
-	$$CSRC_DIR/zhttpresponsepacket.h \
-	$$CSRC_DIR/log.h \
-	$$CSRC_DIR/bufferlist.h \
-	$$CSRC_DIR/layertracker.h
-
-SOURCES += \
-	$$CSRC_DIR/tnetstring.cpp \
-	$$CSRC_DIR/httpheaders.cpp \
-	$$CSRC_DIR/zhttprequestpacket.cpp \
-	$$CSRC_DIR/zhttpresponsepacket.cpp \
-	$$CSRC_DIR/log.cpp \
-	$$CSRC_DIR/bufferlist.cpp \
-	$$CSRC_DIR/layertracker.cpp
-
-HEADERS += \
-	$$CSRC_DIR/packet/httprequestdata.h \
-	$$CSRC_DIR/packet/httpresponsedata.h \
-	$$CSRC_DIR/packet/retryrequestpacket.h \
-	$$CSRC_DIR/packet/wscontrolpacket.h \
-	$$CSRC_DIR/packet/statspacket.h \
-	$$CSRC_DIR/packet/zrpcrequestpacket.h \
-	$$CSRC_DIR/packet/zrpcresponsepacket.h
-
-SOURCES += \
-	$$CSRC_DIR/packet/retryrequestpacket.cpp \
-	$$CSRC_DIR/packet/wscontrolpacket.cpp \
-	$$CSRC_DIR/packet/statspacket.cpp \
-	$$CSRC_DIR/packet/zrpcrequestpacket.cpp \
-	$$CSRC_DIR/packet/zrpcresponsepacket.cpp
-
-HEADERS += \
-	$$CSRC_DIR/callback.h \
-	$$CSRC_DIR/config.h \
-	$$CSRC_DIR/timerwheel.h \
-	$$CSRC_DIR/jwt.h \
-	$$CSRC_DIR/rtimer.h \
-	$$CSRC_DIR/logutil.h \
-	$$CSRC_DIR/uuidutil.h \
-	$$CSRC_DIR/zutil.h \
-	$$CSRC_DIR/httprequest.h \
-	$$CSRC_DIR/websocket.h \
-	$$CSRC_DIR/zhttpmanager.h \
-	$$CSRC_DIR/zhttprequest.h \
-	$$CSRC_DIR/zwebsocket.h \
-	$$CSRC_DIR/zrpcmanager.h \
-	$$CSRC_DIR/zrpcrequest.h \
-	$$CSRC_DIR/statusreasons.h \
-	$$CSRC_DIR/inspectdata.h \
-	$$CSRC_DIR/cors.h \
-	$$CSRC_DIR/simplehttpserver.h \
-	$$CSRC_DIR/stats.h \
-	$$CSRC_DIR/statsmanager.h \
-	$$CSRC_DIR/settings.h
-
-SOURCES += \
-	$$CSRC_DIR/config.cpp \
-	$$CSRC_DIR/timerwheel.cpp \
-	$$CSRC_DIR/jwt.cpp \
-	$$CSRC_DIR/rtimer.cpp \
-	$$CSRC_DIR/logutil.cpp \
-	$$CSRC_DIR/uuidutil.cpp \
-	$$CSRC_DIR/zutil.cpp \
-	$$CSRC_DIR/zhttpmanager.cpp \
-	$$CSRC_DIR/zhttprequest.cpp \
-	$$CSRC_DIR/zwebsocket.cpp \
-	$$CSRC_DIR/zrpcmanager.cpp \
-	$$CSRC_DIR/zrpcrequest.cpp \
-	$$CSRC_DIR/statusreasons.cpp \
-	$$CSRC_DIR/cors.cpp \
-	$$CSRC_DIR/simplehttpserver.cpp \
-	$$CSRC_DIR/stats.cpp \
-	$$CSRC_DIR/statsmanager.cpp \
-	$$CSRC_DIR/settings.cpp
-
-PSRC_DIR = $$SRC_DIR/proxy
-
-HEADERS += \
-	$$PSRC_DIR/testhttprequest.h \
-	$$PSRC_DIR/testwebsocket.h \
-	$$PSRC_DIR/websocketoverhttp.h \
-	$$PSRC_DIR/zrpcchecker.h \
-	$$PSRC_DIR/sockjsmanager.h \
-	$$PSRC_DIR/sockjssession.h \
-	$$PSRC_DIR/inspectrequest.h \
-	$$PSRC_DIR/acceptrequest.h \
-	$$PSRC_DIR/connectionmanager.h \
-	$$PSRC_DIR/wscontrolmanager.h \
-	$$PSRC_DIR/wscontrolsession.h \
-	$$PSRC_DIR/acceptdata.h \
-	$$PSRC_DIR/routesfile.h \
-	$$PSRC_DIR/domainmap.h \
-	$$PSRC_DIR/zroutes.h \
-	$$PSRC_DIR/xffrule.h \
-	$$PSRC_DIR/requestsession.h \
-	$$PSRC_DIR/proxyutil.h \
-	$$PSRC_DIR/proxysession.h \
-	$$PSRC_DIR/wsproxysession.h \
-	$$PSRC_DIR/updater.h \
-	$$PSRC_DIR/engine.h \
-	$$PSRC_DIR/app.h \
-	$$PSRC_DIR/main.h
-
-SOURCES += \
-	$$PSRC_DIR/testhttprequest.cpp \
-	$$PSRC_DIR/testwebsocket.cpp \
-	$$PSRC_DIR/websocketoverhttp.cpp \
-	$$PSRC_DIR/zrpcchecker.cpp \
-	$$PSRC_DIR/sockjsmanager.cpp \
-	$$PSRC_DIR/sockjssession.cpp \
-	$$PSRC_DIR/inspectrequest.cpp \
-	$$PSRC_DIR/acceptrequest.cpp \
-	$$PSRC_DIR/connectionmanager.cpp \
-	$$PSRC_DIR/wscontrolmanager.cpp \
-	$$PSRC_DIR/wscontrolsession.cpp \
-	$$PSRC_DIR/routesfile.cpp \
-	$$PSRC_DIR/domainmap.cpp \
-	$$PSRC_DIR/zroutes.cpp \
-	$$PSRC_DIR/requestsession.cpp \
-	$$PSRC_DIR/proxyutil.cpp \
-	$$PSRC_DIR/proxysession.cpp \
-	$$PSRC_DIR/wsproxysession.cpp \
-	$$PSRC_DIR/updater.cpp \
-	$$PSRC_DIR/engine.cpp \
-	$$PSRC_DIR/app.cpp \
-	$$PSRC_DIR/main.cpp
-
-HSRC_DIR = $$SRC_DIR/handler
-
-HEADERS += \
-	$$HSRC_DIR/deferred.h \
-	$$HSRC_DIR/variantutil.h \
-	$$HSRC_DIR/jsonpointer.h \
-	$$HSRC_DIR/jsonpatch.h \
-	$$HSRC_DIR/detectrule.h \
-	$$HSRC_DIR/lastids.h \
-	$$HSRC_DIR/cidset.h \
-	$$HSRC_DIR/sessionrequest.h \
-	$$HSRC_DIR/requeststate.h \
-	$$HSRC_DIR/wscontrolmessage.h \
-	$$HSRC_DIR/publishformat.h \
-	$$HSRC_DIR/publishitem.h \
-	$$HSRC_DIR/instruct.h \
-	$$HSRC_DIR/format.h \
-	$$HSRC_DIR/idformat.h \
-	$$HSRC_DIR/httpsession.h \
-	$$HSRC_DIR/httpsessionupdatemanager.h \
-	$$HSRC_DIR/wssession.h \
-	$$HSRC_DIR/publishlastids.h \
-	$$HSRC_DIR/controlrequest.h \
-	$$HSRC_DIR/conncheckworker.h \
-	$$HSRC_DIR/refreshworker.h \
-	$$HSRC_DIR/ratelimiter.h \
-	$$HSRC_DIR/sequencer.h \
-	$$HSRC_DIR/filter.h \
-	$$HSRC_DIR/filterstack.h \
-	$$HSRC_DIR/handlerengine.h \
-	$$HSRC_DIR/handlerapp.h \
-	$$HSRC_DIR/main.h
-
-SOURCES += \
-	$$HSRC_DIR/deferred.cpp \
-	$$HSRC_DIR/variantutil.cpp \
-	$$HSRC_DIR/jsonpointer.cpp \
-	$$HSRC_DIR/jsonpatch.cpp \
-	$$HSRC_DIR/sessionrequest.cpp \
-	$$HSRC_DIR/requeststate.cpp \
-	$$HSRC_DIR/wscontrolmessage.cpp \
-	$$HSRC_DIR/publishformat.cpp \
-	$$HSRC_DIR/publishitem.cpp \
-	$$HSRC_DIR/instruct.cpp \
-	$$HSRC_DIR/format.cpp \
-	$$HSRC_DIR/idformat.cpp \
-	$$HSRC_DIR/httpsession.cpp \
-	$$HSRC_DIR/httpsessionupdatemanager.cpp \
-	$$HSRC_DIR/wssession.cpp \
-	$$HSRC_DIR/publishlastids.cpp \
-	$$HSRC_DIR/controlrequest.cpp \
-	$$HSRC_DIR/conncheckworker.cpp \
-	$$HSRC_DIR/refreshworker.cpp \
-	$$HSRC_DIR/ratelimiter.cpp \
-	$$HSRC_DIR/sequencer.cpp \
-	$$HSRC_DIR/filter.cpp \
-	$$HSRC_DIR/filterstack.cpp \
-	$$HSRC_DIR/handlerengine.cpp \
-	$$HSRC_DIR/handlerapp.cpp \
-	$$HSRC_DIR/handlermain.cpp
-
-MSRC_DIR = $$SRC_DIR/m2adapter
-
-HEADERS += \
-	$$MSRC_DIR/m2requestpacket.h \
-        $$MSRC_DIR/m2responsepacket.h \
-        $$MSRC_DIR/m2adapterapp.h \
-	$$MSRC_DIR/main.h
-
-SOURCES += \
-	$$MSRC_DIR/m2requestpacket.cpp \
-	$$MSRC_DIR/m2responsepacket.cpp \
-	$$MSRC_DIR/m2adapterapp.cpp \
-	$$MSRC_DIR/m2adaptermain.cpp
-
-RSRC_DIR = $$SRC_DIR/runner
-
-HEADERS += \
-	$$RSRC_DIR/template.h \
-	$$RSRC_DIR/service.h \
-	$$RSRC_DIR/listenport.h \
-	$$RSRC_DIR/connmgrservice.h \
-	$$RSRC_DIR/mongrel2service.h \
-	$$RSRC_DIR/m2adapterservice.h \
-	$$RSRC_DIR/zurlservice.h \
-	$$RSRC_DIR/pushpinproxyservice.h \
-	$$RSRC_DIR/pushpinhandlerservice.h \
-	$$RSRC_DIR/runnerapp.h \
-	$$RSRC_DIR/main.h
-
-SOURCES += \
-	$$RSRC_DIR/template.cpp \
-	$$RSRC_DIR/service.cpp \
-	$$RSRC_DIR/connmgrservice.cpp \
-	$$RSRC_DIR/mongrel2service.cpp \
-	$$RSRC_DIR/m2adapterservice.cpp \
-	$$RSRC_DIR/zurlservice.cpp \
-	$$RSRC_DIR/pushpinproxyservice.cpp \
-	$$RSRC_DIR/pushpinhandlerservice.cpp \
-	$$RSRC_DIR/runnerapp.cpp \
-	$$RSRC_DIR/runnermain.cpp
diff --git a/src/cpp.pro b/src/cpp.pro
index 00298452..e517395d 100644
--- a/src/cpp.pro
+++ b/src/cpp.pro
@@ -11,4 +11,21 @@ MOC_DIR = $$cpp_build_dir/moc
 OBJECTS_DIR = $$cpp_build_dir/obj
 
 include($$cpp_build_dir/conf.pri)
-include(cpp.pri)
+
+QMAKE_CXXFLAGS += $$(CXXFLAGS)
+QMAKE_CFLAGS += $$(CFLAGS)
+QMAKE_LFLAGS += $$(LDFLAGS)
+
+SRC_DIR = $$PWD
+
+DEFINES += NO_IRISNET
+
+INCLUDEPATH += $$SRC_DIR/../target/include
+INCLUDEPATH += $$SRC_DIR/core
+INCLUDEPATH += $$SRC_DIR/core/qzmq/src
+
+include(core/core.pri)
+include(m2adapter/m2adapter.pri)
+include(proxy/proxy.pri)
+include(handler/handler.pri)
+include(runner/runner.pri)
diff --git a/src/cpptests.pro b/src/cpptests.pro
index e8aba721..66a75d8b 100644
--- a/src/cpptests.pro
+++ b/src/cpptests.pro
@@ -10,36 +10,17 @@ cpp_build_dir = $$OUT_PWD
 MOC_DIR = $$cpp_build_dir/test-moc
 OBJECTS_DIR = $$cpp_build_dir/test-obj
 
-SRC_DIR = $$PWD
-QZMQ_DIR = $$SRC_DIR/core/qzmq
-
 include($$cpp_build_dir/conf.pri)
 
-INCLUDEPATH += $$SRC_DIR/core
-INCLUDEPATH += $$SRC_DIR/proxy
-INCLUDEPATH += $$SRC_DIR/handler
-INCLUDEPATH += $$SRC_DIR/runner
-
-INCLUDEPATH += $$PWD/../target/include
-INCLUDEPATH += $$QZMQ_DIR/src
+SRC_DIR = $$PWD
 
 DEFINES += NO_IRISNET
 
-INCLUDES += \
-	$$PWD/core/coretests.h \
-	$$PWD/proxy/proxytests.h \
-	$$PWD/handler/handlertests.h \
-	$$PWD/runner/runnertests.h
+INCLUDEPATH += $$SRC_DIR/../target/include
+INCLUDEPATH += $$SRC_DIR/core
+INCLUDEPATH += $$SRC_DIR/core/qzmq/src
 
-SOURCES += \
-	$$PWD/core/httpheaderstest.cpp \
-	$$PWD/core/jwttest.cpp \
-	$$PWD/proxy/routesfiletest.cpp \
-	$$PWD/proxy/proxyenginetest.cpp \
-	$$PWD/handler/jsonpatchtest.cpp \
-	$$PWD/handler/instructtest.cpp \
-	$$PWD/handler/idformattest.cpp \
-	$$PWD/handler/publishformattest.cpp \
-	$$PWD/handler/publishitemtest.cpp \
-	$$PWD/handler/handlerenginetest.cpp \
-	$$PWD/runner/templatetest.cpp
+include(core/tests.pri)
+include(proxy/tests.pri)
+include(handler/tests.pri)
+include(runner/tests.pri)
diff --git a/src/handler/handler.pri b/src/handler/handler.pri
new file mode 100644
index 00000000..040eac76
--- /dev/null
+++ b/src/handler/handler.pri
@@ -0,0 +1,58 @@
+HEADERS += \
+	$$PWD/deferred.h \
+	$$PWD/variantutil.h \
+	$$PWD/jsonpointer.h \
+	$$PWD/jsonpatch.h \
+	$$PWD/detectrule.h \
+	$$PWD/lastids.h \
+	$$PWD/cidset.h \
+	$$PWD/sessionrequest.h \
+	$$PWD/requeststate.h \
+	$$PWD/wscontrolmessage.h \
+	$$PWD/publishformat.h \
+	$$PWD/publishitem.h \
+	$$PWD/instruct.h \
+	$$PWD/format.h \
+	$$PWD/idformat.h \
+	$$PWD/httpsession.h \
+	$$PWD/httpsessionupdatemanager.h \
+	$$PWD/wssession.h \
+	$$PWD/publishlastids.h \
+	$$PWD/controlrequest.h \
+	$$PWD/conncheckworker.h \
+	$$PWD/refreshworker.h \
+	$$PWD/ratelimiter.h \
+	$$PWD/sequencer.h \
+	$$PWD/filter.h \
+	$$PWD/filterstack.h \
+	$$PWD/handlerengine.h \
+	$$PWD/handlerapp.h \
+	$$PWD/main.h
+
+SOURCES += \
+	$$PWD/deferred.cpp \
+	$$PWD/variantutil.cpp \
+	$$PWD/jsonpointer.cpp \
+	$$PWD/jsonpatch.cpp \
+	$$PWD/sessionrequest.cpp \
+	$$PWD/requeststate.cpp \
+	$$PWD/wscontrolmessage.cpp \
+	$$PWD/publishformat.cpp \
+	$$PWD/publishitem.cpp \
+	$$PWD/instruct.cpp \
+	$$PWD/format.cpp \
+	$$PWD/idformat.cpp \
+	$$PWD/httpsession.cpp \
+	$$PWD/httpsessionupdatemanager.cpp \
+	$$PWD/wssession.cpp \
+	$$PWD/publishlastids.cpp \
+	$$PWD/controlrequest.cpp \
+	$$PWD/conncheckworker.cpp \
+	$$PWD/refreshworker.cpp \
+	$$PWD/ratelimiter.cpp \
+	$$PWD/sequencer.cpp \
+	$$PWD/filter.cpp \
+	$$PWD/filterstack.cpp \
+	$$PWD/handlerengine.cpp \
+	$$PWD/handlerapp.cpp \
+	$$PWD/handlermain.cpp
diff --git a/src/handler/tests.pri b/src/handler/tests.pri
new file mode 100644
index 00000000..412617e6
--- /dev/null
+++ b/src/handler/tests.pri
@@ -0,0 +1,10 @@
+INCLUDES += \
+	$$PWD/handlertests.h
+
+SOURCES += \
+	$$PWD/jsonpatchtest.cpp \
+	$$PWD/instructtest.cpp \
+	$$PWD/idformattest.cpp \
+	$$PWD/publishformattest.cpp \
+	$$PWD/publishitemtest.cpp \
+	$$PWD/handlerenginetest.cpp
diff --git a/src/m2adapter/m2adapter.pri b/src/m2adapter/m2adapter.pri
new file mode 100644
index 00000000..5b1376b5
--- /dev/null
+++ b/src/m2adapter/m2adapter.pri
@@ -0,0 +1,11 @@
+HEADERS += \
+	$$PWD/m2requestpacket.h \
+	$$PWD/m2responsepacket.h \
+	$$PWD/m2adapterapp.h \
+	$$PWD/main.h
+
+SOURCES += \
+	$$PWD/m2requestpacket.cpp \
+	$$PWD/m2responsepacket.cpp \
+	$$PWD/m2adapterapp.cpp \
+	$$PWD/m2adaptermain.cpp
diff --git a/src/proxy/proxy.pri b/src/proxy/proxy.pri
new file mode 100644
index 00000000..d04820c1
--- /dev/null
+++ b/src/proxy/proxy.pri
@@ -0,0 +1,49 @@
+HEADERS += \
+	$$PWD/testhttprequest.h \
+	$$PWD/testwebsocket.h \
+	$$PWD/websocketoverhttp.h \
+	$$PWD/zrpcchecker.h \
+	$$PWD/sockjsmanager.h \
+	$$PWD/sockjssession.h \
+	$$PWD/inspectrequest.h \
+	$$PWD/acceptrequest.h \
+	$$PWD/connectionmanager.h \
+	$$PWD/wscontrolmanager.h \
+	$$PWD/wscontrolsession.h \
+	$$PWD/acceptdata.h \
+	$$PWD/routesfile.h \
+	$$PWD/domainmap.h \
+	$$PWD/zroutes.h \
+	$$PWD/xffrule.h \
+	$$PWD/requestsession.h \
+	$$PWD/proxyutil.h \
+	$$PWD/proxysession.h \
+	$$PWD/wsproxysession.h \
+	$$PWD/updater.h \
+	$$PWD/engine.h \
+	$$PWD/app.h \
+	$$PWD/main.h
+
+SOURCES += \
+	$$PWD/testhttprequest.cpp \
+	$$PWD/testwebsocket.cpp \
+	$$PWD/websocketoverhttp.cpp \
+	$$PWD/zrpcchecker.cpp \
+	$$PWD/sockjsmanager.cpp \
+	$$PWD/sockjssession.cpp \
+	$$PWD/inspectrequest.cpp \
+	$$PWD/acceptrequest.cpp \
+	$$PWD/connectionmanager.cpp \
+	$$PWD/wscontrolmanager.cpp \
+	$$PWD/wscontrolsession.cpp \
+	$$PWD/routesfile.cpp \
+	$$PWD/domainmap.cpp \
+	$$PWD/zroutes.cpp \
+	$$PWD/requestsession.cpp \
+	$$PWD/proxyutil.cpp \
+	$$PWD/proxysession.cpp \
+	$$PWD/wsproxysession.cpp \
+	$$PWD/updater.cpp \
+	$$PWD/engine.cpp \
+	$$PWD/app.cpp \
+	$$PWD/main.cpp
diff --git a/src/proxy/tests.pri b/src/proxy/tests.pri
new file mode 100644
index 00000000..841cd836
--- /dev/null
+++ b/src/proxy/tests.pri
@@ -0,0 +1,6 @@
+INCLUDES += \
+	$$PWD/proxytests.h
+
+SOURCES += \
+	$$PWD/routesfiletest.cpp \
+	$$PWD/proxyenginetest.cpp
diff --git a/src/runner/runner.pri b/src/runner/runner.pri
new file mode 100644
index 00000000..24a7e197
--- /dev/null
+++ b/src/runner/runner.pri
@@ -0,0 +1,24 @@
+HEADERS += \
+	$$PWD/template.h \
+	$$PWD/service.h \
+	$$PWD/listenport.h \
+	$$PWD/connmgrservice.h \
+	$$PWD/mongrel2service.h \
+	$$PWD/m2adapterservice.h \
+	$$PWD/zurlservice.h \
+	$$PWD/pushpinproxyservice.h \
+	$$PWD/pushpinhandlerservice.h \
+	$$PWD/runnerapp.h \
+	$$PWD/main.h
+
+SOURCES += \
+	$$PWD/template.cpp \
+	$$PWD/service.cpp \
+	$$PWD/connmgrservice.cpp \
+	$$PWD/mongrel2service.cpp \
+	$$PWD/m2adapterservice.cpp \
+	$$PWD/zurlservice.cpp \
+	$$PWD/pushpinproxyservice.cpp \
+	$$PWD/pushpinhandlerservice.cpp \
+	$$PWD/runnerapp.cpp \
+	$$PWD/runnermain.cpp
diff --git a/src/runner/tests.pri b/src/runner/tests.pri
new file mode 100644
index 00000000..402323fa
--- /dev/null
+++ b/src/runner/tests.pri
@@ -0,0 +1,5 @@
+INCLUDES += \
+	$$PWD/runnertests.h
+
+SOURCES += \
+	$$PWD/templatetest.cpp