diff --git a/visualstudio/Doxyfile b/doc/Doxyfile
similarity index 99%
rename from visualstudio/Doxyfile
rename to doc/Doxyfile
index 6a33670..99f549e 100644
--- a/visualstudio/Doxyfile
+++ b/doc/Doxyfile
@@ -58,7 +58,7 @@ PROJECT_LOGO           =
 # entered, it will be relative to the location where doxygen was started. If
 # left blank the current directory will be used.
 
-OUTPUT_DIRECTORY       = C:\Users\tkunze\Source\knx\doc
+OUTPUT_DIRECTORY       = C:\Users\tkunze\Source\knx\doc\build
 
 # If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub-
 # directories (in 2 levels) under the output directory of each output format and
@@ -890,7 +890,10 @@ EXCLUDE_SYMLINKS       = NO
 # Note that the wildcards are matched against the file with absolute path, so to
 # exclude all test directories for example use the pattern */test/*
 
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       = VisualGDB \
+                         VisualGDBCache \
+                         pybind11 \
+                         visualstudio
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
@@ -2414,7 +2417,7 @@ INTERACTIVE_SVG        = YES
 # found. If left blank, it is assumed the dot tool can be found in the path.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-DOT_PATH               = "../../../../Program Files (x86)/Graphviz2.38/bin"
+DOT_PATH               = "../../../../../Program Files (x86)/Graphviz2.38/bin"
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
 # contain dot files that are included in the documentation (see the \dotfile
diff --git a/doc/sphinx/conf.py b/doc/sphinx/conf.py
new file mode 100644
index 0000000..becf3b5
--- /dev/null
+++ b/doc/sphinx/conf.py
@@ -0,0 +1,7 @@
+import subprocess, os
+
+read_the_docs_build = os.environ.get('READTHEDOCS', None) == 'True'
+
+if read_the_docs_build:
+	subprocess.call('cd .. ; doxygen', shell=True)
+	html_extra_path = ['../build/html']
\ No newline at end of file
diff --git a/knx-linux/ClassDiagram.cd b/knx-linux/ClassDiagram.cd
index 7c6d866..d736968 100644
--- a/knx-linux/ClassDiagram.cd
+++ b/knx-linux/ClassDiagram.cd
@@ -1,94 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ClassDiagram MajorVersion="1" MinorVersion="1">
   <Class Name="AddressTableObject" Collapsed="true">
-    <Position X="2.25" Y="3.75" Width="1.5" />
+    <Position X="2.25" Y="4.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>IBAAAAAAQACAEAIAABAAAAgAAAAAAAAAAAAAAABAAEA=</HashCode>
-      <FileName>knx\address_table_object.h</FileName>
+      <HashCode>IBAAAAEAQACAEAIAABAAAAgAAAAAAAgAAAAAAABAAEA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\address_table_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="ApplicationProgramObject" Collapsed="true">
-    <Position X="4" Y="3.75" Width="1.5" />
+    <Position X="4" Y="4.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AIAAAAAAAACAAAIAgCAAAAAgABAEAAAAAAAQQABAAAA=</HashCode>
-      <FileName>knx\application_program_object.h</FileName>
+      <HashCode>AIAAAAEAAACAAAIAgCAAAAAgABAEAAgAAAAQQABAAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\application_program_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="AssociationTableObject" Collapsed="true">
-    <Position X="5.75" Y="3.75" Width="1.5" />
+    <Position X="5.75" Y="4.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAgIAABAAQAgAAAEAAAAAAAAAAABAAEA=</HashCode>
-      <FileName>knx\association_table_object.h</FileName>
+      <HashCode>AAAAAAEAAACAAgIAABAAQAgAAAEAAAgAAAAAAABAAEA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\association_table_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="DeviceObject" Collapsed="true">
-    <Position X="0.5" Y="3.75" Width="1.5" />
+    <Position X="0.5" Y="4.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAACACEAAAGCIAKAQCAgAACgCECAAEIgAEgAAgJAAAA=</HashCode>
-      <FileName>knx\device_object.h</FileName>
+      <HashCode>AAACACEAAAGCIAKAQCAgAACgCECAAEogAEgIAgJAAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\device_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="GroupObjectTableObject" Collapsed="true">
-    <Position X="7.5" Y="3.75" Width="1.5" />
+    <Position X="7.5" Y="4.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAEAACACAAgIAAhAATAgACAAAAAAAAAAAAABAAAA=</HashCode>
-      <FileName>knx\group_object_table_object.h</FileName>
+      <HashCode>EAAAAEEACACAAgIAAhAATAgACAAAAAggAAAAAABAAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\group_object_table_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="InterfaceObject" Collapsed="true">
     <Position X="2" Y="1.25" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAABBAAAA=</HashCode>
-      <FileName>knx\interface_object.h</FileName>
+      <HashCode>AAAAAAEAAAAAAAAAACAAAAAgAAAAAAgAAAAIABBAAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\interface_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="IpParameterObject" Collapsed="true">
     <Position X="2.75" Y="2.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAIACIAAYACAAKIAAGAQCAAgWAIAAAAGAAAAAABgAIA=</HashCode>
-      <FileName>knx\ip_parameter_object.h</FileName>
+      <HashCode>AAIACIEAYACAAKIAAGAQCAAgWAIAAAgGAAAAAABgAIA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\ip_parameter_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="TableObject" Collapsed="true">
     <Position X="4.25" Y="0.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAIACIACBACAAIIAAGAASAgwyAAAAAAAAgAAAAJgAAA=</HashCode>
-      <FileName>knx\table_object.h</FileName>
+      <HashCode>AAIACIACBACAAIIAAGAACAgwyAAAAAAAAgAAAAJgAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\table_object.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="BusAccessUnit" Collapsed="true">
     <Position X="6.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>sKoIAAAAQIIxC4gUUEAIAAACiQEgAjQUFCCA5yEAIBw=</HashCode>
-      <FileName>knx\bau.h</FileName>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\bau.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Bau57B0" Collapsed="true">
-    <Position X="6.75" Y="1.75" Width="1.5" />
+    <Position X="5.75" Y="2.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>ABIAAFAgAgIwCoAAUiCCQIDAiEBgADQQACAAAAKQABw=</HashCode>
-      <FileName>knx\bau57B0.h</FileName>
+      <HashCode>AAACAAAAAIAAAABAAgAAAAAAAAAgAAAAACAAAAAAAAg=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\bau57B0.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="LinuxPlatform" Collapsed="true">
-    <Position X="9.75" Y="2" Width="1.5" />
+    <Position X="9.75" Y="1.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>BACCIBAAICAAICgAAABAgAAQAAAAAAgAAADAEAAAAhA=</HashCode>
-      <FileName>linux_platform.h</FileName>
+      <HashCode>BACGJBAAIigAIHgAAABAghAQAAAAACgAAADAEgAAAjA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\linux_platform.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="SaveRestore" Collapsed="true">
     <Position X="0.5" Y="0.5" Width="1.5" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAACAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>knx\save_restore.h</FileName>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\save_restore.h</FileName>
     </TypeIdentifier>
   </Class>
   <Class Name="Platform" Collapsed="true">
     <Position X="9.75" Y="0.5" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAACIBAAICAAIAAAAABAgAAAAAAAAAgAAADAEAAAAhA=</HashCode>
-      <FileName>knx\platform.h</FileName>
+      <HashCode>AAAGJBAAICgAIFAAAABAwhAAABAAAAgAAADAEgAAAhA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\platform.h</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="BauSystemB" Collapsed="true">
+    <Position X="6.75" Y="1.5" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>ABIAAFQgAoJwCoBAUCiCAIDAiEBgADQQAIAAAAKQABQ=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\bau_systemB.h</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="Bau07B0" Collapsed="true">
+    <Position X="7.5" Y="2.75" Width="1.5" />
+    <TypeIdentifier>
+      <HashCode>AAACAAAAAIBAAABAAAAAAAAAAAAgAAAAACAAAAAAAAA=</HashCode>
+      <FileName>C:\Users\tkunze\Source\knx\src\knx\bau07B0.h</FileName>
     </TypeIdentifier>
   </Class>
   <Font Name="Segoe UI" Size="9" />
diff --git a/knx-linux/knx-linux.vcxproj b/knx-linux/knx-linux.vcxproj
index 1470801..8efae98 100644
--- a/knx-linux/knx-linux.vcxproj
+++ b/knx-linux/knx-linux.vcxproj
@@ -106,6 +106,7 @@
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
   <ItemGroup>
+    <None Include="ClassDiagram.cd" />
     <None Include="CMakeLists.txt" />
     <None Include="knx-linux-Debug.vgdbsettings" />
     <None Include="knx-linux-Release.vgdbsettings" />
diff --git a/knx-linux/knx-linux.vcxproj.filters b/knx-linux/knx-linux.vcxproj.filters
index fd7a629..56270a3 100644
--- a/knx-linux/knx-linux.vcxproj.filters
+++ b/knx-linux/knx-linux.vcxproj.filters
@@ -33,6 +33,7 @@
     <None Include="knx-linux-Release.vgdbsettings">
       <Filter>VisualGDB settings</Filter>
     </None>
+    <None Include="ClassDiagram.cd" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\src\linux_platform.h">
diff --git a/visualstudio/ClassDiagram.cd b/visualstudio/ClassDiagram.cd
deleted file mode 100644
index fa67e07..0000000
--- a/visualstudio/ClassDiagram.cd
+++ /dev/null
@@ -1,95 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1">
-  <Class Name="AddressTableObject" Collapsed="true">
-    <Position X="2.25" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>IBAAAAAAQACAEAIAABAAAAgAAAAAAAAAAAAAAABAAEA=</HashCode>
-      <FileName>knx\address_table_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="ApplicationProgramObject" Collapsed="true">
-    <Position X="4" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AIAAAAAAAACAAAIAgCAAAAAgABAEAAAAAAAQQABAAAA=</HashCode>
-      <FileName>knx\application_program_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="AssociationTableObject" Collapsed="true">
-    <Position X="5.75" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAgIAABAAQAgAAAEAAAAAAAAAAABAAEA=</HashCode>
-      <FileName>knx\association_table_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="DeviceObject" Collapsed="true">
-    <Position X="0.5" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAACACEAAAGCIAKAQCAgAACgCECAAEIgAEgAAgJAAAA=</HashCode>
-      <FileName>knx\device_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="GroupObjectTableObject" Collapsed="true">
-    <Position X="7.5" Y="3.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAEAACACAAgIAAhAATAgACAAAAAAAAAAAAABAAAA=</HashCode>
-      <FileName>knx\group_object_table_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="InterfaceObject" Collapsed="true">
-    <Position X="2" Y="1.25" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAACAAAAAgAAAAAAAAAAAAABBAAAA=</HashCode>
-      <FileName>knx\interface_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="IpParameterObject" Collapsed="true">
-    <Position X="2.75" Y="2.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIACIAAYACAAKIAAGAQCAAgWAIAAAAGAAAAAABgAIA=</HashCode>
-      <FileName>knx\ip_parameter_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="TableObject" Collapsed="true">
-    <Position X="4.25" Y="0.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAIACIACBACAAIIAAGAASAgwyAAAAAAAAgAAAAJgAAA=</HashCode>
-      <FileName>knx\table_object.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="BusAccessUnit" Collapsed="true">
-    <Position X="6.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>sKoIAAAAQIIxC4gUUEAIAAACiQEgAjQUFCCA5yEAIBw=</HashCode>
-      <FileName>knx\bau.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Bau57B0" Collapsed="true">
-    <Position X="6.75" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>ABIAAFAgAgIwCoAAUiCCQIDAiEBgADQQACAAAAKQABw=</HashCode>
-      <FileName>knx\bau57B0.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="LinuxPlatform" Collapsed="true">
-    <Position X="9.75" Y="2" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>BACCIBAAICAAICgAAABAgAAQAAAAAAgAAADAEAAAAhA=</HashCode>
-      <FileName>linux_platform.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="SaveRestore" Collapsed="true">
-    <Position X="0.5" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAACAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>knx\save_restore.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="Platform" Collapsed="true">
-    <Position X="9.75" Y="0.5" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAACIBAAICAAIAAAAABAgAAAAAAAAAgAAADAEAAAAhA=</HashCode>
-      <FileName>knx\platform.h</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
\ No newline at end of file