diff --git a/loolwsd/.clang-tidy b/.clang-tidy
similarity index 100%
rename from loolwsd/.clang-tidy
rename to .clang-tidy
diff --git a/loolwsd/.gitignore b/.gitignore
similarity index 100%
rename from loolwsd/.gitignore
rename to .gitignore
diff --git a/loolwsd/AUTHORS b/AUTHORS
similarity index 100%
rename from loolwsd/AUTHORS
rename to AUTHORS
diff --git a/loolwsd/COPYING b/COPYING
similarity index 100%
rename from loolwsd/COPYING
rename to COPYING
diff --git a/loolwsd/ChangeLog b/ChangeLog
similarity index 100%
rename from loolwsd/ChangeLog
rename to ChangeLog
diff --git a/loolwsd/INSTALL b/INSTALL
similarity index 100%
rename from loolwsd/INSTALL
rename to INSTALL
diff --git a/loolwsd/Makefile.am b/Makefile.am
similarity index 100%
rename from loolwsd/Makefile.am
rename to Makefile.am
diff --git a/loolwsd/NEWS b/NEWS
similarity index 100%
rename from loolwsd/NEWS
rename to NEWS
diff --git a/loolwsd/PROBLEMS b/PROBLEMS
similarity index 100%
rename from loolwsd/PROBLEMS
rename to PROBLEMS
diff --git a/loolwsd/TODO b/TODO
similarity index 100%
rename from loolwsd/TODO
rename to TODO
diff --git a/loolwsd/autogen.sh b/autogen.sh
similarity index 100%
rename from loolwsd/autogen.sh
rename to autogen.sh
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h b/bundled/include/LibreOfficeKit/LibreOfficeKit.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKit.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx b/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
rename to bundled/include/LibreOfficeKit/LibreOfficeKit.hxx
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h b/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h b/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitInit.h
diff --git a/loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h b/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
similarity index 100%
rename from loolwsd/bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
rename to bundled/include/LibreOfficeKit/LibreOfficeKitTypes.h
diff --git a/loolwsd/Common.hpp b/common/Common.hpp
similarity index 100%
rename from loolwsd/Common.hpp
rename to common/Common.hpp
diff --git a/loolwsd/common/FileUtil.cpp b/common/FileUtil.cpp
similarity index 100%
rename from loolwsd/common/FileUtil.cpp
rename to common/FileUtil.cpp
diff --git a/loolwsd/common/FileUtil.hpp b/common/FileUtil.hpp
similarity index 100%
rename from loolwsd/common/FileUtil.hpp
rename to common/FileUtil.hpp
diff --git a/loolwsd/IoUtil.cpp b/common/IoUtil.cpp
similarity index 100%
rename from loolwsd/IoUtil.cpp
rename to common/IoUtil.cpp
diff --git a/loolwsd/IoUtil.hpp b/common/IoUtil.hpp
similarity index 100%
rename from loolwsd/IoUtil.hpp
rename to common/IoUtil.hpp
diff --git a/loolwsd/Log.cpp b/common/Log.cpp
similarity index 100%
rename from loolwsd/Log.cpp
rename to common/Log.cpp
diff --git a/loolwsd/Log.hpp b/common/Log.hpp
similarity index 100%
rename from loolwsd/Log.hpp
rename to common/Log.hpp
diff --git a/loolwsd/MessageQueue.cpp b/common/MessageQueue.cpp
similarity index 100%
rename from loolwsd/MessageQueue.cpp
rename to common/MessageQueue.cpp
diff --git a/loolwsd/MessageQueue.hpp b/common/MessageQueue.hpp
similarity index 100%
rename from loolwsd/MessageQueue.hpp
rename to common/MessageQueue.hpp
diff --git a/loolwsd/Png.hpp b/common/Png.hpp
similarity index 100%
rename from loolwsd/Png.hpp
rename to common/Png.hpp
diff --git a/loolwsd/LOOLProtocol.cpp b/common/Protocol.cpp
similarity index 100%
rename from loolwsd/LOOLProtocol.cpp
rename to common/Protocol.cpp
diff --git a/loolwsd/LOOLProtocol.hpp b/common/Protocol.hpp
similarity index 100%
rename from loolwsd/LOOLProtocol.hpp
rename to common/Protocol.hpp
diff --git a/loolwsd/Rectangle.hpp b/common/Rectangle.hpp
similarity index 100%
rename from loolwsd/Rectangle.hpp
rename to common/Rectangle.hpp
diff --git a/loolwsd/LOOLSession.cpp b/common/Session.cpp
similarity index 100%
rename from loolwsd/LOOLSession.cpp
rename to common/Session.cpp
diff --git a/loolwsd/LOOLSession.hpp b/common/Session.hpp
similarity index 100%
rename from loolwsd/LOOLSession.hpp
rename to common/Session.hpp
diff --git a/loolwsd/common/SigUtil.cpp b/common/SigUtil.cpp
similarity index 100%
rename from loolwsd/common/SigUtil.cpp
rename to common/SigUtil.cpp
diff --git a/loolwsd/common/SigUtil.hpp b/common/SigUtil.hpp
similarity index 100%
rename from loolwsd/common/SigUtil.hpp
rename to common/SigUtil.hpp
diff --git a/loolwsd/Unit.cpp b/common/Unit.cpp
similarity index 100%
rename from loolwsd/Unit.cpp
rename to common/Unit.cpp
diff --git a/loolwsd/Unit.hpp b/common/Unit.hpp
similarity index 100%
rename from loolwsd/Unit.hpp
rename to common/Unit.hpp
diff --git a/loolwsd/UnitHTTP.cpp b/common/UnitHTTP.cpp
similarity index 100%
rename from loolwsd/UnitHTTP.cpp
rename to common/UnitHTTP.cpp
diff --git a/loolwsd/UnitHTTP.hpp b/common/UnitHTTP.hpp
similarity index 100%
rename from loolwsd/UnitHTTP.hpp
rename to common/UnitHTTP.hpp
diff --git a/loolwsd/Util.cpp b/common/Util.cpp
similarity index 100%
rename from loolwsd/Util.cpp
rename to common/Util.cpp
diff --git a/loolwsd/Util.hpp b/common/Util.hpp
similarity index 100%
rename from loolwsd/Util.hpp
rename to common/Util.hpp
diff --git a/loolwsd/security.h b/common/security.h
similarity index 100%
rename from loolwsd/security.h
rename to common/security.h
diff --git a/loolwsd/configure.ac b/configure.ac
similarity index 100%
rename from loolwsd/configure.ac
rename to configure.ac
diff --git a/loolwsd/debian/changelog b/debian/changelog
similarity index 100%
rename from loolwsd/debian/changelog
rename to debian/changelog
diff --git a/loolwsd/debian/compat b/debian/compat
similarity index 100%
rename from loolwsd/debian/compat
rename to debian/compat
diff --git a/loolwsd/debian/control b/debian/control
similarity index 100%
rename from loolwsd/debian/control
rename to debian/control
diff --git a/loolwsd/debian/copyright b/debian/copyright
similarity index 100%
rename from loolwsd/debian/copyright
rename to debian/copyright
diff --git a/loolwsd/debian/loolwsd.cron.d b/debian/loolwsd.cron.d
similarity index 100%
rename from loolwsd/debian/loolwsd.cron.d
rename to debian/loolwsd.cron.d
diff --git a/loolwsd/debian/loolwsd.postinst b/debian/loolwsd.postinst
similarity index 100%
rename from loolwsd/debian/loolwsd.postinst
rename to debian/loolwsd.postinst
diff --git a/loolwsd/debian/loolwsd.preinst b/debian/loolwsd.preinst
similarity index 100%
rename from loolwsd/debian/loolwsd.preinst
rename to debian/loolwsd.preinst
diff --git a/loolwsd/debian/rules b/debian/rules
similarity index 100%
rename from loolwsd/debian/rules
rename to debian/rules
diff --git a/loolwsd/debian/source/format b/debian/source/format
similarity index 100%
rename from loolwsd/debian/source/format
rename to debian/source/format
diff --git a/loolwsd/discovery.xml b/discovery.xml
similarity index 100%
rename from loolwsd/discovery.xml
rename to discovery.xml
diff --git a/loolwsd/etc/ca-chain.cert.pem b/etc/ca-chain.cert.pem
similarity index 100%
rename from loolwsd/etc/ca-chain.cert.pem
rename to etc/ca-chain.cert.pem
diff --git a/loolwsd/etc/cert.pem b/etc/cert.pem
similarity index 100%
rename from loolwsd/etc/cert.pem
rename to etc/cert.pem
diff --git a/loolwsd/etc/key.pem b/etc/key.pem
similarity index 100%
rename from loolwsd/etc/key.pem
rename to etc/key.pem
diff --git a/loolwsd/favicon.ico b/favicon.ico
similarity index 100%
rename from loolwsd/favicon.ico
rename to favicon.ico
diff --git a/loolwsd/ChildSession.cpp b/kit/ChildSession.cpp
similarity index 100%
rename from loolwsd/ChildSession.cpp
rename to kit/ChildSession.cpp
diff --git a/loolwsd/ChildSession.hpp b/kit/ChildSession.hpp
similarity index 100%
rename from loolwsd/ChildSession.hpp
rename to kit/ChildSession.hpp
diff --git a/loolwsd/LOOLForKit.cpp b/kit/ForKit.cpp
similarity index 100%
rename from loolwsd/LOOLForKit.cpp
rename to kit/ForKit.cpp
diff --git a/loolwsd/LOOLKit.cpp b/kit/Kit.cpp
similarity index 100%
rename from loolwsd/LOOLKit.cpp
rename to kit/Kit.cpp
diff --git a/loolwsd/LOOLKit.hpp b/kit/Kit.hpp
similarity index 100%
rename from loolwsd/LOOLKit.hpp
rename to kit/Kit.hpp
diff --git a/loolwsd/LOKitHelper.hpp b/kit/KitHelper.hpp
similarity index 100%
rename from loolwsd/LOKitHelper.hpp
rename to kit/KitHelper.hpp
diff --git a/loolwsd/loolstat b/loolstat
similarity index 100%
rename from loolwsd/loolstat
rename to loolstat
diff --git a/loolwsd/loolwsd-systemplate-setup b/loolwsd-systemplate-setup
similarity index 100%
rename from loolwsd/loolwsd-systemplate-setup
rename to loolwsd-systemplate-setup
diff --git a/loolwsd/loolwsd.service b/loolwsd.service
similarity index 100%
rename from loolwsd/loolwsd.service
rename to loolwsd.service
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd.spec.in
similarity index 100%
rename from loolwsd/loolwsd.spec.in
rename to loolwsd.spec.in
diff --git a/loolwsd/loolwsd.xml.in b/loolwsd.xml.in
similarity index 100%
rename from loolwsd/loolwsd.xml.in
rename to loolwsd.xml.in
diff --git a/loolwsd/maketarballfordeb.sh.in b/maketarballfordeb.sh.in
similarity index 100%
rename from loolwsd/maketarballfordeb.sh.in
rename to maketarballfordeb.sh.in
diff --git a/rename.sh b/rename.sh
index 03de7f6770..2c5c8f1a4f 100755
--- a/rename.sh
+++ b/rename.sh
@@ -33,7 +33,6 @@ git mv wsd/LOOLSession.cpp common/Session.cpp
 git mv wsd/LOOLSession.hpp common/Session.hpp
 git mv wsd/security.h common/security.h
 
-git mv wsd/LibreOfficeKit.hpp kit
 git mv wsd/ChildSession.cpp kit
 git mv wsd/ChildSession.hpp kit
 git mv wsd/LOOLForKit.cpp kit/ForKit.cpp
diff --git a/loolwsd/robots.txt b/robots.txt
similarity index 100%
rename from loolwsd/robots.txt
rename to robots.txt
diff --git a/loolwsd/sysconfig.loolwsd b/sysconfig.loolwsd
similarity index 100%
rename from loolwsd/sysconfig.loolwsd
rename to sysconfig.loolwsd
diff --git a/loolwsd/test/.gitignore b/test/.gitignore
similarity index 100%
rename from loolwsd/test/.gitignore
rename to test/.gitignore
diff --git a/loolwsd/test/Makefile.am b/test/Makefile.am
similarity index 100%
rename from loolwsd/test/Makefile.am
rename to test/Makefile.am
diff --git a/loolwsd/test/TileCacheTests.cpp b/test/TileCacheTests.cpp
similarity index 100%
rename from loolwsd/test/TileCacheTests.cpp
rename to test/TileCacheTests.cpp
diff --git a/loolwsd/test/TileQueueTests.cpp b/test/TileQueueTests.cpp
similarity index 100%
rename from loolwsd/test/TileQueueTests.cpp
rename to test/TileQueueTests.cpp
diff --git a/loolwsd/test/UnitAdmin.cpp b/test/UnitAdmin.cpp
similarity index 100%
rename from loolwsd/test/UnitAdmin.cpp
rename to test/UnitAdmin.cpp
diff --git a/loolwsd/test/UnitFonts.cpp b/test/UnitFonts.cpp
similarity index 100%
rename from loolwsd/test/UnitFonts.cpp
rename to test/UnitFonts.cpp
diff --git a/loolwsd/test/UnitFuzz.cpp b/test/UnitFuzz.cpp
similarity index 100%
rename from loolwsd/test/UnitFuzz.cpp
rename to test/UnitFuzz.cpp
diff --git a/loolwsd/test/UnitPrefork.cpp b/test/UnitPrefork.cpp
similarity index 100%
rename from loolwsd/test/UnitPrefork.cpp
rename to test/UnitPrefork.cpp
diff --git a/loolwsd/test/UnitRequests.cpp b/test/UnitRequests.cpp
similarity index 100%
rename from loolwsd/test/UnitRequests.cpp
rename to test/UnitRequests.cpp
diff --git a/loolwsd/test/UnitStorage.cpp b/test/UnitStorage.cpp
similarity index 100%
rename from loolwsd/test/UnitStorage.cpp
rename to test/UnitStorage.cpp
diff --git a/loolwsd/test/UnitTileCache.cpp b/test/UnitTileCache.cpp
similarity index 100%
rename from loolwsd/test/UnitTileCache.cpp
rename to test/UnitTileCache.cpp
diff --git a/loolwsd/test/UnitTimeout.cpp b/test/UnitTimeout.cpp
similarity index 100%
rename from loolwsd/test/UnitTimeout.cpp
rename to test/UnitTimeout.cpp
diff --git a/loolwsd/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
similarity index 100%
rename from loolwsd/test/WhiteBoxTests.cpp
rename to test/WhiteBoxTests.cpp
diff --git a/loolwsd/test/countloolkits.hpp b/test/countloolkits.hpp
similarity index 100%
rename from loolwsd/test/countloolkits.hpp
rename to test/countloolkits.hpp
diff --git a/loolwsd/test/data/Example.odt b/test/data/Example.odt
similarity index 100%
rename from loolwsd/test/data/Example.odt
rename to test/data/Example.odt
diff --git a/loolwsd/test/data/calc_render.xls b/test/data/calc_render.xls
similarity index 100%
rename from loolwsd/test/data/calc_render.xls
rename to test/data/calc_render.xls
diff --git a/loolwsd/test/data/calc_render_0_512x512.3840,0.7680x7680.png b/test/data/calc_render_0_512x512.3840,0.7680x7680.png
similarity index 100%
rename from loolwsd/test/data/calc_render_0_512x512.3840,0.7680x7680.png
rename to test/data/calc_render_0_512x512.3840,0.7680x7680.png
diff --git a/loolwsd/test/data/empty.odg b/test/data/empty.odg
similarity index 100%
rename from loolwsd/test/data/empty.odg
rename to test/data/empty.odg
diff --git a/loolwsd/test/data/empty.odp b/test/data/empty.odp
similarity index 100%
rename from loolwsd/test/data/empty.odp
rename to test/data/empty.odp
diff --git a/loolwsd/test/data/empty.ods b/test/data/empty.ods
similarity index 100%
rename from loolwsd/test/data/empty.ods
rename to test/data/empty.ods
diff --git a/loolwsd/test/data/empty.odt b/test/data/empty.odt
similarity index 100%
rename from loolwsd/test/data/empty.odt
rename to test/data/empty.odt
diff --git a/loolwsd/test/data/graphicviewselection.odp b/test/data/graphicviewselection.odp
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.odp
rename to test/data/graphicviewselection.odp
diff --git a/loolwsd/test/data/graphicviewselection.ods b/test/data/graphicviewselection.ods
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.ods
rename to test/data/graphicviewselection.ods
diff --git a/loolwsd/test/data/graphicviewselection.odt b/test/data/graphicviewselection.odt
similarity index 100%
rename from loolwsd/test/data/graphicviewselection.odt
rename to test/data/graphicviewselection.odt
diff --git a/loolwsd/test/data/hello.odt b/test/data/hello.odt
similarity index 100%
rename from loolwsd/test/data/hello.odt
rename to test/data/hello.odt
diff --git a/loolwsd/test/data/hello.txt b/test/data/hello.txt
similarity index 100%
rename from loolwsd/test/data/hello.txt
rename to test/data/hello.txt
diff --git a/loolwsd/test/data/hide-whitespace.odt b/test/data/hide-whitespace.odt
similarity index 100%
rename from loolwsd/test/data/hide-whitespace.odt
rename to test/data/hide-whitespace.odt
diff --git a/loolwsd/test/data/insert-delete.odp b/test/data/insert-delete.odp
similarity index 100%
rename from loolwsd/test/data/insert-delete.odp
rename to test/data/insert-delete.odp
diff --git a/loolwsd/test/data/load12.ods b/test/data/load12.ods
similarity index 100%
rename from loolwsd/test/data/load12.ods
rename to test/data/load12.ods
diff --git a/loolwsd/test/data/password-protected.ods b/test/data/password-protected.ods
similarity index 100%
rename from loolwsd/test/data/password-protected.ods
rename to test/data/password-protected.ods
diff --git a/loolwsd/test/data/paste.html b/test/data/paste.html
similarity index 100%
rename from loolwsd/test/data/paste.html
rename to test/data/paste.html
diff --git a/loolwsd/test/data/setclientpart.odp b/test/data/setclientpart.odp
similarity index 100%
rename from loolwsd/test/data/setclientpart.odp
rename to test/data/setclientpart.odp
diff --git a/loolwsd/test/data/setclientpart.ods b/test/data/setclientpart.ods
similarity index 100%
rename from loolwsd/test/data/setclientpart.ods
rename to test/data/setclientpart.ods
diff --git a/loolwsd/test/data/shape.ods b/test/data/shape.ods
similarity index 100%
rename from loolwsd/test/data/shape.ods
rename to test/data/shape.ods
diff --git a/loolwsd/test/data/timeline.xlsx b/test/data/timeline.xlsx
similarity index 100%
rename from loolwsd/test/data/timeline.xlsx
rename to test/data/timeline.xlsx
diff --git a/loolwsd/test/data/viewcursor.odp b/test/data/viewcursor.odp
similarity index 100%
rename from loolwsd/test/data/viewcursor.odp
rename to test/data/viewcursor.odp
diff --git a/loolwsd/test/data/with_comment.odt b/test/data/with_comment.odt
similarity index 100%
rename from loolwsd/test/data/with_comment.odt
rename to test/data/with_comment.odt
diff --git a/loolwsd/test/helpers.hpp b/test/helpers.hpp
similarity index 100%
rename from loolwsd/test/helpers.hpp
rename to test/helpers.hpp
diff --git a/loolwsd/test/httpcrashtest.cpp b/test/httpcrashtest.cpp
similarity index 100%
rename from loolwsd/test/httpcrashtest.cpp
rename to test/httpcrashtest.cpp
diff --git a/loolwsd/test/httpwserror.cpp b/test/httpwserror.cpp
similarity index 100%
rename from loolwsd/test/httpwserror.cpp
rename to test/httpwserror.cpp
diff --git a/loolwsd/test/httpwstest.cpp b/test/httpwstest.cpp
similarity index 100%
rename from loolwsd/test/httpwstest.cpp
rename to test/httpwstest.cpp
diff --git a/loolwsd/test/integration-http-server.cpp b/test/integration-http-server.cpp
similarity index 100%
rename from loolwsd/test/integration-http-server.cpp
rename to test/integration-http-server.cpp
diff --git a/loolwsd/test/run_unit.sh.in b/test/run_unit.sh.in
similarity index 100%
rename from loolwsd/test/run_unit.sh.in
rename to test/run_unit.sh.in
diff --git a/loolwsd/test/test.cpp b/test/test.cpp
similarity index 100%
rename from loolwsd/test/test.cpp
rename to test/test.cpp
diff --git a/loolwsd/Connect.cpp b/tools/Connect.cpp
similarity index 100%
rename from loolwsd/Connect.cpp
rename to tools/Connect.cpp
diff --git a/loolwsd/LOKitClient.cpp b/tools/KitClient.cpp
similarity index 100%
rename from loolwsd/LOKitClient.cpp
rename to tools/KitClient.cpp
diff --git a/loolwsd/LOOLStress.cpp b/tools/Stress.cpp
similarity index 100%
rename from loolwsd/LOOLStress.cpp
rename to tools/Stress.cpp
diff --git a/loolwsd/LOOLTool.cpp b/tools/Tool.cpp
similarity index 100%
rename from loolwsd/LOOLTool.cpp
rename to tools/Tool.cpp
diff --git a/loolwsd/loolmap.c b/tools/map.c
similarity index 100%
rename from loolwsd/loolmap.c
rename to tools/map.c
diff --git a/loolwsd/loolmount.c b/tools/mount.c
similarity index 100%
rename from loolwsd/loolmount.c
rename to tools/mount.c
diff --git a/loolwsd/Admin.cpp b/wsd/Admin.cpp
similarity index 100%
rename from loolwsd/Admin.cpp
rename to wsd/Admin.cpp
diff --git a/loolwsd/Admin.hpp b/wsd/Admin.hpp
similarity index 100%
rename from loolwsd/Admin.hpp
rename to wsd/Admin.hpp
diff --git a/loolwsd/AdminModel.cpp b/wsd/AdminModel.cpp
similarity index 100%
rename from loolwsd/AdminModel.cpp
rename to wsd/AdminModel.cpp
diff --git a/loolwsd/AdminModel.hpp b/wsd/AdminModel.hpp
similarity index 100%
rename from loolwsd/AdminModel.hpp
rename to wsd/AdminModel.hpp
diff --git a/loolwsd/Auth.cpp b/wsd/Auth.cpp
similarity index 100%
rename from loolwsd/Auth.cpp
rename to wsd/Auth.cpp
diff --git a/loolwsd/Auth.hpp b/wsd/Auth.hpp
similarity index 100%
rename from loolwsd/Auth.hpp
rename to wsd/Auth.hpp
diff --git a/loolwsd/ClientSession.cpp b/wsd/ClientSession.cpp
similarity index 100%
rename from loolwsd/ClientSession.cpp
rename to wsd/ClientSession.cpp
diff --git a/loolwsd/ClientSession.hpp b/wsd/ClientSession.hpp
similarity index 100%
rename from loolwsd/ClientSession.hpp
rename to wsd/ClientSession.hpp
diff --git a/loolwsd/DocumentBroker.cpp b/wsd/DocumentBroker.cpp
similarity index 100%
rename from loolwsd/DocumentBroker.cpp
rename to wsd/DocumentBroker.cpp
diff --git a/loolwsd/DocumentBroker.hpp b/wsd/DocumentBroker.hpp
similarity index 100%
rename from loolwsd/DocumentBroker.hpp
rename to wsd/DocumentBroker.hpp
diff --git a/loolwsd/Exceptions.hpp b/wsd/Exceptions.hpp
similarity index 100%
rename from loolwsd/Exceptions.hpp
rename to wsd/Exceptions.hpp
diff --git a/loolwsd/FileServer.cpp b/wsd/FileServer.cpp
similarity index 100%
rename from loolwsd/FileServer.cpp
rename to wsd/FileServer.cpp
diff --git a/loolwsd/FileServer.hpp b/wsd/FileServer.hpp
similarity index 100%
rename from loolwsd/FileServer.hpp
rename to wsd/FileServer.hpp
diff --git a/loolwsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
similarity index 100%
rename from loolwsd/LOOLWSD.cpp
rename to wsd/LOOLWSD.cpp
diff --git a/loolwsd/LOOLWSD.hpp b/wsd/LOOLWSD.hpp
similarity index 100%
rename from loolwsd/LOOLWSD.hpp
rename to wsd/LOOLWSD.hpp
diff --git a/loolwsd/LOOLWebSocket.hpp b/wsd/LOOLWebSocket.hpp
similarity index 100%
rename from loolwsd/LOOLWebSocket.hpp
rename to wsd/LOOLWebSocket.hpp
diff --git a/loolwsd/PrisonerSession.cpp b/wsd/PrisonerSession.cpp
similarity index 100%
rename from loolwsd/PrisonerSession.cpp
rename to wsd/PrisonerSession.cpp
diff --git a/loolwsd/PrisonerSession.hpp b/wsd/PrisonerSession.hpp
similarity index 100%
rename from loolwsd/PrisonerSession.hpp
rename to wsd/PrisonerSession.hpp
diff --git a/loolwsd/QueueHandler.hpp b/wsd/QueueHandler.hpp
similarity index 100%
rename from loolwsd/QueueHandler.hpp
rename to wsd/QueueHandler.hpp
diff --git a/loolwsd/README b/wsd/README
similarity index 100%
rename from loolwsd/README
rename to wsd/README
diff --git a/loolwsd/README.vars b/wsd/README.vars
similarity index 100%
rename from loolwsd/README.vars
rename to wsd/README.vars
diff --git a/loolwsd/Storage.cpp b/wsd/Storage.cpp
similarity index 100%
rename from loolwsd/Storage.cpp
rename to wsd/Storage.cpp
diff --git a/loolwsd/Storage.hpp b/wsd/Storage.hpp
similarity index 100%
rename from loolwsd/Storage.hpp
rename to wsd/Storage.hpp
diff --git a/loolwsd/TileCache.cpp b/wsd/TileCache.cpp
similarity index 100%
rename from loolwsd/TileCache.cpp
rename to wsd/TileCache.cpp
diff --git a/loolwsd/TileCache.hpp b/wsd/TileCache.hpp
similarity index 100%
rename from loolwsd/TileCache.hpp
rename to wsd/TileCache.hpp
diff --git a/loolwsd/TileDesc.hpp b/wsd/TileDesc.hpp
similarity index 100%
rename from loolwsd/TileDesc.hpp
rename to wsd/TileDesc.hpp
diff --git a/loolwsd/TraceFile.hpp b/wsd/TraceFile.hpp
similarity index 100%
rename from loolwsd/TraceFile.hpp
rename to wsd/TraceFile.hpp
diff --git a/loolwsd/UserMessages.hpp b/wsd/UserMessages.hpp
similarity index 100%
rename from loolwsd/UserMessages.hpp
rename to wsd/UserMessages.hpp
diff --git a/loolwsd/lint-discovery.py b/wsd/lint-discovery.py
similarity index 100%
rename from loolwsd/lint-discovery.py
rename to wsd/lint-discovery.py
diff --git a/loolwsd/protocol.txt b/wsd/protocol.txt
similarity index 100%
rename from loolwsd/protocol.txt
rename to wsd/protocol.txt
diff --git a/loolwsd/reference.txt b/wsd/reference.txt
similarity index 100%
rename from loolwsd/reference.txt
rename to wsd/reference.txt