diff --git a/lib/meson.build b/lib/meson.build
new file mode 100644
index 0000000..7e33fae
--- /dev/null
+++ b/lib/meson.build
@@ -0,0 +1,22 @@
+lib_version = '1.0.0'
+lib_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml'])
+lib_sources = [
+  'src/DosQAbstractListModel.cpp',
+  'src/DosQMetaObject.cpp',
+  'src/DosQObject.cpp',
+  'src/DosQObjectImpl.cpp',
+  'src/DOtherSide.cpp',
+  'src/DOtherSideTypesCpp.cpp',
+  'src/OnSlotExecutedHandler.cpp'
+]
+lib_include_directories = ['include', 'include/Qt']
+lib_pch = '../pch/lib_pch.h'
+
+lib = shared_library('DOtherSide',
+  sources : lib_sources,
+  include_directories : include_directories(lib_include_directories),
+  dependencies : lib_dependencies,
+  version: lib_version,
+  soversion:0,
+  cpp_pch: lib_pch
+)
\ No newline at end of file
diff --git a/meson.build b/meson.build
index e12da2e..64eb6a6 100644
--- a/meson.build
+++ b/meson.build
@@ -1,37 +1,4 @@
 project('DOtherSide', 'cpp', default_options : ['cpp_std=c++14'])
 
-lib_version = '1.0.0'
-lib_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml'])
-lib_sources = [
-  'lib/src/DosQAbstractListModel.cpp',
-  'lib/src/DosQMetaObject.cpp',
-  'lib/src/DosQObject.cpp',
-  'lib/src/DosQObjectImpl.cpp',
-  'lib/src/DOtherSide.cpp',
-  'lib/src/DOtherSideTypesCpp.cpp',
-  'lib/src/OnSlotExecutedHandler.cpp'
-]
-lib_include_directories = ['lib/include', 'lib/include/Qt']
-
-lib = shared_library('DOtherSide',
-  sources : lib_sources,
-  include_directories : include_directories(lib_include_directories),
-  dependencies : lib_dependencies,
-  version: lib_version,
-  soversion:0
-)
-
-test_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml', 'Test'])
-test_sources = 'test/test_dotherside.cpp'
-test_resources = 'test/Resources.qrc'
-test_include_directories = ['lib/include', 'lib/include/Qt']
-
-qt5 = import('qt5')
-test_moc_files = qt5.preprocess(moc_sources : test_sources, qresources : test_resources)
-
-executable('TestDOtherSide',
-  sources : [test_sources, test_moc_files],
-  include_directories : include_directories(test_include_directories),
-  link_with : lib,
-  dependencies : test_dependencies
-)
\ No newline at end of file
+subdir('lib')
+subdir('test')
diff --git a/pch/lib_pch.h b/pch/lib_pch.h
new file mode 100644
index 0000000..5d1f23d
--- /dev/null
+++ b/pch/lib_pch.h
@@ -0,0 +1,5 @@
+#include <QtCore>
+#include <QtWidgets>
+#include <QtGui>
+#include <QtQml>
+#include <QtQuick>
diff --git a/pch/test_pch.h b/pch/test_pch.h
new file mode 100644
index 0000000..faaf103
--- /dev/null
+++ b/pch/test_pch.h
@@ -0,0 +1,6 @@
+#include <QtCore>
+#include <QtWidgets>
+#include <QtGui>
+#include <QtQml>
+#include <QtQuick>
+#include <QtTest>
diff --git a/test/meson.build b/test/meson.build
new file mode 100644
index 0000000..d1fd7da
--- /dev/null
+++ b/test/meson.build
@@ -0,0 +1,16 @@
+test_dependencies = dependency('qt5', modules : ['Core', 'Widgets', 'Quick', 'Qml', 'Test'])
+test_sources = 'test_dotherside.cpp'
+test_resources = 'Resources.qrc'
+test_include_directories = ['../lib/include', '../lib/include/Qt']
+test_pch = '../pch/test_pch.h'
+
+qt5 = import('qt5')
+test_moc_files = qt5.preprocess(moc_sources : test_sources, qresources : test_resources)
+
+executable('TestDOtherSide',
+  sources : [test_sources, test_moc_files],
+  include_directories : include_directories(test_include_directories),
+  link_with : lib,
+  dependencies : test_dependencies,
+  cpp_pch: test_pch
+)
\ No newline at end of file