diff --git a/.gitignore b/.gitignore
index 1377554..85f404f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 *.swp
+build/*
diff --git a/CMakeLists.txt b/src/CMakeLists.txt
similarity index 100%
rename from CMakeLists.txt
rename to src/CMakeLists.txt
diff --git a/core/BackupFormatModel.cpp b/src/core/BackupFormatModel.cpp
similarity index 100%
rename from core/BackupFormatModel.cpp
rename to src/core/BackupFormatModel.cpp
diff --git a/core/BackupFormatModel.h b/src/core/BackupFormatModel.h
similarity index 100%
rename from core/BackupFormatModel.h
rename to src/core/BackupFormatModel.h
diff --git a/core/CsvWriter.cpp b/src/core/CsvWriter.cpp
similarity index 100%
rename from core/CsvWriter.cpp
rename to src/core/CsvWriter.cpp
diff --git a/core/CsvWriter.h b/src/core/CsvWriter.h
similarity index 100%
rename from core/CsvWriter.h
rename to src/core/CsvWriter.h
diff --git a/core/Expected.h b/src/core/Expected.h
similarity index 100%
rename from core/Expected.h
rename to src/core/Expected.h
diff --git a/core/PasswordManager.cpp b/src/core/PasswordManager.cpp
similarity index 100%
rename from core/PasswordManager.cpp
rename to src/core/PasswordManager.cpp
diff --git a/core/PasswordManager.h b/src/core/PasswordManager.h
similarity index 100%
rename from core/PasswordManager.h
rename to src/core/PasswordManager.h
diff --git a/core/ScopeGuard.h b/src/core/ScopeGuard.h
similarity index 100%
rename from core/ScopeGuard.h
rename to src/core/ScopeGuard.h
diff --git a/core/SqlLexer.cpp b/src/core/SqlLexer.cpp
similarity index 100%
rename from core/SqlLexer.cpp
rename to src/core/SqlLexer.cpp
diff --git a/core/SqlLexer.h b/src/core/SqlLexer.h
similarity index 100%
rename from core/SqlLexer.h
rename to src/core/SqlLexer.h
diff --git a/core/my_boost_assert_handler.cpp b/src/core/my_boost_assert_handler.cpp
similarity index 100%
rename from core/my_boost_assert_handler.cpp
rename to src/core/my_boost_assert_handler.cpp
diff --git a/pglab/.gitignore b/src/pglab/.gitignore
similarity index 100%
rename from pglab/.gitignore
rename to src/pglab/.gitignore
diff --git a/pglab/ASyncDBConnection.cpp b/src/pglab/ASyncDBConnection.cpp
similarity index 100%
rename from pglab/ASyncDBConnection.cpp
rename to src/pglab/ASyncDBConnection.cpp
diff --git a/pglab/ASyncDBConnection.h b/src/pglab/ASyncDBConnection.h
similarity index 100%
rename from pglab/ASyncDBConnection.h
rename to src/pglab/ASyncDBConnection.h
diff --git a/pglab/ASyncWindow.cpp b/src/pglab/ASyncWindow.cpp
similarity index 100%
rename from pglab/ASyncWindow.cpp
rename to src/pglab/ASyncWindow.cpp
diff --git a/pglab/ASyncWindow.h b/src/pglab/ASyncWindow.h
similarity index 100%
rename from pglab/ASyncWindow.h
rename to src/pglab/ASyncWindow.h
diff --git a/pglab/BackupDialog.cpp b/src/pglab/BackupDialog.cpp
similarity index 100%
rename from pglab/BackupDialog.cpp
rename to src/pglab/BackupDialog.cpp
diff --git a/pglab/BackupDialog.h b/src/pglab/BackupDialog.h
similarity index 100%
rename from pglab/BackupDialog.h
rename to src/pglab/BackupDialog.h
diff --git a/pglab/BackupDialog.ui b/src/pglab/BackupDialog.ui
similarity index 100%
rename from pglab/BackupDialog.ui
rename to src/pglab/BackupDialog.ui
diff --git a/pglab/BackupRestore.cpp b/src/pglab/BackupRestore.cpp
similarity index 100%
rename from pglab/BackupRestore.cpp
rename to src/pglab/BackupRestore.cpp
diff --git a/pglab/ConnectionConfig.cpp b/src/pglab/ConnectionConfig.cpp
similarity index 100%
rename from pglab/ConnectionConfig.cpp
rename to src/pglab/ConnectionConfig.cpp
diff --git a/pglab/ConnectionConfig.h b/src/pglab/ConnectionConfig.h
similarity index 100%
rename from pglab/ConnectionConfig.h
rename to src/pglab/ConnectionConfig.h
diff --git a/pglab/ConnectionList.cpp b/src/pglab/ConnectionList.cpp
similarity index 100%
rename from pglab/ConnectionList.cpp
rename to src/pglab/ConnectionList.cpp
diff --git a/pglab/ConnectionList.h b/src/pglab/ConnectionList.h
similarity index 100%
rename from pglab/ConnectionList.h
rename to src/pglab/ConnectionList.h
diff --git a/pglab/ConnectionListModel.cpp b/src/pglab/ConnectionListModel.cpp
similarity index 100%
rename from pglab/ConnectionListModel.cpp
rename to src/pglab/ConnectionListModel.cpp
diff --git a/pglab/ConnectionListModel.h b/src/pglab/ConnectionListModel.h
similarity index 100%
rename from pglab/ConnectionListModel.h
rename to src/pglab/ConnectionListModel.h
diff --git a/pglab/ConnectionManagerWindow.cpp b/src/pglab/ConnectionManagerWindow.cpp
similarity index 100%
rename from pglab/ConnectionManagerWindow.cpp
rename to src/pglab/ConnectionManagerWindow.cpp
diff --git a/pglab/ConnectionManagerWindow.h b/src/pglab/ConnectionManagerWindow.h
similarity index 100%
rename from pglab/ConnectionManagerWindow.h
rename to src/pglab/ConnectionManagerWindow.h
diff --git a/pglab/ConnectionManagerWindow.ui b/src/pglab/ConnectionManagerWindow.ui
similarity index 100%
rename from pglab/ConnectionManagerWindow.ui
rename to src/pglab/ConnectionManagerWindow.ui
diff --git a/pglab/DatabaseInspectorWidget.cpp b/src/pglab/DatabaseInspectorWidget.cpp
similarity index 100%
rename from pglab/DatabaseInspectorWidget.cpp
rename to src/pglab/DatabaseInspectorWidget.cpp
diff --git a/pglab/DatabaseInspectorWidget.h b/src/pglab/DatabaseInspectorWidget.h
similarity index 100%
rename from pglab/DatabaseInspectorWidget.h
rename to src/pglab/DatabaseInspectorWidget.h
diff --git a/pglab/DatabaseInspectorWidget.ui b/src/pglab/DatabaseInspectorWidget.ui
similarity index 100%
rename from pglab/DatabaseInspectorWidget.ui
rename to src/pglab/DatabaseInspectorWidget.ui
diff --git a/pglab/DatabaseWindow.cpp b/src/pglab/DatabaseWindow.cpp
similarity index 100%
rename from pglab/DatabaseWindow.cpp
rename to src/pglab/DatabaseWindow.cpp
diff --git a/pglab/DatabaseWindow.h b/src/pglab/DatabaseWindow.h
similarity index 100%
rename from pglab/DatabaseWindow.h
rename to src/pglab/DatabaseWindow.h
diff --git a/pglab/DatabaseWindow.ui b/src/pglab/DatabaseWindow.ui
similarity index 100%
rename from pglab/DatabaseWindow.ui
rename to src/pglab/DatabaseWindow.ui
diff --git a/pglab/DatabasesTableModel.cpp b/src/pglab/DatabasesTableModel.cpp
similarity index 100%
rename from pglab/DatabasesTableModel.cpp
rename to src/pglab/DatabasesTableModel.cpp
diff --git a/pglab/DatabasesTableModel.h b/src/pglab/DatabasesTableModel.h
similarity index 100%
rename from pglab/DatabasesTableModel.h
rename to src/pglab/DatabasesTableModel.h
diff --git a/pglab/Doxyfile b/src/pglab/Doxyfile
similarity index 100%
rename from pglab/Doxyfile
rename to src/pglab/Doxyfile
diff --git a/pglab/ExplainTreeModelItem.cpp b/src/pglab/ExplainTreeModelItem.cpp
similarity index 100%
rename from pglab/ExplainTreeModelItem.cpp
rename to src/pglab/ExplainTreeModelItem.cpp
diff --git a/pglab/ExplainTreeModelItem.h b/src/pglab/ExplainTreeModelItem.h
similarity index 100%
rename from pglab/ExplainTreeModelItem.h
rename to src/pglab/ExplainTreeModelItem.h
diff --git a/pglab/GlobalIoService.cpp b/src/pglab/GlobalIoService.cpp
similarity index 100%
rename from pglab/GlobalIoService.cpp
rename to src/pglab/GlobalIoService.cpp
diff --git a/pglab/GlobalIoService.h b/src/pglab/GlobalIoService.h
similarity index 100%
rename from pglab/GlobalIoService.h
rename to src/pglab/GlobalIoService.h
diff --git a/pglab/MainWindow.cpp b/src/pglab/MainWindow.cpp
similarity index 100%
rename from pglab/MainWindow.cpp
rename to src/pglab/MainWindow.cpp
diff --git a/pglab/MainWindow.h b/src/pglab/MainWindow.h
similarity index 100%
rename from pglab/MainWindow.h
rename to src/pglab/MainWindow.h
diff --git a/pglab/MainWindow.ui b/src/pglab/MainWindow.ui
similarity index 100%
rename from pglab/MainWindow.ui
rename to src/pglab/MainWindow.ui
diff --git a/pglab/MasterController.cpp b/src/pglab/MasterController.cpp
similarity index 100%
rename from pglab/MasterController.cpp
rename to src/pglab/MasterController.cpp
diff --git a/pglab/MasterController.h b/src/pglab/MasterController.h
similarity index 100%
rename from pglab/MasterController.h
rename to src/pglab/MasterController.h
diff --git a/pglab/OpenDatabase.cpp b/src/pglab/OpenDatabase.cpp
similarity index 100%
rename from pglab/OpenDatabase.cpp
rename to src/pglab/OpenDatabase.cpp
diff --git a/pglab/OpenDatabase.h b/src/pglab/OpenDatabase.h
similarity index 100%
rename from pglab/OpenDatabase.h
rename to src/pglab/OpenDatabase.h
diff --git a/pglab/ParamListModel.cpp b/src/pglab/ParamListModel.cpp
similarity index 100%
rename from pglab/ParamListModel.cpp
rename to src/pglab/ParamListModel.cpp
diff --git a/pglab/ParamListModel.h b/src/pglab/ParamListModel.h
similarity index 100%
rename from pglab/ParamListModel.h
rename to src/pglab/ParamListModel.h
diff --git a/pglab/ParamTypeDelegate.cpp b/src/pglab/ParamTypeDelegate.cpp
similarity index 100%
rename from pglab/ParamTypeDelegate.cpp
rename to src/pglab/ParamTypeDelegate.cpp
diff --git a/pglab/ParamTypeDelegate.h b/src/pglab/ParamTypeDelegate.h
similarity index 100%
rename from pglab/ParamTypeDelegate.h
rename to src/pglab/ParamTypeDelegate.h
diff --git a/pglab/PgAuthId.cpp b/src/pglab/PgAuthId.cpp
similarity index 100%
rename from pglab/PgAuthId.cpp
rename to src/pglab/PgAuthId.cpp
diff --git a/pglab/PgAuthId.h b/src/pglab/PgAuthId.h
similarity index 100%
rename from pglab/PgAuthId.h
rename to src/pglab/PgAuthId.h
diff --git a/pglab/PgAuthIdContainer.cpp b/src/pglab/PgAuthIdContainer.cpp
similarity index 100%
rename from pglab/PgAuthIdContainer.cpp
rename to src/pglab/PgAuthIdContainer.cpp
diff --git a/pglab/PgAuthIdContainer.h b/src/pglab/PgAuthIdContainer.h
similarity index 100%
rename from pglab/PgAuthIdContainer.h
rename to src/pglab/PgAuthIdContainer.h
diff --git a/pglab/PgClass.cpp b/src/pglab/PgClass.cpp
similarity index 100%
rename from pglab/PgClass.cpp
rename to src/pglab/PgClass.cpp
diff --git a/pglab/PgClass.h b/src/pglab/PgClass.h
similarity index 100%
rename from pglab/PgClass.h
rename to src/pglab/PgClass.h
diff --git a/pglab/PgContainer.h b/src/pglab/PgContainer.h
similarity index 100%
rename from pglab/PgContainer.h
rename to src/pglab/PgContainer.h
diff --git a/pglab/PgDatabase.cpp b/src/pglab/PgDatabase.cpp
similarity index 100%
rename from pglab/PgDatabase.cpp
rename to src/pglab/PgDatabase.cpp
diff --git a/pglab/PgDatabase.h b/src/pglab/PgDatabase.h
similarity index 100%
rename from pglab/PgDatabase.h
rename to src/pglab/PgDatabase.h
diff --git a/pglab/PgDatabaseCatalogue.cpp b/src/pglab/PgDatabaseCatalogue.cpp
similarity index 100%
rename from pglab/PgDatabaseCatalogue.cpp
rename to src/pglab/PgDatabaseCatalogue.cpp
diff --git a/pglab/PgDatabaseCatalogue.h b/src/pglab/PgDatabaseCatalogue.h
similarity index 100%
rename from pglab/PgDatabaseCatalogue.h
rename to src/pglab/PgDatabaseCatalogue.h
diff --git a/pglab/PgDatabaseContainer.cpp b/src/pglab/PgDatabaseContainer.cpp
similarity index 100%
rename from pglab/PgDatabaseContainer.cpp
rename to src/pglab/PgDatabaseContainer.cpp
diff --git a/pglab/PgDatabaseContainer.h b/src/pglab/PgDatabaseContainer.h
similarity index 100%
rename from pglab/PgDatabaseContainer.h
rename to src/pglab/PgDatabaseContainer.h
diff --git a/pglab/PgNamespace.cpp b/src/pglab/PgNamespace.cpp
similarity index 100%
rename from pglab/PgNamespace.cpp
rename to src/pglab/PgNamespace.cpp
diff --git a/pglab/PgNamespace.h b/src/pglab/PgNamespace.h
similarity index 100%
rename from pglab/PgNamespace.h
rename to src/pglab/PgNamespace.h
diff --git a/pglab/PgType.cpp b/src/pglab/PgType.cpp
similarity index 100%
rename from pglab/PgType.cpp
rename to src/pglab/PgType.cpp
diff --git a/pglab/PgType.h b/src/pglab/PgType.h
similarity index 100%
rename from pglab/PgType.h
rename to src/pglab/PgType.h
diff --git a/pglab/PgTypeContainer.cpp b/src/pglab/PgTypeContainer.cpp
similarity index 100%
rename from pglab/PgTypeContainer.cpp
rename to src/pglab/PgTypeContainer.cpp
diff --git a/pglab/PgTypeContainer.h b/src/pglab/PgTypeContainer.h
similarity index 100%
rename from pglab/PgTypeContainer.h
rename to src/pglab/PgTypeContainer.h
diff --git a/pglab/ProcessStdioWidget.cpp b/src/pglab/ProcessStdioWidget.cpp
similarity index 100%
rename from pglab/ProcessStdioWidget.cpp
rename to src/pglab/ProcessStdioWidget.cpp
diff --git a/pglab/ProcessStdioWidget.h b/src/pglab/ProcessStdioWidget.h
similarity index 100%
rename from pglab/ProcessStdioWidget.h
rename to src/pglab/ProcessStdioWidget.h
diff --git a/pglab/ProcessStdioWidget.ui b/src/pglab/ProcessStdioWidget.ui
similarity index 100%
rename from pglab/ProcessStdioWidget.ui
rename to src/pglab/ProcessStdioWidget.ui
diff --git a/pglab/QueryExplainModel.cpp b/src/pglab/QueryExplainModel.cpp
similarity index 100%
rename from pglab/QueryExplainModel.cpp
rename to src/pglab/QueryExplainModel.cpp
diff --git a/pglab/QueryExplainModel.h b/src/pglab/QueryExplainModel.h
similarity index 100%
rename from pglab/QueryExplainModel.h
rename to src/pglab/QueryExplainModel.h
diff --git a/pglab/QueryResultModel.cpp b/src/pglab/QueryResultModel.cpp
similarity index 100%
rename from pglab/QueryResultModel.cpp
rename to src/pglab/QueryResultModel.cpp
diff --git a/pglab/QueryResultModel.h b/src/pglab/QueryResultModel.h
similarity index 100%
rename from pglab/QueryResultModel.h
rename to src/pglab/QueryResultModel.h
diff --git a/pglab/QueryTab.cpp b/src/pglab/QueryTab.cpp
similarity index 100%
rename from pglab/QueryTab.cpp
rename to src/pglab/QueryTab.cpp
diff --git a/pglab/QueryTab.h b/src/pglab/QueryTab.h
similarity index 100%
rename from pglab/QueryTab.h
rename to src/pglab/QueryTab.h
diff --git a/pglab/QueryTab.ui b/src/pglab/QueryTab.ui
similarity index 100%
rename from pglab/QueryTab.ui
rename to src/pglab/QueryTab.ui
diff --git a/pglab/RolesTableModel.cpp b/src/pglab/RolesTableModel.cpp
similarity index 100%
rename from pglab/RolesTableModel.cpp
rename to src/pglab/RolesTableModel.cpp
diff --git a/pglab/RolesTableModel.h b/src/pglab/RolesTableModel.h
similarity index 100%
rename from pglab/RolesTableModel.h
rename to src/pglab/RolesTableModel.h
diff --git a/pglab/ServerWindow.cpp b/src/pglab/ServerWindow.cpp
similarity index 100%
rename from pglab/ServerWindow.cpp
rename to src/pglab/ServerWindow.cpp
diff --git a/pglab/ServerWindow.h b/src/pglab/ServerWindow.h
similarity index 100%
rename from pglab/ServerWindow.h
rename to src/pglab/ServerWindow.h
diff --git a/pglab/ServerWindow.ui b/src/pglab/ServerWindow.ui
similarity index 100%
rename from pglab/ServerWindow.ui
rename to src/pglab/ServerWindow.ui
diff --git a/pglab/SqlSyntaxHighlighter.cpp b/src/pglab/SqlSyntaxHighlighter.cpp
similarity index 100%
rename from pglab/SqlSyntaxHighlighter.cpp
rename to src/pglab/SqlSyntaxHighlighter.cpp
diff --git a/pglab/SqlSyntaxHighlighter.h b/src/pglab/SqlSyntaxHighlighter.h
similarity index 100%
rename from pglab/SqlSyntaxHighlighter.h
rename to src/pglab/SqlSyntaxHighlighter.h
diff --git a/pglab/TypeSelectionItemModel.cpp b/src/pglab/TypeSelectionItemModel.cpp
similarity index 100%
rename from pglab/TypeSelectionItemModel.cpp
rename to src/pglab/TypeSelectionItemModel.cpp
diff --git a/pglab/TypeSelectionItemModel.h b/src/pglab/TypeSelectionItemModel.h
similarity index 100%
rename from pglab/TypeSelectionItemModel.h
rename to src/pglab/TypeSelectionItemModel.h
diff --git a/pglab/icons/16x16/document_green.png b/src/pglab/icons/16x16/document_green.png
similarity index 100%
rename from pglab/icons/16x16/document_green.png
rename to src/pglab/icons/16x16/document_green.png
diff --git a/pglab/icons/16x16/document_red.png b/src/pglab/icons/16x16/document_red.png
similarity index 100%
rename from pglab/icons/16x16/document_red.png
rename to src/pglab/icons/16x16/document_red.png
diff --git a/pglab/icons/16x16/document_yellow.png b/src/pglab/icons/16x16/document_yellow.png
similarity index 100%
rename from pglab/icons/16x16/document_yellow.png
rename to src/pglab/icons/16x16/document_yellow.png
diff --git a/pglab/icons/about.png b/src/pglab/icons/about.png
similarity index 100%
rename from pglab/icons/about.png
rename to src/pglab/icons/about.png
diff --git a/pglab/icons/add_connection.png b/src/pglab/icons/add_connection.png
similarity index 100%
rename from pglab/icons/add_connection.png
rename to src/pglab/icons/add_connection.png
diff --git a/pglab/icons/backup_database.png b/src/pglab/icons/backup_database.png
similarity index 100%
rename from pglab/icons/backup_database.png
rename to src/pglab/icons/backup_database.png
diff --git a/pglab/icons/delete_connection.png b/src/pglab/icons/delete_connection.png
similarity index 100%
rename from pglab/icons/delete_connection.png
rename to src/pglab/icons/delete_connection.png
diff --git a/pglab/icons/desktop.ini b/src/pglab/icons/desktop.ini
similarity index 100%
rename from pglab/icons/desktop.ini
rename to src/pglab/icons/desktop.ini
diff --git a/pglab/icons/folder.png b/src/pglab/icons/folder.png
similarity index 100%
rename from pglab/icons/folder.png
rename to src/pglab/icons/folder.png
diff --git a/pglab/icons/lightbulb.png b/src/pglab/icons/lightbulb.png
similarity index 100%
rename from pglab/icons/lightbulb.png
rename to src/pglab/icons/lightbulb.png
diff --git a/pglab/icons/lightbulb_off.png b/src/pglab/icons/lightbulb_off.png
similarity index 100%
rename from pglab/icons/lightbulb_off.png
rename to src/pglab/icons/lightbulb_off.png
diff --git a/pglab/icons/manage_server.png b/src/pglab/icons/manage_server.png
similarity index 100%
rename from pglab/icons/manage_server.png
rename to src/pglab/icons/manage_server.png
diff --git a/pglab/icons/new_query_tab.png b/src/pglab/icons/new_query_tab.png
similarity index 100%
rename from pglab/icons/new_query_tab.png
rename to src/pglab/icons/new_query_tab.png
diff --git a/pglab/icons/open_query_window.png b/src/pglab/icons/open_query_window.png
similarity index 100%
rename from pglab/icons/open_query_window.png
rename to src/pglab/icons/open_query_window.png
diff --git a/pglab/icons/page_white_add.png b/src/pglab/icons/page_white_add.png
similarity index 100%
rename from pglab/icons/page_white_add.png
rename to src/pglab/icons/page_white_add.png
diff --git a/pglab/icons/page_white_copy.png b/src/pglab/icons/page_white_copy.png
similarity index 100%
rename from pglab/icons/page_white_copy.png
rename to src/pglab/icons/page_white_copy.png
diff --git a/pglab/icons/page_white_delete.png b/src/pglab/icons/page_white_delete.png
similarity index 100%
rename from pglab/icons/page_white_delete.png
rename to src/pglab/icons/page_white_delete.png
diff --git a/pglab/icons/script_delete.png b/src/pglab/icons/script_delete.png
similarity index 100%
rename from pglab/icons/script_delete.png
rename to src/pglab/icons/script_delete.png
diff --git a/pglab/icons/script_go.png b/src/pglab/icons/script_go.png
similarity index 100%
rename from pglab/icons/script_go.png
rename to src/pglab/icons/script_go.png
diff --git a/pglab/icons/script_save.png b/src/pglab/icons/script_save.png
similarity index 100%
rename from pglab/icons/script_save.png
rename to src/pglab/icons/script_save.png
diff --git a/pglab/icons/server_delete.png b/src/pglab/icons/server_delete.png
similarity index 100%
rename from pglab/icons/server_delete.png
rename to src/pglab/icons/server_delete.png
diff --git a/pglab/icons/server_edit.png b/src/pglab/icons/server_edit.png
similarity index 100%
rename from pglab/icons/server_edit.png
rename to src/pglab/icons/server_edit.png
diff --git a/pglab/icons/server_go.png b/src/pglab/icons/server_go.png
similarity index 100%
rename from pglab/icons/server_go.png
rename to src/pglab/icons/server_go.png
diff --git a/pglab/icons/table_save.png b/src/pglab/icons/table_save.png
similarity index 100%
rename from pglab/icons/table_save.png
rename to src/pglab/icons/table_save.png
diff --git a/pglab/icons/token_shortland_character.png b/src/pglab/icons/token_shortland_character.png
similarity index 100%
rename from pglab/icons/token_shortland_character.png
rename to src/pglab/icons/token_shortland_character.png
diff --git a/pglab/json/json-forwards.h b/src/pglab/json/json-forwards.h
similarity index 100%
rename from pglab/json/json-forwards.h
rename to src/pglab/json/json-forwards.h
diff --git a/pglab/json/json.h b/src/pglab/json/json.h
similarity index 100%
rename from pglab/json/json.h
rename to src/pglab/json/json.h
diff --git a/pglab/jsoncpp.cpp b/src/pglab/jsoncpp.cpp
similarity index 100%
rename from pglab/jsoncpp.cpp
rename to src/pglab/jsoncpp.cpp
diff --git a/pglab/main.cpp b/src/pglab/main.cpp
similarity index 100%
rename from pglab/main.cpp
rename to src/pglab/main.cpp
diff --git a/pglab/pglab.ico b/src/pglab/pglab.ico
similarity index 100%
rename from pglab/pglab.ico
rename to src/pglab/pglab.ico
diff --git a/pglab/resources.qrc b/src/pglab/resources.qrc
similarity index 100%
rename from pglab/resources.qrc
rename to src/pglab/resources.qrc
diff --git a/pglab/src.pro b/src/pglab/src.pro
similarity index 100%
rename from pglab/src.pro
rename to src/pglab/src.pro
diff --git a/pglab/stopwatch.cpp b/src/pglab/stopwatch.cpp
similarity index 100%
rename from pglab/stopwatch.cpp
rename to src/pglab/stopwatch.cpp
diff --git a/pglab/stopwatch.h b/src/pglab/stopwatch.h
similarity index 100%
rename from pglab/stopwatch.h
rename to src/pglab/stopwatch.h
diff --git a/pglab/tsqueue.cpp b/src/pglab/tsqueue.cpp
similarity index 100%
rename from pglab/tsqueue.cpp
rename to src/pglab/tsqueue.cpp
diff --git a/pglab/tsqueue.h b/src/pglab/tsqueue.h
similarity index 100%
rename from pglab/tsqueue.h
rename to src/pglab/tsqueue.h
diff --git a/pglab/tuplesresultwidget.cpp b/src/pglab/tuplesresultwidget.cpp
similarity index 100%
rename from pglab/tuplesresultwidget.cpp
rename to src/pglab/tuplesresultwidget.cpp
diff --git a/pglab/tuplesresultwidget.h b/src/pglab/tuplesresultwidget.h
similarity index 100%
rename from pglab/tuplesresultwidget.h
rename to src/pglab/tuplesresultwidget.h
diff --git a/pglab/tuplesresultwidget.ui b/src/pglab/tuplesresultwidget.ui
similarity index 100%
rename from pglab/tuplesresultwidget.ui
rename to src/pglab/tuplesresultwidget.ui
diff --git a/pglab/util.cpp b/src/pglab/util.cpp
similarity index 100%
rename from pglab/util.cpp
rename to src/pglab/util.cpp
diff --git a/pglab/util.h b/src/pglab/util.h
similarity index 100%
rename from pglab/util.h
rename to src/pglab/util.h
diff --git a/pgsql/Pgsql_Connection.cpp b/src/pgsql/Pgsql_Connection.cpp
similarity index 100%
rename from pgsql/Pgsql_Connection.cpp
rename to src/pgsql/Pgsql_Connection.cpp
diff --git a/pgsql/Pgsql_Connection.h b/src/pgsql/Pgsql_Connection.h
similarity index 100%
rename from pgsql/Pgsql_Connection.h
rename to src/pgsql/Pgsql_Connection.h
diff --git a/pgsql/Pgsql_Params.cpp b/src/pgsql/Pgsql_Params.cpp
similarity index 100%
rename from pgsql/Pgsql_Params.cpp
rename to src/pgsql/Pgsql_Params.cpp
diff --git a/pgsql/Pgsql_Params.h b/src/pgsql/Pgsql_Params.h
similarity index 100%
rename from pgsql/Pgsql_Params.h
rename to src/pgsql/Pgsql_Params.h
diff --git a/pgsql/Pgsql_Result.cpp b/src/pgsql/Pgsql_Result.cpp
similarity index 100%
rename from pgsql/Pgsql_Result.cpp
rename to src/pgsql/Pgsql_Result.cpp
diff --git a/pgsql/Pgsql_Result.h b/src/pgsql/Pgsql_Result.h
similarity index 100%
rename from pgsql/Pgsql_Result.h
rename to src/pgsql/Pgsql_Result.h
diff --git a/pgsql/Pgsql_Row.cpp b/src/pgsql/Pgsql_Row.cpp
similarity index 100%
rename from pgsql/Pgsql_Row.cpp
rename to src/pgsql/Pgsql_Row.cpp
diff --git a/pgsql/Pgsql_Row.h b/src/pgsql/Pgsql_Row.h
similarity index 100%
rename from pgsql/Pgsql_Row.h
rename to src/pgsql/Pgsql_Row.h
diff --git a/pgsql/Pgsql_Value.cpp b/src/pgsql/Pgsql_Value.cpp
similarity index 100%
rename from pgsql/Pgsql_Value.cpp
rename to src/pgsql/Pgsql_Value.cpp
diff --git a/pgsql/Pgsql_Value.h b/src/pgsql/Pgsql_Value.h
similarity index 100%
rename from pgsql/Pgsql_Value.h
rename to src/pgsql/Pgsql_Value.h
diff --git a/pgsql/Pgsql_declare.h b/src/pgsql/Pgsql_declare.h
similarity index 100%
rename from pgsql/Pgsql_declare.h
rename to src/pgsql/Pgsql_declare.h
diff --git a/tests/main.cpp b/src/tests/main.cpp
similarity index 100%
rename from tests/main.cpp
rename to src/tests/main.cpp
diff --git a/tests/tst_CsvWriter.cpp b/src/tests/tst_CsvWriter.cpp
similarity index 100%
rename from tests/tst_CsvWriter.cpp
rename to src/tests/tst_CsvWriter.cpp
diff --git a/tests/tst_PasswordManager.cpp b/src/tests/tst_PasswordManager.cpp
similarity index 100%
rename from tests/tst_PasswordManager.cpp
rename to src/tests/tst_PasswordManager.cpp
diff --git a/tests/tst_SqlLexer.cpp b/src/tests/tst_SqlLexer.cpp
similarity index 100%
rename from tests/tst_SqlLexer.cpp
rename to src/tests/tst_SqlLexer.cpp
diff --git a/tests/tst_expected.cpp b/src/tests/tst_expected.cpp
similarity index 100%
rename from tests/tst_expected.cpp
rename to src/tests/tst_expected.cpp
diff --git a/tests/tst_scopeguard.cpp b/src/tests/tst_scopeguard.cpp
similarity index 100%
rename from tests/tst_scopeguard.cpp
rename to src/tests/tst_scopeguard.cpp