diff --git a/Makefile.am b/Makefile.am
index 0bf63b239..9485f1908 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -149,9 +149,9 @@ coolwsd_sources = common/Crypto.cpp \
                   wsd/TileCache.cpp \
                   wsd/ProofKey.cpp \
                   wsd/QuarantineUtil.cpp \
-                  wsd/WopiProxy.cpp \
                   wsd/wopi/CheckFileInfo.cpp \
-                  wsd/wopi/StorageConnectionManager.cpp
+                  wsd/wopi/StorageConnectionManager.cpp \
+                  wsd/wopi/WopiProxy.cpp
 
 coolwsd_SOURCES = $(coolwsd_sources) \
                   $(shared_sources) \
@@ -312,9 +312,9 @@ wsd_headers = wsd/Admin.hpp \
               wsd/UserMessages.hpp \
               wsd/QuarantineUtil.hpp \
               wsd/HostUtil.hpp \
-              wsd/WopiProxy.hpp \
               wsd/wopi/CheckFileInfo.hpp \
-              wsd/wopi/StorageConnectionManager.hpp
+              wsd/wopi/StorageConnectionManager.hpp \
+              wsd/wopi/WopiProxy.hpp
 
 shared_headers = common/Common.hpp \
                  common/Clipboard.hpp \
diff --git a/wsd/ClientRequestDispatcher.cpp b/wsd/ClientRequestDispatcher.cpp
index f2b315151..4b8284de8 100644
--- a/wsd/ClientRequestDispatcher.cpp
+++ b/wsd/ClientRequestDispatcher.cpp
@@ -26,10 +26,10 @@
 #include <FileServer.hpp>
 #if !MOBILEAPP
 #include <HostUtil.hpp>
+#include <wopi/WopiProxy.hpp>
 #endif // !MOBILEAPP
 #include <RequestDetails.hpp>
 #include <ProxyRequestHandler.hpp>
-#include <WopiProxy.hpp>
 #include <net/HttpHelper.hpp>
 #include <ConfigUtil.hpp>
 #include <JailUtil.hpp>
diff --git a/wsd/ClientRequestDispatcher.hpp b/wsd/ClientRequestDispatcher.hpp
index 04d4d2aac..f23f7f62f 100644
--- a/wsd/ClientRequestDispatcher.hpp
+++ b/wsd/ClientRequestDispatcher.hpp
@@ -14,7 +14,7 @@
 #include <RequestVettingStation.hpp>
 #include <RequestDetails.hpp>
 #include <Socket.hpp>
-#include <WopiProxy.hpp>
+#include <wopi/WopiProxy.hpp>
 
 #include <string>
 #include <memory>
diff --git a/wsd/WopiProxy.cpp b/wsd/wopi/WopiProxy.cpp
similarity index 99%
rename from wsd/WopiProxy.cpp
rename to wsd/wopi/WopiProxy.cpp
index 1f33425a6..7dac046f9 100644
--- a/wsd/WopiProxy.cpp
+++ b/wsd/wopi/WopiProxy.cpp
@@ -7,7 +7,7 @@
 
 #include <config.h>
 
-#include <WopiProxy.hpp>
+#include "WopiProxy.hpp"
 
 #include "FileUtil.hpp"
 #include "HttpHelper.hpp"
diff --git a/wsd/WopiProxy.hpp b/wsd/wopi/WopiProxy.hpp
similarity index 100%
rename from wsd/WopiProxy.hpp
rename to wsd/wopi/WopiProxy.hpp