diff --git a/meson.build b/meson.build
index e44f189..d6330b2 100644
--- a/meson.build
+++ b/meson.build
@@ -66,17 +66,29 @@ install_headers(
   'AdsLib/Semaphore.h',
   'AdsLib/Sockets.h',
   'AdsLib/SymbolAccess.h',
-  'AdsLib/TwinCAT/AdsDef.h',
-  'AdsLib/TwinCAT/AdsLib.h',
+  'AdsLib/wrap_endian.h',
+  'AdsLib/wrap_registry.h',
+  'AdsLib/wrap_socket.h',
+  subdir: 'AdsLib'
+)
+
+install_headers(
   'AdsLib/bhf/ParameterList.h',
   'AdsLib/bhf/StringToInteger.h',
   'AdsLib/bhf/WindowsQuirks.h',
+  subdir: 'AdsLib/bhf'
+)
+
+install_headers(
   'AdsLib/standalone/AdsDef.h',
   'AdsLib/standalone/AdsLib.h',
-  'AdsLib/wrap_endian.h',
-  'AdsLib/wrap_registry.h',
-  'AdsLib/wrap_socket.h',
-  subdir: 'AdsLib'
+  subdir: 'AdsLib/standalone'
+)
+
+install_headers(
+  'AdsLib/TwinCAT/AdsDef.h',
+  'AdsLib/TwinCAT/AdsLib.h',
+  subdir: 'AdsLib/TwinCAT'
 )
 
 inc = include_directories([
@@ -95,7 +107,7 @@ adslib = static_library('AdsLib',
   install: true,
 )
 
-adslib_so = shared_library('adslib',
+adslib_so = shared_library('AdsLib',
   [common_files, router_files],
   cpp_args: [
     '-DBHF_ADS_EXPORT_C',