diff --git a/ws/CMakeLists.txt b/ws/CMakeLists.txt
index e231a322..94c7673d 100644
--- a/ws/CMakeLists.txt
+++ b/ws/CMakeLists.txt
@@ -27,16 +27,18 @@ add_executable(ws
   ../third_party/msgpack11/msgpack11.cpp
   ../third_party/jsoncpp/jsoncpp.cpp
   ../third_party/statsd-client-cpp/src/statsd_client.cpp
+
   ixcrypto/IXBase64.cpp
   ixcrypto/IXHash.cpp
   ixcrypto/IXUuid.cpp
   ixcrypto/IXHMac.cpp
 
+  ixcobra/IXCobraConnection.cpp
+  ixcobra/IXCobraMetricsPublisher.cpp
+  ixcobra/IXCobraMetricsThreadedPublisher.cpp
+
   IXRedisClient.cpp
   IXSentryClient.cpp
-  IXCobraConnection.cpp
-  IXCobraMetricsPublisher.cpp
-  IXCobraMetricsThreadedPublisher.cpp
 
   ws_http_client.cpp
   ws_ping_pong.cpp
diff --git a/ws/IXCobraConnection.cpp b/ws/ixcobra/IXCobraConnection.cpp
similarity index 100%
rename from ws/IXCobraConnection.cpp
rename to ws/ixcobra/IXCobraConnection.cpp
diff --git a/ws/IXCobraConnection.h b/ws/ixcobra/IXCobraConnection.h
similarity index 100%
rename from ws/IXCobraConnection.h
rename to ws/ixcobra/IXCobraConnection.h
diff --git a/ws/IXCobraMetricsPublisher.cpp b/ws/ixcobra/IXCobraMetricsPublisher.cpp
similarity index 100%
rename from ws/IXCobraMetricsPublisher.cpp
rename to ws/ixcobra/IXCobraMetricsPublisher.cpp
diff --git a/ws/IXCobraMetricsPublisher.h b/ws/ixcobra/IXCobraMetricsPublisher.h
similarity index 100%
rename from ws/IXCobraMetricsPublisher.h
rename to ws/ixcobra/IXCobraMetricsPublisher.h
diff --git a/ws/IXCobraMetricsThreadedPublisher.cpp b/ws/ixcobra/IXCobraMetricsThreadedPublisher.cpp
similarity index 100%
rename from ws/IXCobraMetricsThreadedPublisher.cpp
rename to ws/ixcobra/IXCobraMetricsThreadedPublisher.cpp
diff --git a/ws/IXCobraMetricsThreadedPublisher.h b/ws/ixcobra/IXCobraMetricsThreadedPublisher.h
similarity index 100%
rename from ws/IXCobraMetricsThreadedPublisher.h
rename to ws/ixcobra/IXCobraMetricsThreadedPublisher.h
diff --git a/ws/ws_cobra_publish.cpp b/ws/ws_cobra_publish.cpp
index 3696870a..3e3fa211 100644
--- a/ws/ws_cobra_publish.cpp
+++ b/ws/ws_cobra_publish.cpp
@@ -11,7 +11,7 @@
 #include <thread>
 #include <atomic>
 #include <jsoncpp/json/json.h>
-#include "IXCobraMetricsPublisher.h"
+#include <ixcobra/IXCobraMetricsPublisher.h>
 
 namespace ix
 {
diff --git a/ws/ws_cobra_subscribe.cpp b/ws/ws_cobra_subscribe.cpp
index ca4a25a5..80f0a6d3 100644
--- a/ws/ws_cobra_subscribe.cpp
+++ b/ws/ws_cobra_subscribe.cpp
@@ -9,7 +9,7 @@
 #include <chrono>
 #include <thread>
 #include <atomic>
-#include "IXCobraConnection.h"
+#include <ixcobra/IXCobraConnection.h>
 
 namespace ix
 {
diff --git a/ws/ws_cobra_to_sentry.cpp b/ws/ws_cobra_to_sentry.cpp
index 4876e3a6..cef19864 100644
--- a/ws/ws_cobra_to_sentry.cpp
+++ b/ws/ws_cobra_to_sentry.cpp
@@ -13,7 +13,7 @@
 #include <queue>
 #include <mutex>
 #include <condition_variable>
-#include "IXCobraConnection.h"
+#include <ixcobra/IXCobraConnection.h>
 
 #include "IXSentryClient.h"
 
diff --git a/ws/ws_cobra_to_statsd.cpp b/ws/ws_cobra_to_statsd.cpp
index 02dab361..fb1e104f 100644
--- a/ws/ws_cobra_to_statsd.cpp
+++ b/ws/ws_cobra_to_statsd.cpp
@@ -10,7 +10,7 @@
 #include <thread>
 #include <atomic>
 #include <vector>
-#include "IXCobraConnection.h"
+#include <ixcobra/IXCobraConnection.h>
 
 #include <statsd_client.h>