diff --git a/CMakeLists.txt b/CMakeLists.txt
index a142b97..0a99a7a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/version.cmake)
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/shared.cmake)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bx)
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg.cmake)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bimg)
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/bgfx.cmake)
 
 if(BGFX_BUILD_TOOLS)
diff --git a/cmake/bimg/CMakeLists.txt b/cmake/bimg/CMakeLists.txt
new file mode 100644
index 0000000..2d59c75
--- /dev/null
+++ b/cmake/bimg/CMakeLists.txt
@@ -0,0 +1,11 @@
+# bgfx.cmake - bgfx building in cmake
+# Written in 2017 by Joshua Brookover <joshua.al.brookover@gmail.com>
+#
+# To the extent possible under law, the author(s) have dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty.
+#
+# You should have received a copy of the CC0 Public Domain Dedication along with
+# this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
+
+include(bimg.cmake)
diff --git a/cmake/bimg.cmake b/cmake/bimg/bimg.cmake
similarity index 69%
rename from cmake/bimg.cmake
rename to cmake/bimg/bimg.cmake
index 62f7ed3..917ce21 100644
--- a/cmake/bimg.cmake
+++ b/cmake/bimg/bimg.cmake
@@ -9,15 +9,15 @@
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
 # Third party libs
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/astc-encoder.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/edtaa3.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc1.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/etc2.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/iqa.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/libsquish.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/nvtt.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/pvrtc.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/3rdparty/tinyexr.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/astc-encoder.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/edtaa3.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/etc1.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/etc2.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/iqa.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/libsquish.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/nvtt.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/pvrtc.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../3rdparty/tinyexr.cmake)
 
 # Ensure the directory exists
 if(NOT IS_DIRECTORY ${BIMG_DIR})