diff --git a/CMakeLists.txt b/CMakeLists.txt
index aa7d12d..81eaf28 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ SET( CMAKE_AUTOMOC ON )
 
 INCLUDE_DIRECTORIES( ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${SRC_DIR}/app ${SRC_DIR}/lib ) 
 
-FILE( GLOB SOURCES_FILES   ${SRC_DIR}/app/*.cpp ${SRC_DIR}/lib/*.cpp )
+FILE( GLOB SOURCES_FILES   ${SRC_DIR}/app/*.cpp )
 FILE( GLOB FORMS_FILES     ${UI_DIR}/*.ui   )
 FILE( GLOB RESOURCES_FILES ${RSC_DIR}/*.qrc ${RSC_DIR}/*.rc )
 
@@ -58,12 +58,20 @@ ADD_DEFINITIONS( "-DPLAYUVER" )
 ######################################################################################
 ADD_OPTION(PLAYUVER_WERROR              "Warnings as errors"       OFF )
 ADD_OPTION(PLAYUVER_THREADED_MODULES    "Warnings as errors"       ON  )
+ADD_OPTION(PLAYUVER_INSTALL_LIBS        "Install PlaYUVer Lib"     ON  )
 ADD_OPTION(USE_QT4                      "Build with QT4"           OFF )
 ADD_OPTION(USE_OPENCV                   "Add OpenCV support"       OFF )
 ADD_OPTION(USE_FFMPEG                   "Add FFMPEG support"       OFF )
 ADD_OPTION(USE_FERVOR                   "Add Fervor support"       OFF )
 ADD_OPTION(USE_PIXFC                    "Add PIXFC support"        OFF )
 
+######################################################################################
+# PlaYUVer lib
+######################################################################################
+FILE( GLOB PLAYUVER_LIB_SOURCES_FILES ${SRC_DIR}/lib/*.cpp )
+INCLUDE_DIRECTORIES( ${SRC_DIR}/lib )
+ADD_LIBRARY( PlaYUVerLib ${PLAYUVER_LIB_SOURCES_FILES} )
+  
 ######################################################################################
 # Dependencies
 ######################################################################################
@@ -117,7 +125,7 @@ SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}" )
 
 ADD_EXECUTABLE( ${PROJECT_NAME} ${SOURCES_FILES} ${HEADERS_MOC_FILES} ${FORMS_HEADERS_FILES} ${RESOURCES_RCC_FILES} )
 
-TARGET_LINK_LIBRARIES( ${PROJECT_NAME} ${PLAYUVER_LIBS}  ${MODULES_LIBS}  ${LINKER_LIBS} )
+TARGET_LINK_LIBRARIES( ${PROJECT_NAME} PlaYUVerLib ${MODULES_LIBS}  ${LINKER_LIBS} )
 
 IF( NOT USE_QT4)
     QT5_USE_MODULES( ${PROJECT_NAME} ${CURR_QT_MODULES} )
diff --git a/cmake/CMakeMacros.cmake b/cmake/CMakeMacros.cmake
index d4e9725..f81bb7c 100644
--- a/cmake/CMakeMacros.cmake
+++ b/cmake/CMakeMacros.cmake
@@ -110,9 +110,3 @@ macro(ADD_MODULE name file )
   endif()
   unset(__modulename)
 endmacro()
-
-macro(ADD_LIB name )
-  include_directories( ${SRC_DIR}/lib/${name} )
-  add_library( ${name} ${SRC_DIR}/lib/${files} )
-  set(PLAYUVER_LIBS ${PLAYUVER_LIBS} ${name})
-endmacro()
\ No newline at end of file
diff --git a/cmake/Install.cmake b/cmake/Install.cmake
index 287eba9..427741c 100644
--- a/cmake/Install.cmake
+++ b/cmake/Install.cmake
@@ -3,9 +3,9 @@
 ######################################################################################
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin )
-INSTALL(FILES resources/playuver.desktop DESTINATION share/applications )
-INSTALL(FILES resources/playuver.png DESTINATION share/icons )
-INSTALL(FILES resources/x-raw.xml DESTINATION share/mime/video )
+INSTALL(FILES ${RSC_DIR}/playuver.desktop DESTINATION share/applications )
+INSTALL(FILES ${RSC_DIR}/playuver.png DESTINATION share/icons )
+INSTALL(FILES ${RSC_DIR}/x-raw.xml DESTINATION share/mime/video )
 
 IF( WIN32 )
   IF( NOT USE_QT4 )
@@ -45,6 +45,12 @@ IF( WIN32 )
   ENDIF()
 ENDIF()
 
+IF( PLAYUVER_INSTALL_LIBS )
+  FILE( GLOB PLAYUVER_LIB_INCLUDE_FILES   ${SRC_DIR}/lib/*.h ) 
+  INSTALL(FILES ${PLAYUVER_LIB_INCLUDE_FILES} DESTINATION include )
+  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libPlaYUVerLib.a DESTINATION lib )
+ENDIF()
+
 
 ######################################################################################
 # Create deb package
diff --git a/config.h.in b/config.h.in
index e73d935..011d3f2 100644
--- a/config.h.in
+++ b/config.h.in
@@ -30,6 +30,7 @@
 /* QT definition */
 #cmakedefine USE_QT4
 
+#undef QT_VERSION_PLAYUVER
 #ifndef USE_QT4
   #define QT_VERSION_PLAYUVER 5
 #else
diff --git a/source/lib/PlaYUVerFrameStatistics.cpp b/source/app/PlaYUVerFrameStatistics.cpp
similarity index 100%
rename from source/lib/PlaYUVerFrameStatistics.cpp
rename to source/app/PlaYUVerFrameStatistics.cpp
diff --git a/source/lib/PlaYUVerFrameStatistics.h b/source/app/PlaYUVerFrameStatistics.h
similarity index 100%
rename from source/lib/PlaYUVerFrameStatistics.h
rename to source/app/PlaYUVerFrameStatistics.h