diff --git a/pglabAll.pro b/pglabAll.pro
new file mode 100644
index 0000000..265ed96
--- /dev/null
+++ b/pglabAll.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+
+SUBDIRS += src
+
+CONFIG(debug, debug|release) {
+    SUBDIRS += tests
+}
diff --git a/.gitignore b/src/.gitignore
similarity index 100%
rename from .gitignore
rename to src/.gitignore
diff --git a/Doxyfile b/src/Doxyfile
similarity index 100%
rename from Doxyfile
rename to src/Doxyfile
diff --git a/MasterController.cpp b/src/MasterController.cpp
similarity index 100%
rename from MasterController.cpp
rename to src/MasterController.cpp
diff --git a/MasterController.h b/src/MasterController.h
similarity index 100%
rename from MasterController.h
rename to src/MasterController.h
diff --git a/PgsqlConn.cpp b/src/PgsqlConn.cpp
similarity index 100%
rename from PgsqlConn.cpp
rename to src/PgsqlConn.cpp
diff --git a/PgsqlConn.h b/src/PgsqlConn.h
similarity index 100%
rename from PgsqlConn.h
rename to src/PgsqlConn.h
diff --git a/SqlLexer.cpp b/src/SqlLexer.cpp
similarity index 100%
rename from SqlLexer.cpp
rename to src/SqlLexer.cpp
diff --git a/SqlLexer.h b/src/SqlLexer.h
similarity index 100%
rename from SqlLexer.h
rename to src/SqlLexer.h
diff --git a/SqlSyntaxHighlighter.cpp b/src/SqlSyntaxHighlighter.cpp
similarity index 100%
rename from SqlSyntaxHighlighter.cpp
rename to src/SqlSyntaxHighlighter.cpp
diff --git a/SqlSyntaxHighlighter.h b/src/SqlSyntaxHighlighter.h
similarity index 100%
rename from SqlSyntaxHighlighter.h
rename to src/SqlSyntaxHighlighter.h
diff --git a/asyncdbconnection.cpp b/src/asyncdbconnection.cpp
similarity index 100%
rename from asyncdbconnection.cpp
rename to src/asyncdbconnection.cpp
diff --git a/asyncdbconnection.h b/src/asyncdbconnection.h
similarity index 100%
rename from asyncdbconnection.h
rename to src/asyncdbconnection.h
diff --git a/backupdialog.cpp b/src/backupdialog.cpp
similarity index 100%
rename from backupdialog.cpp
rename to src/backupdialog.cpp
diff --git a/backupdialog.h b/src/backupdialog.h
similarity index 100%
rename from backupdialog.h
rename to src/backupdialog.h
diff --git a/backupdialog.ui b/src/backupdialog.ui
similarity index 100%
rename from backupdialog.ui
rename to src/backupdialog.ui
diff --git a/backuprestore.cpp b/src/backuprestore.cpp
similarity index 100%
rename from backuprestore.cpp
rename to src/backuprestore.cpp
diff --git a/connectionconfig.cpp b/src/connectionconfig.cpp
similarity index 100%
rename from connectionconfig.cpp
rename to src/connectionconfig.cpp
diff --git a/connectionconfig.h b/src/connectionconfig.h
similarity index 100%
rename from connectionconfig.h
rename to src/connectionconfig.h
diff --git a/connectionlistmodel.cpp b/src/connectionlistmodel.cpp
similarity index 100%
rename from connectionlistmodel.cpp
rename to src/connectionlistmodel.cpp
diff --git a/connectionlistmodel.h b/src/connectionlistmodel.h
similarity index 100%
rename from connectionlistmodel.h
rename to src/connectionlistmodel.h
diff --git a/connectionmanagerwindow.cpp b/src/connectionmanagerwindow.cpp
similarity index 100%
rename from connectionmanagerwindow.cpp
rename to src/connectionmanagerwindow.cpp
diff --git a/connectionmanagerwindow.h b/src/connectionmanagerwindow.h
similarity index 100%
rename from connectionmanagerwindow.h
rename to src/connectionmanagerwindow.h
diff --git a/connectionmanagerwindow.ui b/src/connectionmanagerwindow.ui
similarity index 100%
rename from connectionmanagerwindow.ui
rename to src/connectionmanagerwindow.ui
diff --git a/csvwriter.cpp b/src/csvwriter.cpp
similarity index 100%
rename from csvwriter.cpp
rename to src/csvwriter.cpp
diff --git a/csvwriter.h b/src/csvwriter.h
similarity index 100%
rename from csvwriter.h
rename to src/csvwriter.h
diff --git a/databaseinspectorwidget.cpp b/src/databaseinspectorwidget.cpp
similarity index 100%
rename from databaseinspectorwidget.cpp
rename to src/databaseinspectorwidget.cpp
diff --git a/databaseinspectorwidget.h b/src/databaseinspectorwidget.h
similarity index 100%
rename from databaseinspectorwidget.h
rename to src/databaseinspectorwidget.h
diff --git a/databaseinspectorwidget.ui b/src/databaseinspectorwidget.ui
similarity index 100%
rename from databaseinspectorwidget.ui
rename to src/databaseinspectorwidget.ui
diff --git a/databaseoverviewform.h b/src/databaseoverviewform.h
similarity index 100%
rename from databaseoverviewform.h
rename to src/databaseoverviewform.h
diff --git a/databasewindow.cpp b/src/databasewindow.cpp
similarity index 100%
rename from databasewindow.cpp
rename to src/databasewindow.cpp
diff --git a/databasewindow.h b/src/databasewindow.h
similarity index 100%
rename from databasewindow.h
rename to src/databasewindow.h
diff --git a/databasewindow.ui b/src/databasewindow.ui
similarity index 100%
rename from databasewindow.ui
rename to src/databasewindow.ui
diff --git a/expected.h b/src/expected.h
similarity index 100%
rename from expected.h
rename to src/expected.h
diff --git a/explaintreemodelitem.cpp b/src/explaintreemodelitem.cpp
similarity index 100%
rename from explaintreemodelitem.cpp
rename to src/explaintreemodelitem.cpp
diff --git a/explaintreemodelitem.h b/src/explaintreemodelitem.h
similarity index 100%
rename from explaintreemodelitem.h
rename to src/explaintreemodelitem.h
diff --git a/icons/16x16/document_green.png b/src/icons/16x16/document_green.png
similarity index 100%
rename from icons/16x16/document_green.png
rename to src/icons/16x16/document_green.png
diff --git a/icons/16x16/document_red.png b/src/icons/16x16/document_red.png
similarity index 100%
rename from icons/16x16/document_red.png
rename to src/icons/16x16/document_red.png
diff --git a/icons/16x16/document_yellow.png b/src/icons/16x16/document_yellow.png
similarity index 100%
rename from icons/16x16/document_yellow.png
rename to src/icons/16x16/document_yellow.png
diff --git a/icons/backups.png b/src/icons/backups.png
similarity index 100%
rename from icons/backups.png
rename to src/icons/backups.png
diff --git a/icons/desktop.ini b/src/icons/desktop.ini
similarity index 100%
rename from icons/desktop.ini
rename to src/icons/desktop.ini
diff --git a/icons/folder.png b/src/icons/folder.png
similarity index 100%
rename from icons/folder.png
rename to src/icons/folder.png
diff --git a/icons/information.png b/src/icons/information.png
similarity index 100%
rename from icons/information.png
rename to src/icons/information.png
diff --git a/icons/lightbulb.png b/src/icons/lightbulb.png
similarity index 100%
rename from icons/lightbulb.png
rename to src/icons/lightbulb.png
diff --git a/icons/lightbulb_off.png b/src/icons/lightbulb_off.png
similarity index 100%
rename from icons/lightbulb_off.png
rename to src/icons/lightbulb_off.png
diff --git a/icons/page_white_add.png b/src/icons/page_white_add.png
similarity index 100%
rename from icons/page_white_add.png
rename to src/icons/page_white_add.png
diff --git a/icons/page_white_copy.png b/src/icons/page_white_copy.png
similarity index 100%
rename from icons/page_white_copy.png
rename to src/icons/page_white_copy.png
diff --git a/icons/page_white_delete.png b/src/icons/page_white_delete.png
similarity index 100%
rename from icons/page_white_delete.png
rename to src/icons/page_white_delete.png
diff --git a/icons/script_delete.png b/src/icons/script_delete.png
similarity index 100%
rename from icons/script_delete.png
rename to src/icons/script_delete.png
diff --git a/icons/script_go.png b/src/icons/script_go.png
similarity index 100%
rename from icons/script_go.png
rename to src/icons/script_go.png
diff --git a/icons/script_save.png b/src/icons/script_save.png
similarity index 100%
rename from icons/script_save.png
rename to src/icons/script_save.png
diff --git a/icons/server_add.png b/src/icons/server_add.png
similarity index 100%
rename from icons/server_add.png
rename to src/icons/server_add.png
diff --git a/icons/server_delete.png b/src/icons/server_delete.png
similarity index 100%
rename from icons/server_delete.png
rename to src/icons/server_delete.png
diff --git a/icons/server_go.png b/src/icons/server_go.png
similarity index 100%
rename from icons/server_go.png
rename to src/icons/server_go.png
diff --git a/icons/table_save.png b/src/icons/table_save.png
similarity index 100%
rename from icons/table_save.png
rename to src/icons/table_save.png
diff --git a/icons/token_shortland_character.png b/src/icons/token_shortland_character.png
similarity index 100%
rename from icons/token_shortland_character.png
rename to src/icons/token_shortland_character.png
diff --git a/json/json-forwards.h b/src/json/json-forwards.h
similarity index 100%
rename from json/json-forwards.h
rename to src/json/json-forwards.h
diff --git a/json/json.h b/src/json/json.h
similarity index 100%
rename from json/json.h
rename to src/json/json.h
diff --git a/jsoncpp.cpp b/src/jsoncpp.cpp
similarity index 100%
rename from jsoncpp.cpp
rename to src/jsoncpp.cpp
diff --git a/main.cpp b/src/main.cpp
similarity index 100%
rename from main.cpp
rename to src/main.cpp
diff --git a/mainwindow.cpp b/src/mainwindow.cpp
similarity index 100%
rename from mainwindow.cpp
rename to src/mainwindow.cpp
diff --git a/mainwindow.h b/src/mainwindow.h
similarity index 100%
rename from mainwindow.h
rename to src/mainwindow.h
diff --git a/mainwindow.ui b/src/mainwindow.ui
similarity index 100%
rename from mainwindow.ui
rename to src/mainwindow.ui
diff --git a/opendatabase.cpp b/src/opendatabase.cpp
similarity index 100%
rename from opendatabase.cpp
rename to src/opendatabase.cpp
diff --git a/opendatabase.h b/src/opendatabase.h
similarity index 100%
rename from opendatabase.h
rename to src/opendatabase.h
diff --git a/paramlistmodel.cpp b/src/paramlistmodel.cpp
similarity index 100%
rename from paramlistmodel.cpp
rename to src/paramlistmodel.cpp
diff --git a/paramlistmodel.h b/src/paramlistmodel.h
similarity index 100%
rename from paramlistmodel.h
rename to src/paramlistmodel.h
diff --git a/paramtypedelegate.cpp b/src/paramtypedelegate.cpp
similarity index 100%
rename from paramtypedelegate.cpp
rename to src/paramtypedelegate.cpp
diff --git a/paramtypedelegate.h b/src/paramtypedelegate.h
similarity index 100%
rename from paramtypedelegate.h
rename to src/paramtypedelegate.h
diff --git a/pgclass.cpp b/src/pgclass.cpp
similarity index 100%
rename from pgclass.cpp
rename to src/pgclass.cpp
diff --git a/pgclass.h b/src/pgclass.h
similarity index 100%
rename from pgclass.h
rename to src/pgclass.h
diff --git a/pgnamespace.cpp b/src/pgnamespace.cpp
similarity index 100%
rename from pgnamespace.cpp
rename to src/pgnamespace.cpp
diff --git a/pgnamespace.h b/src/pgnamespace.h
similarity index 100%
rename from pgnamespace.h
rename to src/pgnamespace.h
diff --git a/pgsqldatabasecatalogue.cpp b/src/pgsqldatabasecatalogue.cpp
similarity index 100%
rename from pgsqldatabasecatalogue.cpp
rename to src/pgsqldatabasecatalogue.cpp
diff --git a/pgsqldatabasecatalogue.h b/src/pgsqldatabasecatalogue.h
similarity index 100%
rename from pgsqldatabasecatalogue.h
rename to src/pgsqldatabasecatalogue.h
diff --git a/pgtype.cpp b/src/pgtype.cpp
similarity index 100%
rename from pgtype.cpp
rename to src/pgtype.cpp
diff --git a/pgtype.h b/src/pgtype.h
similarity index 100%
rename from pgtype.h
rename to src/pgtype.h
diff --git a/pgtypecontainer.cpp b/src/pgtypecontainer.cpp
similarity index 100%
rename from pgtypecontainer.cpp
rename to src/pgtypecontainer.cpp
diff --git a/pgtypecontainer.h b/src/pgtypecontainer.h
similarity index 100%
rename from pgtypecontainer.h
rename to src/pgtypecontainer.h
diff --git a/queryexplainmodel.cpp b/src/queryexplainmodel.cpp
similarity index 100%
rename from queryexplainmodel.cpp
rename to src/queryexplainmodel.cpp
diff --git a/queryexplainmodel.h b/src/queryexplainmodel.h
similarity index 100%
rename from queryexplainmodel.h
rename to src/queryexplainmodel.h
diff --git a/queryresultmodel.cpp b/src/queryresultmodel.cpp
similarity index 100%
rename from queryresultmodel.cpp
rename to src/queryresultmodel.cpp
diff --git a/queryresultmodel.h b/src/queryresultmodel.h
similarity index 100%
rename from queryresultmodel.h
rename to src/queryresultmodel.h
diff --git a/querytab.cpp b/src/querytab.cpp
similarity index 100%
rename from querytab.cpp
rename to src/querytab.cpp
diff --git a/querytab.h b/src/querytab.h
similarity index 100%
rename from querytab.h
rename to src/querytab.h
diff --git a/querytab.ui b/src/querytab.ui
similarity index 100%
rename from querytab.ui
rename to src/querytab.ui
diff --git a/resources.qrc b/src/resources.qrc
similarity index 100%
rename from resources.qrc
rename to src/resources.qrc
diff --git a/scopeguard.h b/src/scopeguard.h
similarity index 100%
rename from scopeguard.h
rename to src/scopeguard.h
diff --git a/sqlhighlighter.cpp b/src/sqlhighlighter.cpp
similarity index 100%
rename from sqlhighlighter.cpp
rename to src/sqlhighlighter.cpp
diff --git a/sqlhighlighter.h b/src/sqlhighlighter.h
similarity index 100%
rename from sqlhighlighter.h
rename to src/sqlhighlighter.h
diff --git a/sqlparser.cpp b/src/sqlparser.cpp
similarity index 100%
rename from sqlparser.cpp
rename to src/sqlparser.cpp
diff --git a/sqlparser.h b/src/sqlparser.h
similarity index 100%
rename from sqlparser.h
rename to src/sqlparser.h
diff --git a/pglab.pro b/src/src.pro
similarity index 100%
rename from pglab.pro
rename to src/src.pro
diff --git a/stopwatch.cpp b/src/stopwatch.cpp
similarity index 100%
rename from stopwatch.cpp
rename to src/stopwatch.cpp
diff --git a/stopwatch.h b/src/stopwatch.h
similarity index 100%
rename from stopwatch.h
rename to src/stopwatch.h
diff --git a/tsqueue.cpp b/src/tsqueue.cpp
similarity index 100%
rename from tsqueue.cpp
rename to src/tsqueue.cpp
diff --git a/tsqueue.h b/src/tsqueue.h
similarity index 100%
rename from tsqueue.h
rename to src/tsqueue.h
diff --git a/tuplesresultwidget.cpp b/src/tuplesresultwidget.cpp
similarity index 100%
rename from tuplesresultwidget.cpp
rename to src/tuplesresultwidget.cpp
diff --git a/tuplesresultwidget.h b/src/tuplesresultwidget.h
similarity index 100%
rename from tuplesresultwidget.h
rename to src/tuplesresultwidget.h
diff --git a/tuplesresultwidget.ui b/src/tuplesresultwidget.ui
similarity index 100%
rename from tuplesresultwidget.ui
rename to src/tuplesresultwidget.ui
diff --git a/typeselectionitemmodel.cpp b/src/typeselectionitemmodel.cpp
similarity index 100%
rename from typeselectionitemmodel.cpp
rename to src/typeselectionitemmodel.cpp
diff --git a/typeselectionitemmodel.h b/src/typeselectionitemmodel.h
similarity index 100%
rename from typeselectionitemmodel.h
rename to src/typeselectionitemmodel.h
diff --git a/util.cpp b/src/util.cpp
similarity index 100%
rename from util.cpp
rename to src/util.cpp
diff --git a/util.h b/src/util.h
similarity index 100%
rename from util.h
rename to src/util.h
diff --git a/waithandlelist.cpp b/src/waithandlelist.cpp
similarity index 100%
rename from waithandlelist.cpp
rename to src/waithandlelist.cpp
diff --git a/waithandlelist.h b/src/waithandlelist.h
similarity index 100%
rename from waithandlelist.h
rename to src/waithandlelist.h
diff --git a/win32event.cpp b/src/win32event.cpp
similarity index 100%
rename from win32event.cpp
rename to src/win32event.cpp
diff --git a/win32event.h b/src/win32event.h
similarity index 100%
rename from win32event.h
rename to src/win32event.h
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
new file mode 100644
index 0000000..576a9ff
--- /dev/null
+++ b/tests/auto/auto.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += mycase
diff --git a/tests/auto/gtest_dependency.pri b/tests/auto/gtest_dependency.pri
new file mode 100644
index 0000000..d01d7f0
--- /dev/null
+++ b/tests/auto/gtest_dependency.pri
@@ -0,0 +1,29 @@
+isEmpty(GOOGLETEST_DIR):GOOGLETEST_DIR=$$(GOOGLETEST_DIR)
+
+isEmpty(GOOGLETEST_DIR) {
+    warning("Using googletest src dir specified at Qt Creator wizard")
+    message("set GOOGLETEST_DIR as environment variable or qmake variable to get rid of this message")
+    GOOGLETEST_DIR = C:/Prog/googletest
+}
+
+!isEmpty(GOOGLETEST_DIR): {
+    GTEST_SRCDIR = $$GOOGLETEST_DIR/googletest
+    GMOCK_SRCDIR = $$GOOGLETEST_DIR/googlemock
+}
+
+requires(exists($$GTEST_SRCDIR):exists($$GMOCK_SRCDIR))
+
+!exists($$GOOGLETEST_DIR):message("No googletest src dir found - set GOOGLETEST_DIR to enable.")
+
+DEFINES += \
+    GTEST_LANG_CXX11
+
+INCLUDEPATH *= \
+    $$GTEST_SRCDIR \
+    $$GTEST_SRCDIR/include \
+    $$GMOCK_SRCDIR \
+    $$GMOCK_SRCDIR/include
+
+SOURCES += \
+    $$GTEST_SRCDIR/src/gtest-all.cc \
+    $$GMOCK_SRCDIR/src/gmock-all.cc
diff --git a/tests/auto/mycase/main.cpp b/tests/auto/mycase/main.cpp
new file mode 100644
index 0000000..76530cd
--- /dev/null
+++ b/tests/auto/mycase/main.cpp
@@ -0,0 +1,9 @@
+#include "tst_mycase.h"
+
+#include <gtest/gtest.h>
+
+int main(int argc, char *argv[])
+{
+	::testing::InitGoogleTest(&argc, argv);
+	return RUN_ALL_TESTS();
+}
diff --git a/tests/auto/mycase/mycase.pro b/tests/auto/mycase/mycase.pro
new file mode 100644
index 0000000..eddc4c3
--- /dev/null
+++ b/tests/auto/mycase/mycase.pro
@@ -0,0 +1,13 @@
+include(../gtest_dependency.pri)
+
+TEMPLATE = app
+CONFIG += console c++11
+CONFIG -= app_bundle
+CONFIG += thread
+CONFIG += qt
+
+QT       += core
+
+HEADERS +=     tst_mycase.h
+
+SOURCES +=     main.cpp ../../../src/SqlLexer.cpp
diff --git a/tests/auto/mycase/tst_mycase.h b/tests/auto/mycase/tst_mycase.h
new file mode 100644
index 0000000..0f278e8
--- /dev/null
+++ b/tests/auto/mycase/tst_mycase.h
@@ -0,0 +1,28 @@
+#include <gtest/gtest.h>
+#include <gmock/gmock-matchers.h>
+#include "../../../src/SqlLexer.h"
+
+using namespace testing;
+
+TEST(mycase, myset)
+{
+	EXPECT_EQ(1, 1);
+	ASSERT_THAT(0, Eq(0));
+}
+
+TEST(mycase, lexer)
+{
+	QString input = " SELECT  ";
+	SqlLexer lexer(input, LexerState::Null);
+
+	int startpos, length;
+	BasicTokenType tokentype;
+	QString out;
+	lexer.nextBasicToken(startpos, length, tokentype, out);
+
+	ASSERT_THAT(startpos, Eq(1));
+	ASSERT_THAT(length, Eq(6));
+	ASSERT_THAT(tokentype, Eq(BasicTokenType::Symbol));
+	ASSERT_THAT( out, Eq(QString("SELECT")) );
+}
+
diff --git a/tests/tests.pro b/tests/tests.pro
new file mode 100644
index 0000000..f927700
--- /dev/null
+++ b/tests/tests.pro
@@ -0,0 +1,3 @@
+TEMPLATE = subdirs
+
+SUBDIRS += auto