diff --git a/.gitmodules b/.gitmodules
index 12ae86d..712e832 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "vendor/squall"]
-	path = vendor/squall
+	path = lib/squall
 	url = https://github.com/whoahq/squall
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9298deb..fbe4606 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,7 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
     add_definitions(-DWHOA_PLATFORM_MAC)
 endif()
 
+add_subdirectory(lib)
 add_subdirectory(tempest)
 add_subdirectory(test)
 add_subdirectory(vendor)
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
new file mode 100644
index 0000000..d8c19f2
--- /dev/null
+++ b/lib/CMakeLists.txt
@@ -0,0 +1 @@
+add_subdirectory(squall)
diff --git a/vendor/squall b/lib/squall
similarity index 100%
rename from vendor/squall
rename to lib/squall
diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt
index d8c19f2..e69de29 100644
--- a/vendor/CMakeLists.txt
+++ b/vendor/CMakeLists.txt
@@ -1 +0,0 @@
-add_subdirectory(squall)