diff --git a/extra/CMakeLists.txt b/extra/CMakeLists.txt
index f859a0fc..6b2c22c7 100644
--- a/extra/CMakeLists.txt
+++ b/extra/CMakeLists.txt
@@ -1,33 +1,4 @@
 
-SET(ZSTD_SRC
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/fse_decompress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_common.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v01.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v06.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/entropy_common.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zdict.c 
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_compress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v04.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/error_private.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/hash.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/pool.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_common.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_decompress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstdmt_compress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v02.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v07.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/cover.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/huf_compress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_compress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v05.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/divsufsort.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/fse_compress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/huf_decompress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/threading.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zbuff_decompress.c
-		${CMAKE_CURRENT_SOURCE_DIR}/zstd/zstd_v03.c
-        PARENT_SCOPE
-)
 
 IF(MSVC)
 SET(MINIZIP_SRC
@@ -113,11 +84,10 @@ SET(MINIZIP_SRC
 )
 ENDIF()
 
+SET(ZSTD_DIR ${CMAKE_CURRENT_SOURCE_DIR}/zstd PARENT_SCOPE)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/zstd)
 
-SET(ZSTD_INCLUDE_DIR
-		${CMAKE_CURRENT_SOURCE_DIR}
-        PARENT_SCOPE
-)
 
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/blosc)
 SET(BLOSC_SRC ${BLOSC_SRC} PARENT_SCOPE)
@@ -132,4 +102,13 @@ SET(JPEG9B_SRC ${JPEG9B_SRC} PARENT_SCOPE)
 SET(CHARLS_SRC ${CHARLS_SRC} PARENT_SCOPE)
 
 
-SET(EXTRAS_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
\ No newline at end of file
+SET(EXTRAS_INCLUDE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} PARENT_SCOPE)
+
+SET(ZSTD_INCLUDE_DIR
+		${ZSTD_INCLUDE_DIR}
+        PARENT_SCOPE
+)
+SET(ZSTD_SRC
+		${ZSTD_SRC}
+        PARENT_SCOPE
+)
\ No newline at end of file
diff --git a/extra/zstd/CMakeLists.txt b/extra/zstd/CMakeLists.txt
new file mode 100644
index 00000000..8a8a4709
--- /dev/null
+++ b/extra/zstd/CMakeLists.txt
@@ -0,0 +1,47 @@
+
+SET(ZSTD_SRC
+		${CMAKE_CURRENT_SOURCE_DIR}/fse_decompress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_common.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v01.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v06.c
+		${CMAKE_CURRENT_SOURCE_DIR}/entropy_common.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zdict.c 
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_compress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v04.c
+		${CMAKE_CURRENT_SOURCE_DIR}/error_private.c
+		${CMAKE_CURRENT_SOURCE_DIR}/hash.c
+		${CMAKE_CURRENT_SOURCE_DIR}/pool.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zbuff_common.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_decompress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstdmt_compress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v02.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v07.c
+		${CMAKE_CURRENT_SOURCE_DIR}/cover.c
+		${CMAKE_CURRENT_SOURCE_DIR}/huf_compress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zbuff_compress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v05.c
+		${CMAKE_CURRENT_SOURCE_DIR}/divsufsort.c
+		${CMAKE_CURRENT_SOURCE_DIR}/fse_compress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/huf_decompress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/threading.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zbuff_decompress.c
+		${CMAKE_CURRENT_SOURCE_DIR}/zstd_v03.c
+)
+
+SET(ZSTD_SRC
+		${ZSTD_SRC}
+        PARENT_SCOPE
+)
+
+SET(ZSTD_INCLUDE_DIR
+		${CMAKE_CURRENT_SOURCE_DIR}
+        
+)
+
+SET(ZSTD_INCLUDE_DIR
+		${ZSTD_INCLUDE_DIR}
+        PARENT_SCOPE
+)
+
+
+add_library(libzstd ${ZSTD_SRC})
\ No newline at end of file
diff --git a/src/cpp/CMakeLists.txt b/src/cpp/CMakeLists.txt
index 6c1674bf..3a147f22 100644
--- a/src/cpp/CMakeLists.txt
+++ b/src/cpp/CMakeLists.txt
@@ -12,9 +12,9 @@ ENDIF()
 
 install (TARGETS ${TARGETS} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} )
 install (TARGETS ${TARGETS} LIBRARY DESTINATION ${CMAKE_INSTALL_BINDIR} )
+install(TARGETS ${TARGETS} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 install (TARGETS ${TARGETS} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} )
 install (TARGETS ${TARGETS} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
-install(TARGETS ${TARGETS} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
 
 # message(STATUS ${EXCLUDED_TARGETS})