diff --git a/CMakeLists.txt b/CMakeLists.txt
index b04c59a..6e0af87 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -66,24 +66,10 @@ ADD_OPTION(USE_PIXFC                    "Add PIXFC support"        OFF )
 # Dependencies
 ######################################################################################
 INCLUDE( cmake/LibQT.cmake )
-
-IF( USE_OPENCV )
-    FIND_PACKAGE( OpenCV )
-    IF( NOT OpenCV_FOUND)
-        SET(USE_OPENCV FALSE)
-    ELSE()
-        LIST(APPEND LINKER_LIBS ${OpenCV_LIBRARIES} )
-    ENDIF()
-ENDIF()
-INCLUDE( cmake/LibPixfc.cmake )
+INCLUDE( cmake/LibOpenCV.cmake )
 INCLUDE( cmake/LibFFmpeg.cmake )
-IF( USE_FERVOR )
-  SET( FERVOR_APP_NAME ${PROJECT_NAME} ) 
-  SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} )
-  ADD_SUBDIRECTORY( source/lib/fervor-lib )
-  INCLUDE_DIRECTORIES( source/lib/fervor-lib )
-  LIST(APPEND LINKER_LIBS "Fervor" )
-ENDIF()
+INCLUDE( cmake/LibFervor.cmake )
+INCLUDE( cmake/LibPixfc.cmake )
 
 ######################################################################################
 # PlaYUVer modules build
diff --git a/cmake/LibFervor.cmake b/cmake/LibFervor.cmake
new file mode 100644
index 0000000..b6fb941
--- /dev/null
+++ b/cmake/LibFervor.cmake
@@ -0,0 +1,20 @@
+#####################################################################################
+# Pixfc-sse library cmake file
+######################################################################################
+# https://github.com/pixlra/fervor
+# git clone https://github.com/pixlra/fervor.git source/lib
+
+SET( FERVOR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/source/lib/fervor )
+
+IF( USE_FERVOR )
+  IF(EXISTS ${FERVOR_DIR} )
+    SET( FERVOR_APP_NAME ${PROJECT_NAME} ) 
+    SET( FERVOR_APP_VERSION ${PLAYUVER_VERSION} )
+    ADD_SUBDIRECTORY( ${FERVOR_DIR} )
+    INCLUDE_DIRECTORIES( ${FERVOR_DIR} )
+    LIST(APPEND LINKER_LIBS "Fervor" )
+  ELSE()
+    MESSAGE( "Fervor lib source code is not find in ${FERVOR_DIR}... Disabling it!" )
+    SET( USE_FERVOR False )
+  ENDIF()
+ENDIF()
\ No newline at end of file
diff --git a/cmake/LibOpenCV.cmake b/cmake/LibOpenCV.cmake
new file mode 100644
index 0000000..39b4be6
--- /dev/null
+++ b/cmake/LibOpenCV.cmake
@@ -0,0 +1,12 @@
+#####################################################################################
+# OpenCV library cmake file
+######################################################################################
+
+IF( USE_OPENCV )
+  FIND_PACKAGE( OpenCV )
+  IF( NOT OpenCV_FOUND)
+      SET(USE_OPENCV FALSE)
+  ELSE()
+      LIST(APPEND LINKER_LIBS ${OpenCV_LIBRARIES} )
+  ENDIF()
+ENDIF()
\ No newline at end of file