diff --git a/.gitmodules b/.gitmodules
index f7c5cd91..525fe567 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -2,10 +2,10 @@
 	path = contrib/lemonbar-sm-git
 	url = https://github.com/jaagr/bar
 	branch = v1.1
-[submodule "contrib/i3ipcpp"]
-	path = contrib/i3ipcpp
+[submodule "lib/i3ipcpp"]
+	path = lib/i3ipcpp
 	url = https://github.com/jaagr/i3ipcpp
 	branch = v0.1.3
-[submodule "contrib/xpp"]
-	path = contrib/xpp
+[submodule "lib/xpp"]
+	path = lib/xpp
 	url = https://github.com/jaagr/xpp
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9828e3db..8d43beee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,7 +82,7 @@ set(PROJECT_LINK_LIBS
 if(ENABLE_I3)
   find_program(I3_EXECUTABLE "i3")
   if(I3_EXECUTABLE)
-    add_subdirectory("${PROJECT_SOURCE_DIR}/contrib/i3ipcpp" EXCLUDE_FROM_ALL)
+    add_subdirectory("${PROJECT_SOURCE_DIR}/lib/i3ipcpp" EXCLUDE_FROM_ALL)
     set(PROJECT_INCL_DIRS
       ${PROJECT_INCL_DIRS}
       ${SIGCPP_INCLUDE_DIRS}
@@ -135,7 +135,7 @@ endif()
 # Load the xpp library
 #
 set(XCB_PROTOS xproto randr)
-add_subdirectory("${PROJECT_SOURCE_DIR}/contrib/xpp")
+add_subdirectory("${PROJECT_SOURCE_DIR}/lib/xpp")
 set(PROJECT_INCL_DIRS ${PROJECT_INCL_DIRS} ${XPP_INCLUDE_DIRS})
 set(PROJECT_LINK_LIBS ${PROJECT_LINK_LIBS} ${XPP_LIBRARIES})
 
diff --git a/contrib/i3ipcpp b/contrib/i3ipcpp
deleted file mode 160000
index ec2d8891..00000000
--- a/contrib/i3ipcpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ec2d88919d5037360e61932492eb3f98f9b9df28
diff --git a/contrib/xpp b/contrib/xpp
deleted file mode 160000
index ce5a2d1e..00000000
--- a/contrib/xpp
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ce5a2d1e2fadb909aca62c6ddb9675c2f08873b2
diff --git a/lib/i3ipcpp b/lib/i3ipcpp
new file mode 160000
index 00000000..2094ac22
--- /dev/null
+++ b/lib/i3ipcpp
@@ -0,0 +1 @@
+Subproject commit 2094ac2215beb27940355143a89304794129b27e
diff --git a/lib/xpp b/lib/xpp
new file mode 160000
index 00000000..e5fe00e2
--- /dev/null
+++ b/lib/xpp
@@ -0,0 +1 @@
+Subproject commit e5fe00e29482a1aaed205ce96f242afb2378f798