diff --git a/pglab/pglab.pro b/pglab/pglab.pro
index 4ec79d0..02a7389 100644
--- a/pglab/pglab.pro
+++ b/pglab/pglab.pro
@@ -32,23 +32,16 @@ win32:RC_ICONS += pglab.ico
 SOURCES += main.cpp\
     QueryResultModel.cpp \
     QueryExplainModel.cpp \
-	ASyncDBConnection.cpp \
     tsqueue.cpp \
 	CreateDatabaseDialog.cpp \
     DatabaseWindow.cpp \
 	ConnectionManagerWindow.cpp \
 	ConnectionListModel.cpp \
-	ConnectionConfig.cpp \
     BackupRestore.cpp \
     QueryTab.cpp \
     stopwatch.cpp \
-    util.cpp \
     DatabaseInspectorWidget.cpp \
-	PgType.cpp \
-	PgTypeContainer.cpp \
     TuplesResultWidget.cpp \
-    PgNamespace.cpp \
-    PgClass.cpp \
     BackupDialog.cpp \
     TypeSelectionItemModel.cpp \
     MasterController.cpp \
@@ -59,11 +52,7 @@ SOURCES += main.cpp\
     ServerWindow.cpp \
     ASyncWindow.cpp \
     DatabasesTableModel.cpp \
-    PgDatabase.cpp \
-    PgDatabaseContainer.cpp \
     RolesTableModel.cpp \
-    PgAuthId.cpp \
-    PgAuthIdContainer.cpp \
     ConnectionList.cpp \
     ProcessStdioWidget.cpp \
     GlobalIoService.cpp \
@@ -72,40 +61,23 @@ SOURCES += main.cpp\
     BaseTableModel.cpp \
     QueryParamListController.cpp \
     TablesPage.cpp \
-    PgClassContainer.cpp \
     TablesTableModel.cpp \
-    PgDatabaseCatalog.cpp \
-    PgNamespaceContainer.cpp \
     ColumnTableModel.cpp \
-    PgAttribute.cpp \
-    PgContainer.cpp \
-    PgAttributeContainer.cpp \
-    PgIndex.cpp \
-    PgIndexContainer.cpp \
-    PgConstraint.cpp \
-    PgConstraintContainer.cpp \
     NamespaceFilterWidget.cpp \
     NamespaceItemModel.cpp
 
 HEADERS  += \
     QueryResultModel.h \
     QueryExplainModel.h \
-	ASyncDBConnection.h \
     tsqueue.h \
 	CreateDatabaseDialog.h \
     DatabaseWindow.h \
 	ConnectionManagerWindow.h \
 	ConnectionListModel.h \
-	ConnectionConfig.h \
     QueryTab.h \
     stopwatch.h \
-    util.h \
     DatabaseInspectorWidget.h \
-	PgType.h \
-	PgTypeContainer.h \
     TuplesResultWidget.h \
-    PgNamespace.h \
-    PgClass.h \
     BackupDialog.h \
     TypeSelectionItemModel.h \
     MasterController.h \
@@ -116,12 +88,7 @@ HEADERS  += \
     ServerWindow.h \
     ASyncWindow.h \
     DatabasesTableModel.h \
-    PgDatabase.h \
-    PgDatabaseContainer.h \
-    PgContainer.h \
     RolesTableModel.h \
-    PgAuthId.h \
-    PgAuthIdContainer.h \
     ConnectionList.h \
     ProcessStdioWidget.h \
     GlobalIoService.h \
@@ -130,17 +97,8 @@ HEADERS  += \
     BaseTableModel.h \
     QueryParamListController.h \
     TablesPage.h \
-    PgClassContainer.h \
     TablesTableModel.h \
-    PgDatabaseCatalog.h \
-    PgNamespaceContainer.h \
     ColumnTableModel.h \
-    PgAttribute.h \
-    PgAttributeContainer.h \
-    PgIndex.h \
-    PgIndexContainer.h \
-    PgConstraint.h \
-    PgConstraintContainer.h \
     NamespaceFilterWidget.h \
     NamespaceItemModel.h
 
diff --git a/pglab/ASyncDBConnection.cpp b/pglablib/ASyncDBConnection.cpp
similarity index 100%
rename from pglab/ASyncDBConnection.cpp
rename to pglablib/ASyncDBConnection.cpp
diff --git a/pglab/ASyncDBConnection.h b/pglablib/ASyncDBConnection.h
similarity index 100%
rename from pglab/ASyncDBConnection.h
rename to pglablib/ASyncDBConnection.h
diff --git a/pglab/ConnectionConfig.cpp b/pglablib/ConnectionConfig.cpp
similarity index 100%
rename from pglab/ConnectionConfig.cpp
rename to pglablib/ConnectionConfig.cpp
diff --git a/pglab/ConnectionConfig.h b/pglablib/ConnectionConfig.h
similarity index 100%
rename from pglab/ConnectionConfig.h
rename to pglablib/ConnectionConfig.h
diff --git a/pglab/PgAttribute.cpp b/pglablib/PgAttribute.cpp
similarity index 100%
rename from pglab/PgAttribute.cpp
rename to pglablib/PgAttribute.cpp
diff --git a/pglab/PgAttribute.h b/pglablib/PgAttribute.h
similarity index 100%
rename from pglab/PgAttribute.h
rename to pglablib/PgAttribute.h
diff --git a/pglab/PgAttributeContainer.cpp b/pglablib/PgAttributeContainer.cpp
similarity index 100%
rename from pglab/PgAttributeContainer.cpp
rename to pglablib/PgAttributeContainer.cpp
diff --git a/pglab/PgAttributeContainer.h b/pglablib/PgAttributeContainer.h
similarity index 100%
rename from pglab/PgAttributeContainer.h
rename to pglablib/PgAttributeContainer.h
diff --git a/pglab/PgAuthId.cpp b/pglablib/PgAuthId.cpp
similarity index 100%
rename from pglab/PgAuthId.cpp
rename to pglablib/PgAuthId.cpp
diff --git a/pglab/PgAuthId.h b/pglablib/PgAuthId.h
similarity index 100%
rename from pglab/PgAuthId.h
rename to pglablib/PgAuthId.h
diff --git a/pglab/PgAuthIdContainer.cpp b/pglablib/PgAuthIdContainer.cpp
similarity index 100%
rename from pglab/PgAuthIdContainer.cpp
rename to pglablib/PgAuthIdContainer.cpp
diff --git a/pglab/PgAuthIdContainer.h b/pglablib/PgAuthIdContainer.h
similarity index 100%
rename from pglab/PgAuthIdContainer.h
rename to pglablib/PgAuthIdContainer.h
diff --git a/pglab/PgClass.cpp b/pglablib/PgClass.cpp
similarity index 100%
rename from pglab/PgClass.cpp
rename to pglablib/PgClass.cpp
diff --git a/pglab/PgClass.h b/pglablib/PgClass.h
similarity index 100%
rename from pglab/PgClass.h
rename to pglablib/PgClass.h
diff --git a/pglab/PgClassContainer.cpp b/pglablib/PgClassContainer.cpp
similarity index 100%
rename from pglab/PgClassContainer.cpp
rename to pglablib/PgClassContainer.cpp
diff --git a/pglab/PgClassContainer.h b/pglablib/PgClassContainer.h
similarity index 100%
rename from pglab/PgClassContainer.h
rename to pglablib/PgClassContainer.h
diff --git a/pglab/PgConstraint.cpp b/pglablib/PgConstraint.cpp
similarity index 100%
rename from pglab/PgConstraint.cpp
rename to pglablib/PgConstraint.cpp
diff --git a/pglab/PgConstraint.h b/pglablib/PgConstraint.h
similarity index 100%
rename from pglab/PgConstraint.h
rename to pglablib/PgConstraint.h
diff --git a/pglab/PgConstraintContainer.cpp b/pglablib/PgConstraintContainer.cpp
similarity index 100%
rename from pglab/PgConstraintContainer.cpp
rename to pglablib/PgConstraintContainer.cpp
diff --git a/pglab/PgConstraintContainer.h b/pglablib/PgConstraintContainer.h
similarity index 100%
rename from pglab/PgConstraintContainer.h
rename to pglablib/PgConstraintContainer.h
diff --git a/pglab/PgContainer.cpp b/pglablib/PgContainer.cpp
similarity index 100%
rename from pglab/PgContainer.cpp
rename to pglablib/PgContainer.cpp
diff --git a/pglab/PgContainer.h b/pglablib/PgContainer.h
similarity index 100%
rename from pglab/PgContainer.h
rename to pglablib/PgContainer.h
diff --git a/pglab/PgDatabase.cpp b/pglablib/PgDatabase.cpp
similarity index 100%
rename from pglab/PgDatabase.cpp
rename to pglablib/PgDatabase.cpp
diff --git a/pglab/PgDatabase.h b/pglablib/PgDatabase.h
similarity index 100%
rename from pglab/PgDatabase.h
rename to pglablib/PgDatabase.h
diff --git a/pglab/PgDatabaseCatalog.cpp b/pglablib/PgDatabaseCatalog.cpp
similarity index 100%
rename from pglab/PgDatabaseCatalog.cpp
rename to pglablib/PgDatabaseCatalog.cpp
diff --git a/pglab/PgDatabaseCatalog.h b/pglablib/PgDatabaseCatalog.h
similarity index 100%
rename from pglab/PgDatabaseCatalog.h
rename to pglablib/PgDatabaseCatalog.h
diff --git a/pglab/PgDatabaseContainer.cpp b/pglablib/PgDatabaseContainer.cpp
similarity index 100%
rename from pglab/PgDatabaseContainer.cpp
rename to pglablib/PgDatabaseContainer.cpp
diff --git a/pglab/PgDatabaseContainer.h b/pglablib/PgDatabaseContainer.h
similarity index 100%
rename from pglab/PgDatabaseContainer.h
rename to pglablib/PgDatabaseContainer.h
diff --git a/pglab/PgIndex.cpp b/pglablib/PgIndex.cpp
similarity index 100%
rename from pglab/PgIndex.cpp
rename to pglablib/PgIndex.cpp
diff --git a/pglab/PgIndex.h b/pglablib/PgIndex.h
similarity index 100%
rename from pglab/PgIndex.h
rename to pglablib/PgIndex.h
diff --git a/pglab/PgIndexContainer.cpp b/pglablib/PgIndexContainer.cpp
similarity index 100%
rename from pglab/PgIndexContainer.cpp
rename to pglablib/PgIndexContainer.cpp
diff --git a/pglab/PgIndexContainer.h b/pglablib/PgIndexContainer.h
similarity index 100%
rename from pglab/PgIndexContainer.h
rename to pglablib/PgIndexContainer.h
diff --git a/pglab/PgNamespace.cpp b/pglablib/PgNamespace.cpp
similarity index 100%
rename from pglab/PgNamespace.cpp
rename to pglablib/PgNamespace.cpp
diff --git a/pglab/PgNamespace.h b/pglablib/PgNamespace.h
similarity index 100%
rename from pglab/PgNamespace.h
rename to pglablib/PgNamespace.h
diff --git a/pglab/PgNamespaceContainer.cpp b/pglablib/PgNamespaceContainer.cpp
similarity index 100%
rename from pglab/PgNamespaceContainer.cpp
rename to pglablib/PgNamespaceContainer.cpp
diff --git a/pglab/PgNamespaceContainer.h b/pglablib/PgNamespaceContainer.h
similarity index 100%
rename from pglab/PgNamespaceContainer.h
rename to pglablib/PgNamespaceContainer.h
diff --git a/pglab/PgType.cpp b/pglablib/PgType.cpp
similarity index 100%
rename from pglab/PgType.cpp
rename to pglablib/PgType.cpp
diff --git a/pglab/PgType.h b/pglablib/PgType.h
similarity index 100%
rename from pglab/PgType.h
rename to pglablib/PgType.h
diff --git a/pglab/PgTypeContainer.cpp b/pglablib/PgTypeContainer.cpp
similarity index 100%
rename from pglab/PgTypeContainer.cpp
rename to pglablib/PgTypeContainer.cpp
diff --git a/pglab/PgTypeContainer.h b/pglablib/PgTypeContainer.h
similarity index 100%
rename from pglab/PgTypeContainer.h
rename to pglablib/PgTypeContainer.h
diff --git a/pglablib/pglablib.pro b/pglablib/pglablib.pro
index b95943f..ff12b07 100644
--- a/pglablib/pglablib.pro
+++ b/pglablib/pglablib.pro
@@ -27,13 +27,56 @@ INCLUDEPATH += C:\prog\include C:\Prog\include\pgsql C:\VSproj\boost32\include\b
 
 SOURCES += \
         Pglablib.cpp \
+	ASyncDBConnection.cpp \
+	ConnectionConfig.cpp \
+	PgType.cpp \
+	PgTypeContainer.cpp \
+    PgNamespace.cpp \
+    PgClass.cpp \
+    PgDatabase.cpp \
+    PgDatabaseContainer.cpp \
+    PgAuthId.cpp \
+    PgAuthIdContainer.cpp \
+    PgClassContainer.cpp \
+    PgDatabaseCatalog.cpp \
+    PgNamespaceContainer.cpp \
+    PgAttribute.cpp \
+    PgContainer.cpp \
+    PgAttributeContainer.cpp \
+    PgIndex.cpp \
+    PgIndexContainer.cpp \
+    PgConstraint.cpp \
+    PgConstraintContainer.cpp \
     ParamListJson.cpp \
-    ParamListModel.cpp
+    ParamListModel.cpp \
+    util.cpp
 
 HEADERS += \
         Pglablib.h \
+	ASyncDBConnection.h \
+	ConnectionConfig.h \
+	PgType.h \
+	PgTypeContainer.h \
+    PgNamespace.h \
+    PgClass.h \
+    PgDatabase.h \
+    PgDatabaseContainer.h \
+    PgContainer.h \
+    PgAuthId.h \
+    PgAuthIdContainer.h \
+    PgClassContainer.h \
+    PgDatabaseCatalog.h \
+    PgNamespaceContainer.h \
+    PgAttribute.h \
+    PgAttributeContainer.h \
+    PgIndex.h \
+    PgIndexContainer.h \
+    PgConstraint.h \
+    PgConstraintContainer.h \
     ParamListJson.h \
-    ParamListModel.h
+    ParamListModel.h \
+    util.h 
+
 unix {
     target.path = /usr/lib
     INSTALLS += target
diff --git a/pglab/util.cpp b/pglablib/util.cpp
similarity index 100%
rename from pglab/util.cpp
rename to pglablib/util.cpp
diff --git a/pglab/util.h b/pglablib/util.h
similarity index 100%
rename from pglab/util.h
rename to pglablib/util.h