diff --git a/qad_application/CMakeLists.txt b/qad_application/CMakeLists.txt
index 70bcaf5..f6777be 100644
--- a/qad_application/CMakeLists.txt
+++ b/qad_application/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
diff --git a/qad_utils/CMakeLists.txt b/qad_utils/CMakeLists.txt
index cb06469..047c985 100644
--- a/qad_utils/CMakeLists.txt
+++ b/qad_utils/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets)
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
diff --git a/qad_utils/plugin/qad_utils.cpp b/qad_utils/plugin/qad_utils.cpp
index 76eccfc..1f0505a 100644
--- a/qad_utils/plugin/qad_utils.cpp
+++ b/qad_utils/plugin/qad_utils.cpp
@@ -1,9 +1,8 @@
-#include "qpiconfigplugin.h"
+//#include "qpiconfigplugin.h"
 #include "qad_utils.h"
 
-QADUtils::QADUtils(QObject * parent): QObject(parent)
-{
-	m_widgets.append(new QPIConfigPlugin(this));
+QADUtils::QADUtils(QObject * parent): QObject(parent) {
+	//m_widgets.append(new QPIConfigPlugin(this));
 }
 
 
diff --git a/qad_widgets/CMakeLists.txt b/qad_widgets/CMakeLists.txt
index ad60ff4..64d9750 100644
--- a/qad_widgets/CMakeLists.txt
+++ b/qad_widgets/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
 if (DEBUG)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
 endif ()
-set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY})
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_utils)
 file(GLOB MOCS "./*.h")
 file(GLOB CPPS "./*.cpp")
 file(GLOB UIS "./*.ui")
diff --git a/qad_widgets/plugin/qad_widgets.cpp b/qad_widgets/plugin/qad_widgets.cpp
index 8d4bd08..57fe666 100644
--- a/qad_widgets/plugin/qad_widgets.cpp
+++ b/qad_widgets/plugin/qad_widgets.cpp
@@ -11,6 +11,7 @@
 #include "iconedlabelplugin.h"
 #include "qcodeeditplugin.h"
 #include "qvarianteditplugin.h"
+#include "qpiconfigplugin.h"
 #include "qad_widgets.h"
 
 QADWidgets::QADWidgets(QObject * parent): QObject(parent)
@@ -28,6 +29,7 @@ QADWidgets::QADWidgets(QObject * parent): QObject(parent)
 	m_widgets.append(new IconedLabelPlugin(this));
 	m_widgets.append(new QCodeEditPlugin(this));
 	m_widgets.append(new QVariantEditPlugin(this));
+	m_widgets.append(new QPIConfigPlugin(this));
 }
 
 
diff --git a/qad_utils/plugin/qpiconfigplugin.cpp b/qad_widgets/plugin/qpiconfigplugin.cpp
similarity index 100%
rename from qad_utils/plugin/qpiconfigplugin.cpp
rename to qad_widgets/plugin/qpiconfigplugin.cpp
diff --git a/qad_utils/plugin/qpiconfigplugin.h b/qad_widgets/plugin/qpiconfigplugin.h
similarity index 100%
rename from qad_utils/plugin/qpiconfigplugin.h
rename to qad_widgets/plugin/qpiconfigplugin.h
diff --git a/qad_utils/qpiconfignewdialog.cpp b/qad_widgets/qpiconfignewdialog.cpp
similarity index 100%
rename from qad_utils/qpiconfignewdialog.cpp
rename to qad_widgets/qpiconfignewdialog.cpp
diff --git a/qad_utils/qpiconfignewdialog.h b/qad_widgets/qpiconfignewdialog.h
similarity index 100%
rename from qad_utils/qpiconfignewdialog.h
rename to qad_widgets/qpiconfignewdialog.h
diff --git a/qad_utils/qpiconfignewdialog.ui b/qad_widgets/qpiconfignewdialog.ui
similarity index 100%
rename from qad_utils/qpiconfignewdialog.ui
rename to qad_widgets/qpiconfignewdialog.ui
diff --git a/qad_utils/qpiconfigvaluewidget.cpp b/qad_widgets/qpiconfigvaluewidget.cpp
similarity index 100%
rename from qad_utils/qpiconfigvaluewidget.cpp
rename to qad_widgets/qpiconfigvaluewidget.cpp
diff --git a/qad_utils/qpiconfigvaluewidget.h b/qad_widgets/qpiconfigvaluewidget.h
similarity index 100%
rename from qad_utils/qpiconfigvaluewidget.h
rename to qad_widgets/qpiconfigvaluewidget.h
diff --git a/qad_utils/qpiconfigwidget.cpp b/qad_widgets/qpiconfigwidget.cpp
similarity index 100%
rename from qad_utils/qpiconfigwidget.cpp
rename to qad_widgets/qpiconfigwidget.cpp
diff --git a/qad_utils/qpiconfigwidget.h b/qad_widgets/qpiconfigwidget.h
similarity index 100%
rename from qad_utils/qpiconfigwidget.h
rename to qad_widgets/qpiconfigwidget.h
diff --git a/qad_utils/session_manager.cpp b/qad_widgets/session_manager.cpp
similarity index 100%
rename from qad_utils/session_manager.cpp
rename to qad_widgets/session_manager.cpp
diff --git a/qad_utils/session_manager.h b/qad_widgets/session_manager.h
similarity index 100%
rename from qad_utils/session_manager.h
rename to qad_widgets/session_manager.h