diff --git a/app/PlaYUVerAppModuleIf.h b/app/PlaYUVerAppModuleIf.h
index ada2167..dd598f7 100644
--- a/app/PlaYUVerAppModuleIf.h
+++ b/app/PlaYUVerAppModuleIf.h
@@ -33,7 +33,7 @@
 #include "lib/PlaYUVerFrame.h"
 #include "lib/PlaYUVerStream.h"
 #include "ModuleHandleDock.h"
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 class QAction;
 
diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index fd925b0..0ddc733 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -29,6 +29,7 @@ set(plaYUver_Lib_HEADERS
     PlaYUVerDefs.h
     PlaYUVerFrame.h
     PlaYUVerStream.h
+    PlaYUVerModuleIf.h
 )
 
 # OPTION( USE_PIXFC  "Add PIXFC support"  OFF )
diff --git a/modules/PlaYUVerModuleIf.h b/lib/PlaYUVerModuleIf.h
similarity index 96%
rename from modules/PlaYUVerModuleIf.h
rename to lib/PlaYUVerModuleIf.h
index 97f7fcb..17e030a 100644
--- a/modules/PlaYUVerModuleIf.h
+++ b/lib/PlaYUVerModuleIf.h
@@ -25,10 +25,10 @@
 #ifndef __PLAYUVERMODULESIF_H__
 #define __PLAYUVERMODULESIF_H__
 
-#include "lib/PlaYUVerDefs.h"
-#include "lib/PlaYUVerFrame.h"
-#include "lib/PlaYUVerStream.h"
-#include "lib/ProgramOptions.h"
+#include "PlaYUVerDefs.h"
+#include "PlaYUVerFrame.h"
+#include "PlaYUVerStream.h"
+#include "ProgramOptions.h"
 #include <vector>
 
 namespace plaYUVer
diff --git a/modules/AbsoluteFrameDifference.h b/modules/AbsoluteFrameDifference.h
index 434d61a..a9678b9 100644
--- a/modules/AbsoluteFrameDifference.h
+++ b/modules/AbsoluteFrameDifference.h
@@ -25,7 +25,7 @@
 #ifndef __ABSOLUTEFRAMEDIFFERENCE_H__
 #define __ABSOLUTEFRAMEDIFFERENCE_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 #include <cassert>
 
diff --git a/modules/DisparityStereoBM.h b/modules/DisparityStereoBM.h
index f7ddaf6..0d75b19 100644
--- a/modules/DisparityStereoBM.h
+++ b/modules/DisparityStereoBM.h
@@ -26,7 +26,7 @@
 #define __DISPARITYSTEREOBM_H__
 
 #include <iostream>
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 #include <opencv2/opencv.hpp>
 
 #include <cassert>
diff --git a/modules/DisparityStereoSGBM.h b/modules/DisparityStereoSGBM.h
index deaf691..71abd7b 100644
--- a/modules/DisparityStereoSGBM.h
+++ b/modules/DisparityStereoSGBM.h
@@ -38,7 +38,7 @@
 #define __DISPARITYSTEREOSGBM_H__
 
 #include <iostream>
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 #include <opencv2/opencv.hpp>
 
 #include <cassert>
diff --git a/modules/EightBitsSampling.h b/modules/EightBitsSampling.h
index 98045b6..a72000e 100644
--- a/modules/EightBitsSampling.h
+++ b/modules/EightBitsSampling.h
@@ -25,7 +25,7 @@
 #ifndef __EIGHTBITSSAMPLING_H__
 #define __EIGHTBITSSAMPLING_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/FilterComponent.h b/modules/FilterComponent.h
index 16d71af..453cb0a 100644
--- a/modules/FilterComponent.h
+++ b/modules/FilterComponent.h
@@ -25,7 +25,7 @@
 #ifndef __FILTERCOMPONENT_H__
 #define __FILTERCOMPONENT_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/FrameBinarization.h b/modules/FrameBinarization.h
index aa6439c..f13f016 100644
--- a/modules/FrameBinarization.h
+++ b/modules/FrameBinarization.h
@@ -25,7 +25,7 @@
 #ifndef __FRAMEBINARIZATION_H__
 #define __FRAMEBINARIZATION_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/FrameCrop.h b/modules/FrameCrop.h
index eee1f60..5adc315 100644
--- a/modules/FrameCrop.h
+++ b/modules/FrameCrop.h
@@ -25,7 +25,7 @@
 #ifndef __FRAMECROP_H__
 #define __FRAMECROP_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/FrameDifference.h b/modules/FrameDifference.h
index 9b01b0c..ce1e0f6 100644
--- a/modules/FrameDifference.h
+++ b/modules/FrameDifference.h
@@ -25,7 +25,7 @@
 #ifndef __FRAMEDIFFERENCE_H__
 #define __FRAMEDIFFERENCE_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 #include <cassert>
 
diff --git a/modules/LumaAverage.h b/modules/LumaAverage.h
index 10662cf..870bee7 100644
--- a/modules/LumaAverage.h
+++ b/modules/LumaAverage.h
@@ -26,7 +26,7 @@
 #ifndef __LUMAAVERAGE_H__
 #define __LUMAAVERAGE_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/PlaYUVerModuleFactory.h b/modules/PlaYUVerModuleFactory.h
index 0abe327..5ea86d5 100644
--- a/modules/PlaYUVerModuleFactory.h
+++ b/modules/PlaYUVerModuleFactory.h
@@ -27,7 +27,7 @@
 
 #include <functional>
 #include <map>
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/modules/SetChromaHalfScale.h b/modules/SetChromaHalfScale.h
index 4a36c17..947b1e2 100644
--- a/modules/SetChromaHalfScale.h
+++ b/modules/SetChromaHalfScale.h
@@ -25,7 +25,7 @@
 #ifndef __CHROMA128_H__
 #define __CHROMA128_H__
 
-#include "PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 
 namespace plaYUVer
 {
diff --git a/tools/CommandLineHandle.cpp b/tools/CommandLineHandle.cpp
index 33055ce..5c6f2b8 100644
--- a/tools/CommandLineHandle.cpp
+++ b/tools/CommandLineHandle.cpp
@@ -27,7 +27,7 @@
 #include "CommandLineHandle.h"
 #include "lib/PlaYUVerFrame.h"
 #include "lib/PlaYUVerStream.h"
-#include "modules/PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 #include "modules/PlaYUVerModuleFactory.h"
 
 namespace plaYUVer
diff --git a/tools/PlaYUVerTools.cpp b/tools/PlaYUVerTools.cpp
index a28aa5e..649ad3b 100644
--- a/tools/PlaYUVerTools.cpp
+++ b/tools/PlaYUVerTools.cpp
@@ -24,7 +24,7 @@
 
 #include <cstring>
 #include "PlaYUVerTools.h"
-#include "modules/PlaYUVerModuleIf.h"
+#include "lib/PlaYUVerModuleIf.h"
 #include "modules/PlaYUVerModuleFactory.h"
 
 namespace plaYUVer