fastly · jkarneges · Nov 3, 2023 · Nov 2, 2023
diff --git a/.gitignore b/.gitignore
@@ -22,12 +22,12 @@ vendor
 /Makefile
 /src/config.h
 /src/Makefile
-/src/corelib/Makefile
-/src/corelib/corelib/Makefile
-/src/corelib/libpushpin-core.a
-/src/corelib/tests/Makefile
-/src/corelib/tests/*test/Makefile
-/src/corelib/tests/*test/*test
+/src/cpp/Makefile
+/src/cpp/cpp/Makefile
+/src/cpp/libpushpin-cpp.a
+/src/cpp/tests/Makefile
+/src/cpp/tests/*test/Makefile
+/src/cpp/tests/*test/*test
 /src/m2adapter/Makefile
 /src/proxy/Makefile
 /src/proxy/libpushpin-proxy/Makefile

diff --git a/package.sh b/package.sh
@@ -13,7 +13,6 @@ DESTDIR=build/pushpin-$VERSION
 mkdir -p $DESTDIR
 
 cp -a .gitignore build.rs Cargo.lock Cargo.toml CHANGELOG.md configure examples LICENSE pushpin.pro pushpin.qc qcm README.md src tools $DESTDIR
-rm -rf $DESTDIR/src/corelib/qzmq/.git $DESTDIR/src/corelib/common/.git
 
 sed -i -e "s/^version = .*/version = \"$VERSION\"/g" $DESTDIR/Cargo.toml
 

diff --git a/src/corelib/bufferlist.cpp → src/cpp/bufferlist.cpp b/src/corelib/bufferlist.cpp → src/cpp/bufferlist.cpp
diff --git a/src/corelib/bufferlist.h → src/cpp/bufferlist.h b/src/corelib/bufferlist.h → src/cpp/bufferlist.h
diff --git a/src/corelib/callback.h → src/cpp/callback.h b/src/corelib/callback.h → src/cpp/callback.h
diff --git a/src/corelib/cors.cpp → src/cpp/cors.cpp b/src/corelib/cors.cpp → src/cpp/cors.cpp
diff --git a/src/corelib/cors.h → src/cpp/cors.h b/src/corelib/cors.h → src/cpp/cors.h
diff --git a/src/corelib/corelib.pro → src/cpp/cpp.pro b/src/corelib/corelib.pro → src/cpp/cpp.pro
@@ -1,11 +1,11 @@
 TEMPLATE = subdirs
 
-corelib.subdir = corelib
+cpp.subdir = cpp
 tests.subdir = tests
-tests.depends = corelib
+tests.depends = cpp
 
 tests.CONFIG += no_default_install
 
 SUBDIRS += \
-	corelib \
+	cpp \
 	tests
diff --git a/src/corelib/corelib/corelib.pri → src/cpp/cpp/cpp.pri b/src/corelib/corelib/corelib.pri → src/cpp/cpp/cpp.pri
diff --git a/src/corelib/corelib/corelib.pro → src/cpp/cpp/cpp.pro b/src/corelib/corelib/corelib.pro → src/cpp/cpp/cpp.pro
@@ -3,12 +3,12 @@ CONFIG -= app_bundle
 CONFIG += staticlib
 QT -= gui
 QT += network
-TARGET = pushpin-core
+TARGET = pushpin-cpp
 DESTDIR = ..
 
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
 include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)
-include(corelib.pri)
+include(cpp.pri)
diff --git a/src/corelib/httpheaders.cpp → src/cpp/httpheaders.cpp b/src/corelib/httpheaders.cpp → src/cpp/httpheaders.cpp
diff --git a/src/corelib/httpheaders.h → src/cpp/httpheaders.h b/src/corelib/httpheaders.h → src/cpp/httpheaders.h
diff --git a/src/corelib/httprequest.h → src/cpp/httprequest.h b/src/corelib/httprequest.h → src/cpp/httprequest.h
diff --git a/src/corelib/inspectdata.h → src/cpp/inspectdata.h b/src/corelib/inspectdata.h → src/cpp/inspectdata.h
diff --git a/src/corelib/jwt.cpp → src/cpp/jwt.cpp b/src/corelib/jwt.cpp → src/cpp/jwt.cpp
diff --git a/src/corelib/jwt.h → src/cpp/jwt.h b/src/corelib/jwt.h → src/cpp/jwt.h
diff --git a/src/corelib/layertracker.cpp → src/cpp/layertracker.cpp b/src/corelib/layertracker.cpp → src/cpp/layertracker.cpp
diff --git a/src/corelib/layertracker.h → src/cpp/layertracker.h b/src/corelib/layertracker.h → src/cpp/layertracker.h
diff --git a/src/corelib/log.cpp → src/cpp/log.cpp b/src/corelib/log.cpp → src/cpp/log.cpp
diff --git a/src/corelib/log.h → src/cpp/log.h b/src/corelib/log.h → src/cpp/log.h
diff --git a/src/corelib/logutil.cpp → src/cpp/logutil.cpp b/src/corelib/logutil.cpp → src/cpp/logutil.cpp
diff --git a/src/corelib/logutil.h → src/cpp/logutil.h b/src/corelib/logutil.h → src/cpp/logutil.h
diff --git a/src/corelib/packet/httprequestdata.h → src/cpp/packet/httprequestdata.h b/src/corelib/packet/httprequestdata.h → src/cpp/packet/httprequestdata.h
diff --git a/src/corelib/packet/httpresponsedata.h → src/cpp/packet/httpresponsedata.h b/src/corelib/packet/httpresponsedata.h → src/cpp/packet/httpresponsedata.h
diff --git a/src/corelib/packet/retryrequestpacket.cpp → src/cpp/packet/retryrequestpacket.cpp b/src/corelib/packet/retryrequestpacket.cpp → src/cpp/packet/retryrequestpacket.cpp
diff --git a/src/corelib/packet/retryrequestpacket.h → src/cpp/packet/retryrequestpacket.h b/src/corelib/packet/retryrequestpacket.h → src/cpp/packet/retryrequestpacket.h
diff --git a/src/corelib/packet/statspacket.cpp → src/cpp/packet/statspacket.cpp b/src/corelib/packet/statspacket.cpp → src/cpp/packet/statspacket.cpp
diff --git a/src/corelib/packet/statspacket.h → src/cpp/packet/statspacket.h b/src/corelib/packet/statspacket.h → src/cpp/packet/statspacket.h
diff --git a/src/corelib/packet/wscontrolpacket.cpp → src/cpp/packet/wscontrolpacket.cpp b/src/corelib/packet/wscontrolpacket.cpp → src/cpp/packet/wscontrolpacket.cpp
diff --git a/src/corelib/packet/wscontrolpacket.h → src/cpp/packet/wscontrolpacket.h b/src/corelib/packet/wscontrolpacket.h → src/cpp/packet/wscontrolpacket.h
diff --git a/src/corelib/packet/zrpcrequestpacket.cpp → src/cpp/packet/zrpcrequestpacket.cpp b/src/corelib/packet/zrpcrequestpacket.cpp → src/cpp/packet/zrpcrequestpacket.cpp
diff --git a/src/corelib/packet/zrpcrequestpacket.h → src/cpp/packet/zrpcrequestpacket.h b/src/corelib/packet/zrpcrequestpacket.h → src/cpp/packet/zrpcrequestpacket.h
diff --git a/src/corelib/packet/zrpcresponsepacket.cpp → src/cpp/packet/zrpcresponsepacket.cpp b/src/corelib/packet/zrpcresponsepacket.cpp → src/cpp/packet/zrpcresponsepacket.cpp
diff --git a/src/corelib/packet/zrpcresponsepacket.h → src/cpp/packet/zrpcresponsepacket.h b/src/corelib/packet/zrpcresponsepacket.h → src/cpp/packet/zrpcresponsepacket.h
diff --git a/src/corelib/processquit.cpp → src/cpp/processquit.cpp b/src/corelib/processquit.cpp → src/cpp/processquit.cpp
diff --git a/src/corelib/processquit.h → src/cpp/processquit.h b/src/corelib/processquit.h → src/cpp/processquit.h
diff --git a/src/corelib/qzmq/.gitignore → src/cpp/qzmq/.gitignore b/src/corelib/qzmq/.gitignore → src/cpp/qzmq/.gitignore
diff --git a/src/corelib/qzmq/COPYING → src/cpp/qzmq/COPYING b/src/corelib/qzmq/COPYING → src/cpp/qzmq/COPYING
diff --git a/src/corelib/qzmq/README → src/cpp/qzmq/README b/src/corelib/qzmq/README → src/cpp/qzmq/README
diff --git a/src/corelib/qzmq/examples/examples.pri → src/cpp/qzmq/examples/examples.pri b/src/corelib/qzmq/examples/examples.pri → src/cpp/qzmq/examples/examples.pri
diff --git a/src/corelib/qzmq/examples/examples.pro → src/cpp/qzmq/examples/examples.pro b/src/corelib/qzmq/examples/examples.pro → src/cpp/qzmq/examples/examples.pro
diff --git a/...qzmq/examples/helloclient/helloclient.cpp → ...qzmq/examples/helloclient/helloclient.cpp b/...qzmq/examples/helloclient/helloclient.cpp → ...qzmq/examples/helloclient/helloclient.cpp
diff --git a/...qzmq/examples/helloclient/helloclient.pro → ...qzmq/examples/helloclient/helloclient.pro b/...qzmq/examples/helloclient/helloclient.pro → ...qzmq/examples/helloclient/helloclient.pro
diff --git a/...qzmq/examples/helloserver/helloserver.cpp → ...qzmq/examples/helloserver/helloserver.cpp b/...qzmq/examples/helloserver/helloserver.cpp → ...qzmq/examples/helloserver/helloserver.cpp
diff --git a/...qzmq/examples/helloserver/helloserver.pro → ...qzmq/examples/helloserver/helloserver.pro b/...qzmq/examples/helloserver/helloserver.pro → ...qzmq/examples/helloserver/helloserver.pro
diff --git a/src/corelib/qzmq/qzmq.pro → src/cpp/qzmq/qzmq.pro b/src/corelib/qzmq/qzmq.pro → src/cpp/qzmq/qzmq.pro
diff --git a/src/corelib/qzmq/src/qzmqcontext.cpp → src/cpp/qzmq/src/qzmqcontext.cpp b/src/corelib/qzmq/src/qzmqcontext.cpp → src/cpp/qzmq/src/qzmqcontext.cpp
diff --git a/src/corelib/qzmq/src/qzmqcontext.h → src/cpp/qzmq/src/qzmqcontext.h b/src/corelib/qzmq/src/qzmqcontext.h → src/cpp/qzmq/src/qzmqcontext.h
diff --git a/src/corelib/qzmq/src/qzmqreprouter.cpp → src/cpp/qzmq/src/qzmqreprouter.cpp b/src/corelib/qzmq/src/qzmqreprouter.cpp → src/cpp/qzmq/src/qzmqreprouter.cpp
diff --git a/src/corelib/qzmq/src/qzmqreprouter.h → src/cpp/qzmq/src/qzmqreprouter.h b/src/corelib/qzmq/src/qzmqreprouter.h → src/cpp/qzmq/src/qzmqreprouter.h
diff --git a/src/corelib/qzmq/src/qzmqreqmessage.h → src/cpp/qzmq/src/qzmqreqmessage.h b/src/corelib/qzmq/src/qzmqreqmessage.h → src/cpp/qzmq/src/qzmqreqmessage.h
diff --git a/src/corelib/qzmq/src/qzmqsocket.cpp → src/cpp/qzmq/src/qzmqsocket.cpp b/src/corelib/qzmq/src/qzmqsocket.cpp → src/cpp/qzmq/src/qzmqsocket.cpp
diff --git a/src/corelib/qzmq/src/qzmqsocket.h → src/cpp/qzmq/src/qzmqsocket.h b/src/corelib/qzmq/src/qzmqsocket.h → src/cpp/qzmq/src/qzmqsocket.h
diff --git a/src/corelib/qzmq/src/qzmqvalve.cpp → src/cpp/qzmq/src/qzmqvalve.cpp b/src/corelib/qzmq/src/qzmqvalve.cpp → src/cpp/qzmq/src/qzmqvalve.cpp
diff --git a/src/corelib/qzmq/src/qzmqvalve.h → src/cpp/qzmq/src/qzmqvalve.h b/src/corelib/qzmq/src/qzmqvalve.h → src/cpp/qzmq/src/qzmqvalve.h
diff --git a/src/corelib/qzmq/src/src.pri → src/cpp/qzmq/src/src.pri b/src/corelib/qzmq/src/src.pri → src/cpp/qzmq/src/src.pri
diff --git a/src/corelib/rtimer.cpp → src/cpp/rtimer.cpp b/src/corelib/rtimer.cpp → src/cpp/rtimer.cpp
diff --git a/src/corelib/rtimer.h → src/cpp/rtimer.h b/src/corelib/rtimer.h → src/cpp/rtimer.h
diff --git a/src/corelib/settings.cpp → src/cpp/settings.cpp b/src/corelib/settings.cpp → src/cpp/settings.cpp
diff --git a/src/corelib/settings.h → src/cpp/settings.h b/src/corelib/settings.h → src/cpp/settings.h
diff --git a/src/corelib/simplehttpserver.cpp → src/cpp/simplehttpserver.cpp b/src/corelib/simplehttpserver.cpp → src/cpp/simplehttpserver.cpp
diff --git a/src/corelib/simplehttpserver.h → src/cpp/simplehttpserver.h b/src/corelib/simplehttpserver.h → src/cpp/simplehttpserver.h
diff --git a/src/corelib/stats.cpp → src/cpp/stats.cpp b/src/corelib/stats.cpp → src/cpp/stats.cpp
diff --git a/src/corelib/stats.h → src/cpp/stats.h b/src/corelib/stats.h → src/cpp/stats.h
diff --git a/src/corelib/statsmanager.cpp → src/cpp/statsmanager.cpp b/src/corelib/statsmanager.cpp → src/cpp/statsmanager.cpp
diff --git a/src/corelib/statsmanager.h → src/cpp/statsmanager.h b/src/corelib/statsmanager.h → src/cpp/statsmanager.h
diff --git a/src/corelib/statusreasons.cpp → src/cpp/statusreasons.cpp b/src/corelib/statusreasons.cpp → src/cpp/statusreasons.cpp
diff --git a/src/corelib/statusreasons.h → src/cpp/statusreasons.h b/src/corelib/statusreasons.h → src/cpp/statusreasons.h
diff --git a/...tests/httpheaderstest/httpheaderstest.cpp → ...tests/httpheaderstest/httpheaderstest.cpp b/...tests/httpheaderstest/httpheaderstest.cpp → ...tests/httpheaderstest/httpheaderstest.cpp
diff --git a/...tests/httpheaderstest/httpheaderstest.pro → ...tests/httpheaderstest/httpheaderstest.pro b/...tests/httpheaderstest/httpheaderstest.pro → ...tests/httpheaderstest/httpheaderstest.pro
diff --git a/src/corelib/tests/jwttest/jwttest.cpp → src/cpp/tests/jwttest/jwttest.cpp b/src/corelib/tests/jwttest/jwttest.cpp → src/cpp/tests/jwttest/jwttest.cpp
diff --git a/src/corelib/tests/jwttest/jwttest.pro → src/cpp/tests/jwttest/jwttest.pro b/src/corelib/tests/jwttest/jwttest.pro → src/cpp/tests/jwttest/jwttest.pro
diff --git a/src/corelib/tests/tests.pri → src/cpp/tests/tests.pri b/src/corelib/tests/tests.pri → src/cpp/tests/tests.pri
@@ -8,8 +8,8 @@ SRC_DIR = $$PWD/..
 QZMQ_DIR = $$SRC_DIR/qzmq
 RUST_DIR = $$SRC_DIR/../rust
 
-LIBS += -L$$SRC_DIR -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../libpushpin-core.a
+LIBS += -L$$SRC_DIR -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../libpushpin-cpp.a
 
 include($$PWD/../../rust/lib.pri)
 include($$PWD/../../../conf.pri)

diff --git a/src/corelib/tests/tests.pro → src/cpp/tests/tests.pro b/src/corelib/tests/tests.pro → src/cpp/tests/tests.pro
diff --git a/src/corelib/timerwheel.cpp → src/cpp/timerwheel.cpp b/src/corelib/timerwheel.cpp → src/cpp/timerwheel.cpp
diff --git a/src/corelib/timerwheel.h → src/cpp/timerwheel.h b/src/corelib/timerwheel.h → src/cpp/timerwheel.h
diff --git a/src/corelib/tnetstring.cpp → src/cpp/tnetstring.cpp b/src/corelib/tnetstring.cpp → src/cpp/tnetstring.cpp
diff --git a/src/corelib/tnetstring.h → src/cpp/tnetstring.h b/src/corelib/tnetstring.h → src/cpp/tnetstring.h
diff --git a/src/corelib/uuidutil.cpp → src/cpp/uuidutil.cpp b/src/corelib/uuidutil.cpp → src/cpp/uuidutil.cpp
diff --git a/src/corelib/uuidutil.h → src/cpp/uuidutil.h b/src/corelib/uuidutil.h → src/cpp/uuidutil.h
diff --git a/src/corelib/websocket.h → src/cpp/websocket.h b/src/corelib/websocket.h → src/cpp/websocket.h
diff --git a/src/corelib/wscontrol.h → src/cpp/wscontrol.h b/src/corelib/wscontrol.h → src/cpp/wscontrol.h
diff --git a/src/corelib/zhttpmanager.cpp → src/cpp/zhttpmanager.cpp b/src/corelib/zhttpmanager.cpp → src/cpp/zhttpmanager.cpp
diff --git a/src/corelib/zhttpmanager.h → src/cpp/zhttpmanager.h b/src/corelib/zhttpmanager.h → src/cpp/zhttpmanager.h
diff --git a/src/corelib/zhttprequest.cpp → src/cpp/zhttprequest.cpp b/src/corelib/zhttprequest.cpp → src/cpp/zhttprequest.cpp
diff --git a/src/corelib/zhttprequest.h → src/cpp/zhttprequest.h b/src/corelib/zhttprequest.h → src/cpp/zhttprequest.h
diff --git a/src/corelib/zhttprequestpacket.cpp → src/cpp/zhttprequestpacket.cpp b/src/corelib/zhttprequestpacket.cpp → src/cpp/zhttprequestpacket.cpp
diff --git a/src/corelib/zhttprequestpacket.h → src/cpp/zhttprequestpacket.h b/src/corelib/zhttprequestpacket.h → src/cpp/zhttprequestpacket.h
diff --git a/src/corelib/zhttpresponsepacket.cpp → src/cpp/zhttpresponsepacket.cpp b/src/corelib/zhttpresponsepacket.cpp → src/cpp/zhttpresponsepacket.cpp
diff --git a/src/corelib/zhttpresponsepacket.h → src/cpp/zhttpresponsepacket.h b/src/corelib/zhttpresponsepacket.h → src/cpp/zhttpresponsepacket.h
diff --git a/src/corelib/zrpcmanager.cpp → src/cpp/zrpcmanager.cpp b/src/corelib/zrpcmanager.cpp → src/cpp/zrpcmanager.cpp
diff --git a/src/corelib/zrpcmanager.h → src/cpp/zrpcmanager.h b/src/corelib/zrpcmanager.h → src/cpp/zrpcmanager.h
diff --git a/src/corelib/zrpcrequest.cpp → src/cpp/zrpcrequest.cpp b/src/corelib/zrpcrequest.cpp → src/cpp/zrpcrequest.cpp
diff --git a/src/corelib/zrpcrequest.h → src/cpp/zrpcrequest.h b/src/corelib/zrpcrequest.h → src/cpp/zrpcrequest.h
diff --git a/src/corelib/zutil.cpp → src/cpp/zutil.cpp b/src/corelib/zutil.cpp → src/cpp/zutil.cpp
diff --git a/src/corelib/zutil.h → src/cpp/zutil.h b/src/corelib/zutil.h → src/cpp/zutil.h
diff --git a/src/corelib/zwebsocket.cpp → src/cpp/zwebsocket.cpp b/src/corelib/zwebsocket.cpp → src/cpp/zwebsocket.cpp
diff --git a/src/corelib/zwebsocket.h → src/cpp/zwebsocket.h b/src/corelib/zwebsocket.h → src/cpp/zwebsocket.h
diff --git a/src/handler/libpushpin-handler/libpushpin-handler.pri b/src/handler/libpushpin-handler/libpushpin-handler.pri
@@ -3,11 +3,11 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 INCLUDEPATH += $$QZMQ_DIR/src
 

diff --git a/src/handler/libpushpin-handler/libpushpin-handler.pro b/src/handler/libpushpin-handler/libpushpin-handler.pro
@@ -9,8 +9,8 @@ DESTDIR = ..
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)

diff --git a/src/handler/pushpin-handler/pushpin-handler.pri b/src/handler/pushpin-handler/pushpin-handler.pri
@@ -3,11 +3,11 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET

diff --git a/src/handler/pushpin-handler/pushpin-handler.pro b/src/handler/pushpin-handler/pushpin-handler.pro
@@ -10,8 +10,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj
 LIBS += -L$$PWD/.. -lpushpin-handler
 PRE_TARGETDEPS += $$PWD/../libpushpin-handler.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)

diff --git a/src/handler/tests/tests.pri b/src/handler/tests/tests.pri
@@ -5,20 +5,20 @@ QT *= network testlib
 
 TESTS_DIR = $$PWD
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 
 LIBS += -L$$SRC_DIR -lpushpin-handler
 PRE_TARGETDEPS += $$PWD/../libpushpin-handler.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$PWD/../../rust/lib.pri)
 include($$PWD/../../../conf.pri)
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET
diff --git a/src/m2adapter/m2adapter.pri b/src/m2adapter/m2adapter.pri
@@ -1,7 +1,7 @@
-CORE_DIR = $$PWD/../corelib
-QZMQ_DIR = $$PWD/../corelib/qzmq
+CPP_DIR = $$PWD/../cpp
+QZMQ_DIR = $$PWD/../cpp/qzmq
 
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 INCLUDEPATH += $$QZMQ_DIR/src
 

diff --git a/src/m2adapter/m2adapter.pro b/src/m2adapter/m2adapter.pro
@@ -8,8 +8,8 @@ DESTDIR = ../../bin
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
-LIBS += -L$$PWD/../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../rust/lib.pri)
 include($$OUT_PWD/../../conf.pri)

diff --git a/src/proxy/libpushpin-proxy/libpushpin-proxy.pri b/src/proxy/libpushpin-proxy/libpushpin-proxy.pri
@@ -3,12 +3,12 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 RUST_DIR = $$SRC_DIR/../rust
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 INCLUDEPATH += $$QZMQ_DIR/src
 

diff --git a/src/proxy/libpushpin-proxy/libpushpin-proxy.pro b/src/proxy/libpushpin-proxy/libpushpin-proxy.pro
@@ -9,8 +9,8 @@ DESTDIR = ..
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)

diff --git a/src/proxy/pushpin-proxy/pushpin-proxy.pri b/src/proxy/pushpin-proxy/pushpin-proxy.pri
@@ -3,12 +3,12 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 RUST_DIR = $$SRC_DIR/../rust
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET

diff --git a/src/proxy/pushpin-proxy/pushpin-proxy.pro b/src/proxy/pushpin-proxy/pushpin-proxy.pro
@@ -11,8 +11,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj
 LIBS += -L$$PWD/.. -lpushpin-proxy
 PRE_TARGETDEPS += $$PWD/../libpushpin-proxy.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../rust/lib.pri)
 include($$OUT_PWD/../../../conf.pri)

diff --git a/src/proxy/tests/tests.pri b/src/proxy/tests/tests.pri
@@ -5,21 +5,21 @@ QT *= network testlib
 
 TESTS_DIR = $$PWD
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
-QZMQ_DIR = $$CORE_DIR/qzmq
+CPP_DIR = $$PWD/../../cpp
+QZMQ_DIR = $$CPP_DIR/qzmq
 RUST_DIR = $$SRC_DIR/../rust
 
 LIBS += -L$$SRC_DIR -lpushpin-proxy
 PRE_TARGETDEPS += $$PWD/../libpushpin-proxy.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$PWD/../../rust/lib.pri)
 include($$PWD/../../../conf.pri)
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 INCLUDEPATH += $$QZMQ_DIR/src
 
 DEFINES += NO_IRISNET

diff --git a/src/runner/librunner/librunner.pri b/src/runner/librunner/librunner.pri
@@ -3,10 +3,10 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
+CPP_DIR = $$PWD/../../cpp
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 DEFINES += NO_IRISNET
 

diff --git a/src/runner/librunner/librunner.pro b/src/runner/librunner/librunner.pro
@@ -9,8 +9,8 @@ DESTDIR = ..
 MOC_DIR = $$OUT_PWD/_moc
 OBJECTS_DIR = $$OUT_PWD/_obj
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../../conf.pri)
 include(librunner.pri)
diff --git a/src/runner/runner/runner.pri b/src/runner/runner/runner.pri
@@ -3,10 +3,10 @@ QMAKE_CFLAGS += $$(CFLAGS)
 QMAKE_LFLAGS += $$(LDFLAGS)
 
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
+CPP_DIR = $$PWD/../../cpp
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 DEFINES += NO_IRISNET
 

diff --git a/src/runner/runner/runner.pro b/src/runner/runner/runner.pro
@@ -11,8 +11,8 @@ OBJECTS_DIR = $$OUT_PWD/_obj
 LIBS += -L$$PWD/.. -lrunner
 PRE_TARGETDEPS += $$PWD/../librunner.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$OUT_PWD/../../../conf.pri)
 include(runner.pri)

diff --git a/src/runner/tests/tests.pri b/src/runner/tests/tests.pri
@@ -5,17 +5,17 @@ QT *= network testlib
 
 TESTS_DIR = $$PWD
 SRC_DIR = $$PWD/..
-CORE_DIR = $$PWD/../../corelib
+CPP_DIR = $$PWD/../../cpp
 
 LIBS += -L$$SRC_DIR -lrunner
 PRE_TARGETDEPS += $$PWD/../librunner.a
 
-LIBS += -L$$PWD/../../corelib -lpushpin-core
-PRE_TARGETDEPS += $$PWD/../../corelib/libpushpin-core.a
+LIBS += -L$$PWD/../../cpp -lpushpin-cpp
+PRE_TARGETDEPS += $$PWD/../../cpp/libpushpin-cpp.a
 
 include($$PWD/../../../conf.pri)
 
 INCLUDEPATH += $$SRC_DIR
-INCLUDEPATH += $$CORE_DIR
+INCLUDEPATH += $$CPP_DIR
 
 DEFINES += NO_IRISNET
diff --git a/src/src.pro b/src/src.pro
@@ -4,26 +4,26 @@ include($$OUT_PWD/../conf.pri)
 
 rust.subdir = rust
 
-corelib.subdir = corelib
-corelib.depends = rust
+cpp.subdir = cpp
+cpp.depends = rust
 
 m2adapter.subdir = m2adapter
-m2adapter.depends = corelib
+m2adapter.depends = cpp
 
 proxy.subdir = proxy
-proxy.depends = corelib
+proxy.depends = cpp
 
 handler.subdir = handler
-handler.depends = corelib
+handler.depends = cpp
 
 runner.subdir = runner
-runner.depends = corelib
+runner.depends = cpp
 
 pushpin.subdir = pushpin
 
 SUBDIRS += \
 	rust \
-	corelib \
+	cpp \
 	m2adapter \
 	proxy \
 	handler \