diff --git a/BF_companion b/BF_companion
index 0f0209c..3c490c3 100755
Binary files a/BF_companion and b/BF_companion differ
diff --git a/build/lib/x502api-1.1.34/devs/e502/e502api.o b/build/lib/x502api-1.1.34/devs/e502/e502api.o
new file mode 100644
index 0000000..f2adb7c
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/e502/e502api.o differ
diff --git a/build/lib/x502api-1.1.34/devs/e502/e502api_dnssd.o b/build/lib/x502api-1.1.34/devs/e502/e502api_dnssd.o
new file mode 100644
index 0000000..6c3c0be
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/e502/e502api_dnssd.o differ
diff --git a/build/lib/x502api-1.1.34/devs/e502/e502api_eth_config.o b/build/lib/x502api-1.1.34/devs/e502/e502api_eth_config.o
new file mode 100644
index 0000000..890bb0a
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/e502/e502api_eth_config.o differ
diff --git a/build/lib/x502api-1.1.34/devs/e502/e502api_tcp.o b/build/lib/x502api-1.1.34/devs/e502/e502api_tcp.o
new file mode 100644
index 0000000..14ffbe0
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/e502/e502api_tcp.o differ
diff --git a/build/lib/x502api-1.1.34/devs/e502/e502api_usb.o b/build/lib/x502api-1.1.34/devs/e502/e502api_usb.o
new file mode 100644
index 0000000..1b8170c
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/e502/e502api_usb.o differ
diff --git a/build/lib/x502api-1.1.34/devs/l502/l502api.o b/build/lib/x502api-1.1.34/devs/l502/l502api.o
new file mode 100644
index 0000000..fad0044
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/l502/l502api.o differ
diff --git a/build/lib/x502api-1.1.34/devs/l502/l502api_bf.o b/build/lib/x502api-1.1.34/devs/l502/l502api_bf.o
new file mode 100644
index 0000000..1307178
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/l502/l502api_bf.o differ
diff --git a/build/lib/x502api-1.1.34/devs/l502/l502api_compat.o b/build/lib/x502api-1.1.34/devs/l502/l502api_compat.o
new file mode 100644
index 0000000..a2a6479
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/l502/l502api_compat.o differ
diff --git a/build/lib/x502api-1.1.34/devs/l502/l502api_eeprom.o b/build/lib/x502api-1.1.34/devs/l502/l502api_eeprom.o
new file mode 100644
index 0000000..423a70f
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/l502/l502api_eeprom.o differ
diff --git a/build/lib/x502api-1.1.34/devs/l502/linux/l502_spec.o b/build/lib/x502api-1.1.34/devs/l502/linux/l502_spec.o
new file mode 100644
index 0000000..80033e1
Binary files /dev/null and b/build/lib/x502api-1.1.34/devs/l502/linux/l502_spec.o differ
diff --git a/build/lib/x502api-1.1.34/lib/crc/fast_crc.o b/build/lib/x502api-1.1.34/lib/crc/fast_crc.o
new file mode 100644
index 0000000..406af1d
Binary files /dev/null and b/build/lib/x502api-1.1.34/lib/crc/fast_crc.o differ
diff --git a/build/lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock.o b/build/lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock.o
new file mode 100644
index 0000000..02b455a
Binary files /dev/null and b/build/lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock.o differ
diff --git a/build/lib/x502api-1.1.34/lib/osspec/osspec.o b/build/lib/x502api-1.1.34/lib/osspec/osspec.o
new file mode 100644
index 0000000..ac77fe9
Binary files /dev/null and b/build/lib/x502api-1.1.34/lib/osspec/osspec.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api.o b/build/lib/x502api-1.1.34/src/x502api.o
new file mode 100644
index 0000000..eee0830
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_async.o b/build/lib/x502api-1.1.34/src/x502api_async.o
new file mode 100644
index 0000000..1387865
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_async.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_bf.o b/build/lib/x502api-1.1.34/src/x502api_bf.o
new file mode 100644
index 0000000..a7766bc
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_bf.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_config.o b/build/lib/x502api-1.1.34/src/x502api_config.o
new file mode 100644
index 0000000..0510290
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_config.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_eeprom.o b/build/lib/x502api-1.1.34/src/x502api_eeprom.o
new file mode 100644
index 0000000..04f42c3
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_eeprom.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_errs.o b/build/lib/x502api-1.1.34/src/x502api_errs.o
new file mode 100644
index 0000000..abb2c2f
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_errs.o differ
diff --git a/build/lib/x502api-1.1.34/src/x502api_streams.o b/build/lib/x502api-1.1.34/src/x502api_streams.o
new file mode 100644
index 0000000..e8d3e4b
Binary files /dev/null and b/build/lib/x502api-1.1.34/src/x502api_streams.o differ
diff --git a/build/main.o b/build/main.o
new file mode 100644
index 0000000..175c207
Binary files /dev/null and b/build/main.o differ
diff --git a/SDK/$PLUGINSDIR/LangDLL.dll b/lib/SDK/$PLUGINSDIR/LangDLL.dll
similarity index 100%
rename from SDK/$PLUGINSDIR/LangDLL.dll
rename to lib/SDK/$PLUGINSDIR/LangDLL.dll
diff --git a/SDK/$PLUGINSDIR/System.dll b/lib/SDK/$PLUGINSDIR/System.dll
similarity index 100%
rename from SDK/$PLUGINSDIR/System.dll
rename to lib/SDK/$PLUGINSDIR/System.dll
diff --git a/SDK/$PLUGINSDIR/UserInfo.dll b/lib/SDK/$PLUGINSDIR/UserInfo.dll
similarity index 100%
rename from SDK/$PLUGINSDIR/UserInfo.dll
rename to lib/SDK/$PLUGINSDIR/UserInfo.dll
diff --git a/SDK/$PLUGINSDIR/modern-wizard.bmp b/lib/SDK/$PLUGINSDIR/modern-wizard.bmp
similarity index 100%
rename from SDK/$PLUGINSDIR/modern-wizard.bmp
rename to lib/SDK/$PLUGINSDIR/modern-wizard.bmp
diff --git a/SDK/$PLUGINSDIR/nsDialogs.dll b/lib/SDK/$PLUGINSDIR/nsDialogs.dll
similarity index 100%
rename from SDK/$PLUGINSDIR/nsDialogs.dll
rename to lib/SDK/$PLUGINSDIR/nsDialogs.dll
diff --git a/SDK/$PLUGINSDIR/nsisos.dll b/lib/SDK/$PLUGINSDIR/nsisos.dll
similarity index 100%
rename from SDK/$PLUGINSDIR/nsisos.dll
rename to lib/SDK/$PLUGINSDIR/nsisos.dll
diff --git a/SDK/$TEMP/$R0 b/lib/SDK/$TEMP/$R0
similarity index 100%
rename from SDK/$TEMP/$R0
rename to lib/SDK/$TEMP/$R0
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/Bonjour.msi b/lib/SDK/$TEMP/L502-E502-E16-SDK/Bonjour.msi
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/Bonjour.msi
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/Bonjour.msi
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/Bonjour64.msi b/lib/SDK/$TEMP/L502-E502-E16-SDK/Bonjour64.msi
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/Bonjour64.msi
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/Bonjour64.msi
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/DIFxAPI.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/DIFxAPI.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/DIFxAPI.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/DIFxAPI.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/WdfCoInstaller01009.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/WdfCoInstaller01009.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/WdfCoInstaller01009.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/amd64/WdfCoInstaller01009.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/amd64/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/amd64/WdfCoInstaller01009.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/amd64/WdfCoInstaller01009.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/amd64/winusbcoinstaller2.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/amd64/winusbcoinstaller2.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/amd64/winusbcoinstaller2.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/amd64/winusbcoinstaller2.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/gacutil.exe b/lib/SDK/$TEMP/L502-E502-E16-SDK/gacutil.exe
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/gacutil.exe
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/gacutil.exe
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.cat b/lib/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.cat
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.cat
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.cat
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.inf b/lib/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.inf
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.inf
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lcard_libusb.inf
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lpcie.cat b/lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.cat
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lpcie.cat
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.cat
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lpcie.inf b/lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.inf
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lpcie.inf
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.inf
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lpcie.sys b/lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.sys
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lpcie.sys
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie.sys
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lpcieNet.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/lpcieNet.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lpcieNet.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lpcieNet.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/lpcie_inst.exe b/lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie_inst.exe
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/lpcie_inst.exe
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/lpcie_inst.exe
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/x86/WdfCoInstaller01009.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/x86/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/x86/WdfCoInstaller01009.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/x86/WdfCoInstaller01009.dll
diff --git a/SDK/$TEMP/L502-E502-E16-SDK/x86/winusbcoinstaller2.dll b/lib/SDK/$TEMP/L502-E502-E16-SDK/x86/winusbcoinstaller2.dll
similarity index 100%
rename from SDK/$TEMP/L502-E502-E16-SDK/x86/winusbcoinstaller2.dll
rename to lib/SDK/$TEMP/L502-E502-E16-SDK/x86/winusbcoinstaller2.dll
diff --git a/SDK/bin/x64/e502api.dll b/lib/SDK/bin/x64/e502api.dll
similarity index 100%
rename from SDK/bin/x64/e502api.dll
rename to lib/SDK/bin/x64/e502api.dll
diff --git a/SDK/bin/x64/l502api.dll b/lib/SDK/bin/x64/l502api.dll
similarity index 100%
rename from SDK/bin/x64/l502api.dll
rename to lib/SDK/bin/x64/l502api.dll
diff --git a/SDK/bin/x64/x502api.dll b/lib/SDK/bin/x64/x502api.dll
similarity index 100%
rename from SDK/bin/x64/x502api.dll
rename to lib/SDK/bin/x64/x502api.dll
diff --git a/SDK/bin/x86/e502api.dll b/lib/SDK/bin/x86/e502api.dll
similarity index 100%
rename from SDK/bin/x86/e502api.dll
rename to lib/SDK/bin/x86/e502api.dll
diff --git a/SDK/bin/x86/l502api.dll b/lib/SDK/bin/x86/l502api.dll
similarity index 100%
rename from SDK/bin/x86/l502api.dll
rename to lib/SDK/bin/x86/l502api.dll
diff --git a/SDK/bin/x86/x502api.dll b/lib/SDK/bin/x86/x502api.dll
similarity index 100%
rename from SDK/bin/x86/x502api.dll
rename to lib/SDK/bin/x86/x502api.dll
diff --git a/SDK/changelog.txt b/lib/SDK/changelog.txt
similarity index 100%
rename from SDK/changelog.txt
rename to lib/SDK/changelog.txt
diff --git a/SDK/drivers/pci/x64/WdfCoInstaller01009.dll b/lib/SDK/drivers/pci/x64/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/drivers/pci/x64/WdfCoInstaller01009.dll
rename to lib/SDK/drivers/pci/x64/WdfCoInstaller01009.dll
diff --git a/SDK/drivers/pci/x64/lpcie.cat b/lib/SDK/drivers/pci/x64/lpcie.cat
similarity index 100%
rename from SDK/drivers/pci/x64/lpcie.cat
rename to lib/SDK/drivers/pci/x64/lpcie.cat
diff --git a/SDK/drivers/pci/x64/lpcie.inf b/lib/SDK/drivers/pci/x64/lpcie.inf
similarity index 100%
rename from SDK/drivers/pci/x64/lpcie.inf
rename to lib/SDK/drivers/pci/x64/lpcie.inf
diff --git a/SDK/drivers/pci/x64/lpcie.sys b/lib/SDK/drivers/pci/x64/lpcie.sys
similarity index 100%
rename from SDK/drivers/pci/x64/lpcie.sys
rename to lib/SDK/drivers/pci/x64/lpcie.sys
diff --git a/SDK/drivers/pci/x86/WdfCoInstaller01009.dll b/lib/SDK/drivers/pci/x86/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/drivers/pci/x86/WdfCoInstaller01009.dll
rename to lib/SDK/drivers/pci/x86/WdfCoInstaller01009.dll
diff --git a/SDK/drivers/pci/x86/lpcie.cat b/lib/SDK/drivers/pci/x86/lpcie.cat
similarity index 100%
rename from SDK/drivers/pci/x86/lpcie.cat
rename to lib/SDK/drivers/pci/x86/lpcie.cat
diff --git a/SDK/drivers/pci/x86/lpcie.inf b/lib/SDK/drivers/pci/x86/lpcie.inf
similarity index 100%
rename from SDK/drivers/pci/x86/lpcie.inf
rename to lib/SDK/drivers/pci/x86/lpcie.inf
diff --git a/SDK/drivers/pci/x86/lpcie.sys b/lib/SDK/drivers/pci/x86/lpcie.sys
similarity index 100%
rename from SDK/drivers/pci/x86/lpcie.sys
rename to lib/SDK/drivers/pci/x86/lpcie.sys
diff --git a/SDK/drivers/usb/amd64/WdfCoInstaller01009.dll b/lib/SDK/drivers/usb/amd64/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/drivers/usb/amd64/WdfCoInstaller01009.dll
rename to lib/SDK/drivers/usb/amd64/WdfCoInstaller01009.dll
diff --git a/SDK/drivers/usb/amd64/winusbcoinstaller2.dll b/lib/SDK/drivers/usb/amd64/winusbcoinstaller2.dll
similarity index 100%
rename from SDK/drivers/usb/amd64/winusbcoinstaller2.dll
rename to lib/SDK/drivers/usb/amd64/winusbcoinstaller2.dll
diff --git a/SDK/drivers/usb/lcard_libusb.cat b/lib/SDK/drivers/usb/lcard_libusb.cat
similarity index 100%
rename from SDK/drivers/usb/lcard_libusb.cat
rename to lib/SDK/drivers/usb/lcard_libusb.cat
diff --git a/SDK/drivers/usb/lcard_libusb.inf b/lib/SDK/drivers/usb/lcard_libusb.inf
similarity index 100%
rename from SDK/drivers/usb/lcard_libusb.inf
rename to lib/SDK/drivers/usb/lcard_libusb.inf
diff --git a/SDK/drivers/usb/x86/WdfCoInstaller01009.dll b/lib/SDK/drivers/usb/x86/WdfCoInstaller01009.dll
similarity index 100%
rename from SDK/drivers/usb/x86/WdfCoInstaller01009.dll
rename to lib/SDK/drivers/usb/x86/WdfCoInstaller01009.dll
diff --git a/SDK/drivers/usb/x86/winusbcoinstaller2.dll b/lib/SDK/drivers/usb/x86/winusbcoinstaller2.dll
similarity index 100%
rename from SDK/drivers/usb/x86/winusbcoinstaller2.dll
rename to lib/SDK/drivers/usb/x86/winusbcoinstaller2.dll
diff --git a/SDK/examples/CppBuilder/x502_general/readme.txt b/lib/SDK/examples/CppBuilder/x502_general/readme.txt
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/readme.txt
rename to lib/SDK/examples/CppBuilder/x502_general/readme.txt
diff --git a/SDK/examples/CppBuilder/x502_general/unit.cpp b/lib/SDK/examples/CppBuilder/x502_general/unit.cpp
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/unit.cpp
rename to lib/SDK/examples/CppBuilder/x502_general/unit.cpp
diff --git a/SDK/examples/CppBuilder/x502_general/unit.dfm b/lib/SDK/examples/CppBuilder/x502_general/unit.dfm
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/unit.dfm
rename to lib/SDK/examples/CppBuilder/x502_general/unit.dfm
diff --git a/SDK/examples/CppBuilder/x502_general/unit.h b/lib/SDK/examples/CppBuilder/x502_general/unit.h
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/unit.h
rename to lib/SDK/examples/CppBuilder/x502_general/unit.h
diff --git a/SDK/examples/CppBuilder/x502_general/x502_example.bpr b/lib/SDK/examples/CppBuilder/x502_general/x502_example.bpr
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_example.bpr
rename to lib/SDK/examples/CppBuilder/x502_general/x502_example.bpr
diff --git a/SDK/examples/CppBuilder/x502_general/x502_example.cbproj b/lib/SDK/examples/CppBuilder/x502_general/x502_example.cbproj
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_example.cbproj
rename to lib/SDK/examples/CppBuilder/x502_general/x502_example.cbproj
diff --git a/SDK/examples/CppBuilder/x502_general/x502_example.cpp b/lib/SDK/examples/CppBuilder/x502_general/x502_example.cpp
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_example.cpp
rename to lib/SDK/examples/CppBuilder/x502_general/x502_example.cpp
diff --git a/SDK/examples/CppBuilder/x502_general/x502_example.res b/lib/SDK/examples/CppBuilder/x502_general/x502_example.res
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_example.res
rename to lib/SDK/examples/CppBuilder/x502_general/x502_example.res
diff --git a/SDK/examples/CppBuilder/x502_general/x502_thread.cpp b/lib/SDK/examples/CppBuilder/x502_general/x502_thread.cpp
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_thread.cpp
rename to lib/SDK/examples/CppBuilder/x502_general/x502_thread.cpp
diff --git a/SDK/examples/CppBuilder/x502_general/x502_thread.h b/lib/SDK/examples/CppBuilder/x502_general/x502_thread.h
similarity index 100%
rename from SDK/examples/CppBuilder/x502_general/x502_thread.h
rename to lib/SDK/examples/CppBuilder/x502_general/x502_thread.h
diff --git a/SDK/examples/Delphi/x502_general/MainUnit.dfm b/lib/SDK/examples/Delphi/x502_general/MainUnit.dfm
similarity index 100%
rename from SDK/examples/Delphi/x502_general/MainUnit.dfm
rename to lib/SDK/examples/Delphi/x502_general/MainUnit.dfm
diff --git a/SDK/examples/Delphi/x502_general/MainUnit.pas b/lib/SDK/examples/Delphi/x502_general/MainUnit.pas
similarity index 100%
rename from SDK/examples/Delphi/x502_general/MainUnit.pas
rename to lib/SDK/examples/Delphi/x502_general/MainUnit.pas
diff --git a/SDK/examples/Delphi/x502_general/X502_ProcessThread.pas b/lib/SDK/examples/Delphi/x502_general/X502_ProcessThread.pas
similarity index 100%
rename from SDK/examples/Delphi/x502_general/X502_ProcessThread.pas
rename to lib/SDK/examples/Delphi/x502_general/X502_ProcessThread.pas
diff --git a/SDK/examples/Delphi/x502_general/readme.txt b/lib/SDK/examples/Delphi/x502_general/readme.txt
similarity index 100%
rename from SDK/examples/Delphi/x502_general/readme.txt
rename to lib/SDK/examples/Delphi/x502_general/readme.txt
diff --git a/SDK/examples/Delphi/x502_general/x502_example.dof b/lib/SDK/examples/Delphi/x502_general/x502_example.dof
similarity index 100%
rename from SDK/examples/Delphi/x502_general/x502_example.dof
rename to lib/SDK/examples/Delphi/x502_general/x502_example.dof
diff --git a/SDK/examples/Delphi/x502_general/x502_example.dpr b/lib/SDK/examples/Delphi/x502_general/x502_example.dpr
similarity index 100%
rename from SDK/examples/Delphi/x502_general/x502_example.dpr
rename to lib/SDK/examples/Delphi/x502_general/x502_example.dpr
diff --git a/SDK/examples/Delphi/x502_general/x502_example.dproj b/lib/SDK/examples/Delphi/x502_general/x502_example.dproj
similarity index 100%
rename from SDK/examples/Delphi/x502_general/x502_example.dproj
rename to lib/SDK/examples/Delphi/x502_general/x502_example.dproj
diff --git a/SDK/examples/Delphi/x502_general/x502_example.res b/lib/SDK/examples/Delphi/x502_general/x502_example.res
similarity index 100%
rename from SDK/examples/Delphi/x502_general/x502_example.res
rename to lib/SDK/examples/Delphi/x502_general/x502_example.res
diff --git a/SDK/examples/Delphi/x502_general/x502_example_Icon.ico b/lib/SDK/examples/Delphi/x502_general/x502_example_Icon.ico
similarity index 100%
rename from SDK/examples/Delphi/x502_general/x502_example_Icon.ico
rename to lib/SDK/examples/Delphi/x502_general/x502_example_Icon.ico
diff --git a/SDK/examples/LabView/x502_recv/10.0/x502_err_sub.vi b/lib/SDK/examples/LabView/x502_recv/10.0/x502_err_sub.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv/10.0/x502_err_sub.vi
rename to lib/SDK/examples/LabView/x502_recv/10.0/x502_err_sub.vi
diff --git a/SDK/examples/LabView/x502_recv/10.0/x502_recv.vi b/lib/SDK/examples/LabView/x502_recv/10.0/x502_recv.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv/10.0/x502_recv.vi
rename to lib/SDK/examples/LabView/x502_recv/10.0/x502_recv.vi
diff --git a/SDK/examples/LabView/x502_recv/8.0/x502_err_sub.vi b/lib/SDK/examples/LabView/x502_recv/8.0/x502_err_sub.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv/8.0/x502_err_sub.vi
rename to lib/SDK/examples/LabView/x502_recv/8.0/x502_err_sub.vi
diff --git a/SDK/examples/LabView/x502_recv/8.0/x502_recv.vi b/lib/SDK/examples/LabView/x502_recv/8.0/x502_recv.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv/8.0/x502_recv.vi
rename to lib/SDK/examples/LabView/x502_recv/8.0/x502_recv.vi
diff --git a/SDK/examples/LabView/x502_recv/readme.txt b/lib/SDK/examples/LabView/x502_recv/readme.txt
similarity index 100%
rename from SDK/examples/LabView/x502_recv/readme.txt
rename to lib/SDK/examples/LabView/x502_recv/readme.txt
diff --git a/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi b/lib/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
rename to lib/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
diff --git a/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi b/lib/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
rename to lib/SDK/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
diff --git a/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi b/lib/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
rename to lib/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
diff --git a/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi b/lib/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
similarity index 100%
rename from SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
rename to lib/SDK/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
diff --git a/SDK/examples/LabView/x502_recv_out_cycle/readme.txt b/lib/SDK/examples/LabView/x502_recv_out_cycle/readme.txt
similarity index 100%
rename from SDK/examples/LabView/x502_recv_out_cycle/readme.txt
rename to lib/SDK/examples/LabView/x502_recv_out_cycle/readme.txt
diff --git a/SDK/examples/c/e502_eth_svc_browse/CMakeLists.txt b/lib/SDK/examples/c/e502_eth_svc_browse/CMakeLists.txt
similarity index 100%
rename from SDK/examples/c/e502_eth_svc_browse/CMakeLists.txt
rename to lib/SDK/examples/c/e502_eth_svc_browse/CMakeLists.txt
diff --git a/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln b/lib/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
similarity index 100%
rename from SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
rename to lib/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
diff --git a/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj b/lib/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
similarity index 100%
rename from SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
rename to lib/SDK/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
diff --git a/SDK/examples/c/e502_eth_svc_browse/main.c b/lib/SDK/examples/c/e502_eth_svc_browse/main.c
similarity index 100%
rename from SDK/examples/c/e502_eth_svc_browse/main.c
rename to lib/SDK/examples/c/e502_eth_svc_browse/main.c
diff --git a/SDK/examples/c/e502_eth_svc_browse/makefile b/lib/SDK/examples/c/e502_eth_svc_browse/makefile
similarity index 100%
rename from SDK/examples/c/e502_eth_svc_browse/makefile
rename to lib/SDK/examples/c/e502_eth_svc_browse/makefile
diff --git a/SDK/examples/c/e502_timestamp_stream/CMakeLists.txt b/lib/SDK/examples/c/e502_timestamp_stream/CMakeLists.txt
similarity index 100%
rename from SDK/examples/c/e502_timestamp_stream/CMakeLists.txt
rename to lib/SDK/examples/c/e502_timestamp_stream/CMakeLists.txt
diff --git a/SDK/examples/c/e502_timestamp_stream/main.c b/lib/SDK/examples/c/e502_timestamp_stream/main.c
similarity index 100%
rename from SDK/examples/c/e502_timestamp_stream/main.c
rename to lib/SDK/examples/c/e502_timestamp_stream/main.c
diff --git a/SDK/examples/c/x502_cycle_out/CMakeLists.txt b/lib/SDK/examples/c/x502_cycle_out/CMakeLists.txt
similarity index 100%
rename from SDK/examples/c/x502_cycle_out/CMakeLists.txt
rename to lib/SDK/examples/c/x502_cycle_out/CMakeLists.txt
diff --git a/SDK/examples/c/x502_cycle_out/main.c b/lib/SDK/examples/c/x502_cycle_out/main.c
similarity index 100%
rename from SDK/examples/c/x502_cycle_out/main.c
rename to lib/SDK/examples/c/x502_cycle_out/main.c
diff --git a/SDK/examples/c/x502_cycle_out/makefile b/lib/SDK/examples/c/x502_cycle_out/makefile
similarity index 100%
rename from SDK/examples/c/x502_cycle_out/makefile
rename to lib/SDK/examples/c/x502_cycle_out/makefile
diff --git a/SDK/examples/c/x502_cycle_out/x502_cycle_out.sln b/lib/SDK/examples/c/x502_cycle_out/x502_cycle_out.sln
similarity index 100%
rename from SDK/examples/c/x502_cycle_out/x502_cycle_out.sln
rename to lib/SDK/examples/c/x502_cycle_out/x502_cycle_out.sln
diff --git a/SDK/examples/c/x502_cycle_out/x502_cycle_out.vcproj b/lib/SDK/examples/c/x502_cycle_out/x502_cycle_out.vcproj
similarity index 100%
rename from SDK/examples/c/x502_cycle_out/x502_cycle_out.vcproj
rename to lib/SDK/examples/c/x502_cycle_out/x502_cycle_out.vcproj
diff --git a/SDK/examples/c/x502_stream_read/CMakeLists.txt b/lib/SDK/examples/c/x502_stream_read/CMakeLists.txt
similarity index 100%
rename from SDK/examples/c/x502_stream_read/CMakeLists.txt
rename to lib/SDK/examples/c/x502_stream_read/CMakeLists.txt
diff --git a/SDK/examples/c/x502_stream_read/main.c b/lib/SDK/examples/c/x502_stream_read/main.c
similarity index 100%
rename from SDK/examples/c/x502_stream_read/main.c
rename to lib/SDK/examples/c/x502_stream_read/main.c
diff --git a/SDK/examples/c/x502_stream_read/makefile b/lib/SDK/examples/c/x502_stream_read/makefile
similarity index 100%
rename from SDK/examples/c/x502_stream_read/makefile
rename to lib/SDK/examples/c/x502_stream_read/makefile
diff --git a/SDK/examples/c/x502_stream_read/x502_stream_read.sln b/lib/SDK/examples/c/x502_stream_read/x502_stream_read.sln
similarity index 100%
rename from SDK/examples/c/x502_stream_read/x502_stream_read.sln
rename to lib/SDK/examples/c/x502_stream_read/x502_stream_read.sln
diff --git a/SDK/examples/c/x502_stream_read/x502_stream_read.vcproj b/lib/SDK/examples/c/x502_stream_read/x502_stream_read.vcproj
similarity index 100%
rename from SDK/examples/c/x502_stream_read/x502_stream_read.vcproj
rename to lib/SDK/examples/c/x502_stream_read/x502_stream_read.vcproj
diff --git a/SDK/examples/cs/e502_eth_svc_browse/Program.cs b/lib/SDK/examples/cs/e502_eth_svc_browse/Program.cs
similarity index 100%
rename from SDK/examples/cs/e502_eth_svc_browse/Program.cs
rename to lib/SDK/examples/cs/e502_eth_svc_browse/Program.cs
diff --git a/SDK/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs b/lib/SDK/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
similarity index 100%
rename from SDK/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
rename to lib/SDK/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
diff --git a/SDK/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj b/lib/SDK/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
similarity index 100%
rename from SDK/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
rename to lib/SDK/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
diff --git a/SDK/examples/cs/x502_general/MainForm.Designer.cs b/lib/SDK/examples/cs/x502_general/MainForm.Designer.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/MainForm.Designer.cs
rename to lib/SDK/examples/cs/x502_general/MainForm.Designer.cs
diff --git a/SDK/examples/cs/x502_general/MainForm.cs b/lib/SDK/examples/cs/x502_general/MainForm.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/MainForm.cs
rename to lib/SDK/examples/cs/x502_general/MainForm.cs
diff --git a/SDK/examples/cs/x502_general/MainForm.resx b/lib/SDK/examples/cs/x502_general/MainForm.resx
similarity index 100%
rename from SDK/examples/cs/x502_general/MainForm.resx
rename to lib/SDK/examples/cs/x502_general/MainForm.resx
diff --git a/SDK/examples/cs/x502_general/Program.cs b/lib/SDK/examples/cs/x502_general/Program.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/Program.cs
rename to lib/SDK/examples/cs/x502_general/Program.cs
diff --git a/SDK/examples/cs/x502_general/Properties/AssemblyInfo.cs b/lib/SDK/examples/cs/x502_general/Properties/AssemblyInfo.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/Properties/AssemblyInfo.cs
rename to lib/SDK/examples/cs/x502_general/Properties/AssemblyInfo.cs
diff --git a/SDK/examples/cs/x502_general/Properties/Resources.Designer.cs b/lib/SDK/examples/cs/x502_general/Properties/Resources.Designer.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/Properties/Resources.Designer.cs
rename to lib/SDK/examples/cs/x502_general/Properties/Resources.Designer.cs
diff --git a/SDK/examples/cs/x502_general/Properties/Resources.resx b/lib/SDK/examples/cs/x502_general/Properties/Resources.resx
similarity index 100%
rename from SDK/examples/cs/x502_general/Properties/Resources.resx
rename to lib/SDK/examples/cs/x502_general/Properties/Resources.resx
diff --git a/SDK/examples/cs/x502_general/Properties/Settings.Designer.cs b/lib/SDK/examples/cs/x502_general/Properties/Settings.Designer.cs
similarity index 100%
rename from SDK/examples/cs/x502_general/Properties/Settings.Designer.cs
rename to lib/SDK/examples/cs/x502_general/Properties/Settings.Designer.cs
diff --git a/SDK/examples/cs/x502_general/x502_general.csproj b/lib/SDK/examples/cs/x502_general/x502_general.csproj
similarity index 100%
rename from SDK/examples/cs/x502_general/x502_general.csproj
rename to lib/SDK/examples/cs/x502_general/x502_general.csproj
diff --git a/SDK/examples/cs/x502_general/x502_general.sln b/lib/SDK/examples/cs/x502_general/x502_general.sln
similarity index 100%
rename from SDK/examples/cs/x502_general/x502_general.sln
rename to lib/SDK/examples/cs/x502_general/x502_general.sln
diff --git a/SDK/examples/vb6/l502_recv/MainForm.frm b/lib/SDK/examples/vb6/l502_recv/MainForm.frm
similarity index 100%
rename from SDK/examples/vb6/l502_recv/MainForm.frm
rename to lib/SDK/examples/vb6/l502_recv/MainForm.frm
diff --git a/SDK/examples/vb6/l502_recv/l502_recv.vbp b/lib/SDK/examples/vb6/l502_recv/l502_recv.vbp
similarity index 100%
rename from SDK/examples/vb6/l502_recv/l502_recv.vbp
rename to lib/SDK/examples/vb6/l502_recv/l502_recv.vbp
diff --git a/SDK/examples/vb6/l502_recv/l502_recv.vbw b/lib/SDK/examples/vb6/l502_recv/l502_recv.vbw
similarity index 100%
rename from SDK/examples/vb6/l502_recv/l502_recv.vbw
rename to lib/SDK/examples/vb6/l502_recv/l502_recv.vbw
diff --git a/SDK/examples/vb6/l502_recv/l502api.bas b/lib/SDK/examples/vb6/l502_recv/l502api.bas
similarity index 100%
rename from SDK/examples/vb6/l502_recv/l502api.bas
rename to lib/SDK/examples/vb6/l502_recv/l502api.bas
diff --git a/SDK/examples/vb6/l502_recv/readme.txt b/lib/SDK/examples/vb6/l502_recv/readme.txt
similarity index 100%
rename from SDK/examples/vb6/l502_recv/readme.txt
rename to lib/SDK/examples/vb6/l502_recv/readme.txt
diff --git a/SDK/examples/vb6/x502_general/e502api.bas b/lib/SDK/examples/vb6/x502_general/e502api.bas
similarity index 100%
rename from SDK/examples/vb6/x502_general/e502api.bas
rename to lib/SDK/examples/vb6/x502_general/e502api.bas
diff --git a/SDK/examples/vb6/x502_general/l502api.bas b/lib/SDK/examples/vb6/x502_general/l502api.bas
similarity index 100%
rename from SDK/examples/vb6/x502_general/l502api.bas
rename to lib/SDK/examples/vb6/x502_general/l502api.bas
diff --git a/SDK/examples/vb6/x502_general/readme.txt b/lib/SDK/examples/vb6/x502_general/readme.txt
similarity index 100%
rename from SDK/examples/vb6/x502_general/readme.txt
rename to lib/SDK/examples/vb6/x502_general/readme.txt
diff --git a/SDK/examples/vb6/x502_general/x502_example.frm b/lib/SDK/examples/vb6/x502_general/x502_example.frm
similarity index 100%
rename from SDK/examples/vb6/x502_general/x502_example.frm
rename to lib/SDK/examples/vb6/x502_general/x502_example.frm
diff --git a/SDK/examples/vb6/x502_general/x502_example.frx b/lib/SDK/examples/vb6/x502_general/x502_example.frx
similarity index 100%
rename from SDK/examples/vb6/x502_general/x502_example.frx
rename to lib/SDK/examples/vb6/x502_general/x502_example.frx
diff --git a/SDK/examples/vb6/x502_general/x502_example.vbp b/lib/SDK/examples/vb6/x502_general/x502_example.vbp
similarity index 100%
rename from SDK/examples/vb6/x502_general/x502_example.vbp
rename to lib/SDK/examples/vb6/x502_general/x502_example.vbp
diff --git a/SDK/examples/vb6/x502_general/x502_example.vbw b/lib/SDK/examples/vb6/x502_general/x502_example.vbw
similarity index 100%
rename from SDK/examples/vb6/x502_general/x502_example.vbw
rename to lib/SDK/examples/vb6/x502_general/x502_example.vbw
diff --git a/SDK/examples/vb6/x502_general/x502api.bas b/lib/SDK/examples/vb6/x502_general/x502api.bas
similarity index 100%
rename from SDK/examples/vb6/x502_general/x502api.bas
rename to lib/SDK/examples/vb6/x502_general/x502api.bas
diff --git a/SDK/include/e502api.h b/lib/SDK/include/e502api.h
similarity index 100%
rename from SDK/include/e502api.h
rename to lib/SDK/include/e502api.h
diff --git a/SDK/include/l502api.h b/lib/SDK/include/l502api.h
similarity index 100%
rename from SDK/include/l502api.h
rename to lib/SDK/include/l502api.h
diff --git a/SDK/include/l502api_compat.h b/lib/SDK/include/l502api_compat.h
similarity index 100%
rename from SDK/include/l502api_compat.h
rename to lib/SDK/include/l502api_compat.h
diff --git a/SDK/include/lcard_pstdint.h b/lib/SDK/include/lcard_pstdint.h
similarity index 100%
rename from SDK/include/lcard_pstdint.h
rename to lib/SDK/include/lcard_pstdint.h
diff --git a/SDK/include/x502api.h b/lib/SDK/include/x502api.h
similarity index 100%
rename from SDK/include/x502api.h
rename to lib/SDK/include/x502api.h
diff --git a/SDK/include/x502tstp.h b/lib/SDK/include/x502tstp.h
similarity index 100%
rename from SDK/include/x502tstp.h
rename to lib/SDK/include/x502tstp.h
diff --git a/SDK/lib/msvc/e502api.lib b/lib/SDK/lib/msvc/e502api.lib
similarity index 100%
rename from SDK/lib/msvc/e502api.lib
rename to lib/SDK/lib/msvc/e502api.lib
diff --git a/SDK/lib/msvc/l502api.lib b/lib/SDK/lib/msvc/l502api.lib
similarity index 100%
rename from SDK/lib/msvc/l502api.lib
rename to lib/SDK/lib/msvc/l502api.lib
diff --git a/SDK/lib/msvc/x502api.lib b/lib/SDK/lib/msvc/x502api.lib
similarity index 100%
rename from SDK/lib/msvc/x502api.lib
rename to lib/SDK/lib/msvc/x502api.lib
diff --git a/SDK/lib/msvc64/e502api.lib b/lib/SDK/lib/msvc64/e502api.lib
similarity index 100%
rename from SDK/lib/msvc64/e502api.lib
rename to lib/SDK/lib/msvc64/e502api.lib
diff --git a/SDK/lib/msvc64/l502api.lib b/lib/SDK/lib/msvc64/l502api.lib
similarity index 100%
rename from SDK/lib/msvc64/l502api.lib
rename to lib/SDK/lib/msvc64/l502api.lib
diff --git a/SDK/lib/msvc64/x502api.lib b/lib/SDK/lib/msvc64/x502api.lib
similarity index 100%
rename from SDK/lib/msvc64/x502api.lib
rename to lib/SDK/lib/msvc64/x502api.lib
diff --git a/SDK/lpcieNet/v2.0/lpcieNet.dll b/lib/SDK/lpcieNet/v2.0/lpcieNet.dll
similarity index 100%
rename from SDK/lpcieNet/v2.0/lpcieNet.dll
rename to lib/SDK/lpcieNet/v2.0/lpcieNet.dll
diff --git a/SDK/lpcieNet/v3.5/lpcieNet.dll b/lib/SDK/lpcieNet/v3.5/lpcieNet.dll
similarity index 100%
rename from SDK/lpcieNet/v3.5/lpcieNet.dll
rename to lib/SDK/lpcieNet/v3.5/lpcieNet.dll
diff --git a/SDK/lpcieNet/v4.0/lpcieNet.dll b/lib/SDK/lpcieNet/v4.0/lpcieNet.dll
similarity index 100%
rename from SDK/lpcieNet/v4.0/lpcieNet.dll
rename to lib/SDK/lpcieNet/v4.0/lpcieNet.dll
diff --git a/SDK/manuals/x502api.pdf b/lib/SDK/manuals/x502api.pdf
similarity index 100%
rename from SDK/manuals/x502api.pdf
rename to lib/SDK/manuals/x502api.pdf
diff --git a/SDK/pas/e502api.pas b/lib/SDK/pas/e502api.pas
similarity index 100%
rename from SDK/pas/e502api.pas
rename to lib/SDK/pas/e502api.pas
diff --git a/SDK/pas/l502api.pas b/lib/SDK/pas/l502api.pas
similarity index 100%
rename from SDK/pas/l502api.pas
rename to lib/SDK/pas/l502api.pas
diff --git a/SDK/pas/x502api.pas b/lib/SDK/pas/x502api.pas
similarity index 100%
rename from SDK/pas/x502api.pas
rename to lib/SDK/pas/x502api.pas
diff --git a/SDK/readme.txt b/lib/SDK/readme.txt
similarity index 100%
rename from SDK/readme.txt
rename to lib/SDK/readme.txt
diff --git a/SDK/tools/lxfw-update/e502-fpga-update-all.bat b/lib/SDK/tools/lxfw-update/e502-fpga-update-all.bat
similarity index 100%
rename from SDK/tools/lxfw-update/e502-fpga-update-all.bat
rename to lib/SDK/tools/lxfw-update/e502-fpga-update-all.bat
diff --git a/SDK/tools/lxfw-update/firm_versions.txt b/lib/SDK/tools/lxfw-update/firm_versions.txt
similarity index 100%
rename from SDK/tools/lxfw-update/firm_versions.txt
rename to lib/SDK/tools/lxfw-update/firm_versions.txt
diff --git a/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw b/lib/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw
rename to lib/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw
diff --git a/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw.sig b/lib/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw.sig
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw.sig
rename to lib/SDK/tools/lxfw-update/firmware/e502_fpga_c.lxfw.sig
diff --git a/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw b/lib/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw
rename to lib/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw
diff --git a/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw.sig b/lib/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw.sig
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw.sig
rename to lib/SDK/tools/lxfw-update/firmware/e502_fpga_i.lxfw.sig
diff --git a/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw b/lib/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/l502_fpga.lxfw
rename to lib/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw
diff --git a/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw.sig b/lib/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw.sig
similarity index 100%
rename from SDK/tools/lxfw-update/firmware/l502_fpga.lxfw.sig
rename to lib/SDK/tools/lxfw-update/firmware/l502_fpga.lxfw.sig
diff --git a/SDK/tools/lxfw-update/iconv.dll b/lib/SDK/tools/lxfw-update/iconv.dll
similarity index 100%
rename from SDK/tools/lxfw-update/iconv.dll
rename to lib/SDK/tools/lxfw-update/iconv.dll
diff --git a/SDK/tools/lxfw-update/l502-fpga-update-all.bat b/lib/SDK/tools/lxfw-update/l502-fpga-update-all.bat
similarity index 100%
rename from SDK/tools/lxfw-update/l502-fpga-update-all.bat
rename to lib/SDK/tools/lxfw-update/l502-fpga-update-all.bat
diff --git a/SDK/tools/lxfw-update/libxml2.dll b/lib/SDK/tools/lxfw-update/libxml2.dll
similarity index 100%
rename from SDK/tools/lxfw-update/libxml2.dll
rename to lib/SDK/tools/lxfw-update/libxml2.dll
diff --git a/SDK/tools/lxfw-update/lxfw-update.exe b/lib/SDK/tools/lxfw-update/lxfw-update.exe
similarity index 100%
rename from SDK/tools/lxfw-update/lxfw-update.exe
rename to lib/SDK/tools/lxfw-update/lxfw-update.exe
diff --git a/SDK/tools/lxfw-update/readme.txt b/lib/SDK/tools/lxfw-update/readme.txt
similarity index 100%
rename from SDK/tools/lxfw-update/readme.txt
rename to lib/SDK/tools/lxfw-update/readme.txt
diff --git a/SDK/tools/lxfw-update/zlib1.dll b/lib/SDK/tools/lxfw-update/zlib1.dll
similarity index 100%
rename from SDK/tools/lxfw-update/zlib1.dll
rename to lib/SDK/tools/lxfw-update/zlib1.dll
diff --git a/SDK/uninstall.exe b/lib/SDK/uninstall.exe
similarity index 100%
rename from SDK/uninstall.exe
rename to lib/SDK/uninstall.exe
diff --git a/e502/.e502api_dnssd.c.kate-swp b/lib/e502/.e502api_dnssd.c.kate-swp
similarity index 100%
rename from e502/.e502api_dnssd.c.kate-swp
rename to lib/e502/.e502api_dnssd.c.kate-swp
diff --git a/e502/CMakeLists.txt b/lib/e502/CMakeLists.txt
similarity index 100%
rename from e502/CMakeLists.txt
rename to lib/e502/CMakeLists.txt
diff --git a/e502/cmake/modules/FindAvahi.cmake b/lib/e502/cmake/modules/FindAvahi.cmake
similarity index 100%
rename from e502/cmake/modules/FindAvahi.cmake
rename to lib/e502/cmake/modules/FindAvahi.cmake
diff --git a/e502/cmake/modules/FindDNSSD.cmake b/lib/e502/cmake/modules/FindDNSSD.cmake
similarity index 100%
rename from e502/cmake/modules/FindDNSSD.cmake
rename to lib/e502/cmake/modules/FindDNSSD.cmake
diff --git a/e502/cmake/modules/FindFFTW3.cmake b/lib/e502/cmake/modules/FindFFTW3.cmake
similarity index 100%
rename from e502/cmake/modules/FindFFTW3.cmake
rename to lib/e502/cmake/modules/FindFFTW3.cmake
diff --git a/e502/cmake/modules/FindGpgError.cmake b/lib/e502/cmake/modules/FindGpgError.cmake
similarity index 100%
rename from e502/cmake/modules/FindGpgError.cmake
rename to lib/e502/cmake/modules/FindGpgError.cmake
diff --git a/e502/cmake/modules/FindLTRAPI.cmake b/lib/e502/cmake/modules/FindLTRAPI.cmake
similarity index 100%
rename from e502/cmake/modules/FindLTRAPI.cmake
rename to lib/e502/cmake/modules/FindLTRAPI.cmake
diff --git a/e502/cmake/modules/FindLibCBOR.cmake b/lib/e502/cmake/modules/FindLibCBOR.cmake
similarity index 100%
rename from e502/cmake/modules/FindLibCBOR.cmake
rename to lib/e502/cmake/modules/FindLibCBOR.cmake
diff --git a/e502/cmake/modules/FindLibUSB.cmake b/lib/e502/cmake/modules/FindLibUSB.cmake
similarity index 100%
rename from e502/cmake/modules/FindLibUSB.cmake
rename to lib/e502/cmake/modules/FindLibUSB.cmake
diff --git a/e502/cmake/modules/FindLibdaemon.cmake b/lib/e502/cmake/modules/FindLibdaemon.cmake
similarity index 100%
rename from e502/cmake/modules/FindLibdaemon.cmake
rename to lib/e502/cmake/modules/FindLibdaemon.cmake
diff --git a/e502/cmake/modules/FindLibgcrypt.cmake b/lib/e502/cmake/modules/FindLibgcrypt.cmake
similarity index 100%
rename from e502/cmake/modules/FindLibgcrypt.cmake
rename to lib/e502/cmake/modules/FindLibgcrypt.cmake
diff --git a/e502/cmake/modules/FindMKL.cmake b/lib/e502/cmake/modules/FindMKL.cmake
similarity index 100%
rename from e502/cmake/modules/FindMKL.cmake
rename to lib/e502/cmake/modules/FindMKL.cmake
diff --git a/e502/cmake/modules/FindMODBUS.cmake b/lib/e502/cmake/modules/FindMODBUS.cmake
similarity index 100%
rename from e502/cmake/modules/FindMODBUS.cmake
rename to lib/e502/cmake/modules/FindMODBUS.cmake
diff --git a/e502/cmake/modules/FindX502API.cmake b/lib/e502/cmake/modules/FindX502API.cmake
similarity index 100%
rename from e502/cmake/modules/FindX502API.cmake
rename to lib/e502/cmake/modules/FindX502API.cmake
diff --git a/e502/cmake/modules/FindXLSXWriter.cmake b/lib/e502/cmake/modules/FindXLSXWriter.cmake
similarity index 100%
rename from e502/cmake/modules/FindXLSXWriter.cmake
rename to lib/e502/cmake/modules/FindXLSXWriter.cmake
diff --git a/e502/cmake/modules/FindZMQ.cmake b/lib/e502/cmake/modules/FindZMQ.cmake
similarity index 100%
rename from e502/cmake/modules/FindZMQ.cmake
rename to lib/e502/cmake/modules/FindZMQ.cmake
diff --git a/e502/e16.rules b/lib/e502/e16.rules
similarity index 100%
rename from e502/e16.rules
rename to lib/e502/e16.rules
diff --git a/e502/e502.rules b/lib/e502/e502.rules
similarity index 100%
rename from e502/e502.rules
rename to lib/e502/e502.rules
diff --git a/e502/e502_cm4_defs.h b/lib/e502/e502_cm4_defs.h
similarity index 100%
rename from e502/e502_cm4_defs.h
rename to lib/e502/e502_cm4_defs.h
diff --git a/e502/e502_eth_config.h b/lib/e502/e502_eth_config.h
similarity index 100%
rename from e502/e502_eth_config.h
rename to lib/e502/e502_eth_config.h
diff --git a/e502/e502_fpga_regs.h b/lib/e502/e502_fpga_regs.h
similarity index 100%
rename from e502/e502_fpga_regs.h
rename to lib/e502/e502_fpga_regs.h
diff --git a/e502/e502_tcp_protocol.h b/lib/e502/e502_tcp_protocol.h
similarity index 100%
rename from e502/e502_tcp_protocol.h
rename to lib/e502/e502_tcp_protocol.h
diff --git a/e502/e502api.c b/lib/e502/e502api.c
similarity index 100%
rename from e502/e502api.c
rename to lib/e502/e502api.c
diff --git a/e502/e502api.def b/lib/e502/e502api.def
similarity index 100%
rename from e502/e502api.def
rename to lib/e502/e502api.def
diff --git a/e502/e502api.h b/lib/e502/e502api.h
similarity index 100%
rename from e502/e502api.h
rename to lib/e502/e502api.h
diff --git a/e502/e502api.rc.in b/lib/e502/e502api.rc.in
similarity index 100%
rename from e502/e502api.rc.in
rename to lib/e502/e502api.rc.in
diff --git a/e502/e502api_dnssd.c b/lib/e502/e502api_dnssd.c
similarity index 100%
rename from e502/e502api_dnssd.c
rename to lib/e502/e502api_dnssd.c
diff --git a/e502/e502api_eth_config.c b/lib/e502/e502api_eth_config.c
similarity index 100%
rename from e502/e502api_eth_config.c
rename to lib/e502/e502api_eth_config.c
diff --git a/e502/e502api_private.h b/lib/e502/e502api_private.h
similarity index 100%
rename from e502/e502api_private.h
rename to lib/e502/e502api_private.h
diff --git a/e502/e502api_tcp.c b/lib/e502/e502api_tcp.c
similarity index 100%
rename from e502/e502api_tcp.c
rename to lib/e502/e502api_tcp.c
diff --git a/e502/e502api_tcp_private.h b/lib/e502/e502api_tcp_private.h
similarity index 100%
rename from e502/e502api_tcp_private.h
rename to lib/e502/e502api_tcp_private.h
diff --git a/e502/e502api_usb.c b/lib/e502/e502api_usb.c
similarity index 100%
rename from e502/e502api_usb.c
rename to lib/e502/e502api_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/Makefile.am b/lib/e502/libusb-1.0/libusb-1.0/Makefile.am
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/Makefile.am
rename to lib/e502/libusb-1.0/libusb-1.0/Makefile.am
diff --git a/e502/libusb-1.0/libusb-1.0/Makefile.in b/lib/e502/libusb-1.0/libusb-1.0/Makefile.in
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/Makefile.in
rename to lib/e502/libusb-1.0/libusb-1.0/Makefile.in
diff --git a/e502/libusb-1.0/libusb-1.0/core.c b/lib/e502/libusb-1.0/libusb-1.0/core.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/core.c
rename to lib/e502/libusb-1.0/libusb-1.0/core.c
diff --git a/e502/libusb-1.0/libusb-1.0/descriptor.c b/lib/e502/libusb-1.0/libusb-1.0/descriptor.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/descriptor.c
rename to lib/e502/libusb-1.0/libusb-1.0/descriptor.c
diff --git a/e502/libusb-1.0/libusb-1.0/hotplug.c b/lib/e502/libusb-1.0/libusb-1.0/hotplug.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/hotplug.c
rename to lib/e502/libusb-1.0/libusb-1.0/hotplug.c
diff --git a/e502/libusb-1.0/libusb-1.0/hotplug.h b/lib/e502/libusb-1.0/libusb-1.0/hotplug.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/hotplug.h
rename to lib/e502/libusb-1.0/libusb-1.0/hotplug.h
diff --git a/e502/libusb-1.0/libusb-1.0/io.c b/lib/e502/libusb-1.0/libusb-1.0/io.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/io.c
rename to lib/e502/libusb-1.0/libusb-1.0/io.c
diff --git a/e502/libusb-1.0/libusb-1.0/libusb-1.0.def b/lib/e502/libusb-1.0/libusb-1.0/libusb-1.0.def
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/libusb-1.0.def
rename to lib/e502/libusb-1.0/libusb-1.0/libusb-1.0.def
diff --git a/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc b/lib/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
rename to lib/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
diff --git a/e502/libusb-1.0/libusb-1.0/libusb.h b/lib/e502/libusb-1.0/libusb-1.0/libusb.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/libusb.h
rename to lib/e502/libusb-1.0/libusb-1.0/libusb.h
diff --git a/e502/libusb-1.0/libusb-1.0/libusbi.h b/lib/e502/libusb-1.0/libusb-1.0/libusbi.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/libusbi.h
rename to lib/e502/libusb-1.0/libusb-1.0/libusbi.h
diff --git a/e502/libusb-1.0/libusb-1.0/msvc/config.h b/lib/e502/libusb-1.0/libusb-1.0/msvc/config.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/msvc/config.h
rename to lib/e502/libusb-1.0/libusb-1.0/msvc/config.h
diff --git a/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h b/lib/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
rename to lib/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
diff --git a/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h b/lib/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
rename to lib/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
diff --git a/e502/libusb-1.0/libusb-1.0/msvc/missing.h b/lib/e502/libusb-1.0/libusb-1.0/msvc/missing.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/msvc/missing.h
rename to lib/e502/libusb-1.0/libusb-1.0/msvc/missing.h
diff --git a/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h b/lib/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
rename to lib/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c b/lib/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h b/lib/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c b/lib/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/linux_udev.c b/lib/e502/libusb-1.0/libusb-1.0/os/linux_udev.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/linux_udev.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/linux_udev.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c b/lib/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h b/lib/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c b/lib/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c b/lib/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/poll_posix.c b/lib/e502/libusb-1.0/libusb-1.0/os/poll_posix.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/poll_posix.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/poll_posix.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/poll_posix.h b/lib/e502/libusb-1.0/libusb-1.0/os/poll_posix.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/poll_posix.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/poll_posix.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/poll_windows.c b/lib/e502/libusb-1.0/libusb-1.0/os/poll_windows.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/poll_windows.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/poll_windows.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/poll_windows.h b/lib/e502/libusb-1.0/libusb-1.0/os/poll_windows.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/poll_windows.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/poll_windows.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/threads_posix.c b/lib/e502/libusb-1.0/libusb-1.0/os/threads_posix.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/threads_posix.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/threads_posix.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/threads_posix.h b/lib/e502/libusb-1.0/libusb-1.0/os/threads_posix.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/threads_posix.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/threads_posix.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/threads_windows.c b/lib/e502/libusb-1.0/libusb-1.0/os/threads_windows.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/threads_windows.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/threads_windows.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/threads_windows.h b/lib/e502/libusb-1.0/libusb-1.0/os/threads_windows.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/threads_windows.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/threads_windows.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/wince_usb.c b/lib/e502/libusb-1.0/libusb-1.0/os/wince_usb.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/wince_usb.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/wince_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/wince_usb.h b/lib/e502/libusb-1.0/libusb-1.0/os/wince_usb.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/wince_usb.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/wince_usb.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/windows_common.h b/lib/e502/libusb-1.0/libusb-1.0/os/windows_common.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/windows_common.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/windows_common.h
diff --git a/e502/libusb-1.0/libusb-1.0/os/windows_usb.c b/lib/e502/libusb-1.0/libusb-1.0/os/windows_usb.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/windows_usb.c
rename to lib/e502/libusb-1.0/libusb-1.0/os/windows_usb.c
diff --git a/e502/libusb-1.0/libusb-1.0/os/windows_usb.h b/lib/e502/libusb-1.0/libusb-1.0/os/windows_usb.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/os/windows_usb.h
rename to lib/e502/libusb-1.0/libusb-1.0/os/windows_usb.h
diff --git a/e502/libusb-1.0/libusb-1.0/strerror.c b/lib/e502/libusb-1.0/libusb-1.0/strerror.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/strerror.c
rename to lib/e502/libusb-1.0/libusb-1.0/strerror.c
diff --git a/e502/libusb-1.0/libusb-1.0/sync.c b/lib/e502/libusb-1.0/libusb-1.0/sync.c
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/sync.c
rename to lib/e502/libusb-1.0/libusb-1.0/sync.c
diff --git a/e502/libusb-1.0/libusb-1.0/version.h b/lib/e502/libusb-1.0/libusb-1.0/version.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/version.h
rename to lib/e502/libusb-1.0/libusb-1.0/version.h
diff --git a/e502/libusb-1.0/libusb-1.0/version_nano.h b/lib/e502/libusb-1.0/libusb-1.0/version_nano.h
similarity index 100%
rename from e502/libusb-1.0/libusb-1.0/version_nano.h
rename to lib/e502/libusb-1.0/libusb-1.0/version_nano.h
diff --git a/e502/libusb-1.0/libusb.cmake b/lib/e502/libusb-1.0/libusb.cmake
similarity index 100%
rename from e502/libusb-1.0/libusb.cmake
rename to lib/e502/libusb-1.0/libusb.cmake
diff --git a/e502/pas/e502api.pas b/lib/e502/pas/e502api.pas
similarity index 100%
rename from e502/pas/e502api.pas
rename to lib/e502/pas/e502api.pas
diff --git a/l502/CMakeLists.txt b/lib/l502/CMakeLists.txt
similarity index 100%
rename from l502/CMakeLists.txt
rename to lib/l502/CMakeLists.txt
diff --git a/l502/l502_fpga_regs.h b/lib/l502/l502_fpga_regs.h
similarity index 100%
rename from l502/l502_fpga_regs.h
rename to lib/l502/l502_fpga_regs.h
diff --git a/l502/l502api.c b/lib/l502/l502api.c
similarity index 100%
rename from l502/l502api.c
rename to lib/l502/l502api.c
diff --git a/l502/l502api.def b/lib/l502/l502api.def
similarity index 100%
rename from l502/l502api.def
rename to lib/l502/l502api.def
diff --git a/l502/l502api.h b/lib/l502/l502api.h
similarity index 100%
rename from l502/l502api.h
rename to lib/l502/l502api.h
diff --git a/l502/l502api.rc.in b/lib/l502/l502api.rc.in
similarity index 100%
rename from l502/l502api.rc.in
rename to lib/l502/l502api.rc.in
diff --git a/l502/l502api_bf.c b/lib/l502/l502api_bf.c
similarity index 100%
rename from l502/l502api_bf.c
rename to lib/l502/l502api_bf.c
diff --git a/l502/l502api_compat.c b/lib/l502/l502api_compat.c
similarity index 100%
rename from l502/l502api_compat.c
rename to lib/l502/l502api_compat.c
diff --git a/l502/l502api_compat.h b/lib/l502/l502api_compat.h
similarity index 100%
rename from l502/l502api_compat.h
rename to lib/l502/l502api_compat.h
diff --git a/l502/l502api_eeprom.c b/lib/l502/l502api_eeprom.c
similarity index 100%
rename from l502/l502api_eeprom.c
rename to lib/l502/l502api_eeprom.c
diff --git a/l502/l502api_private.h b/lib/l502/l502api_private.h
similarity index 100%
rename from l502/l502api_private.h
rename to lib/l502/l502api_private.h
diff --git a/l502/linux/l502_ioctls.h b/lib/l502/linux/l502_ioctls.h
similarity index 100%
rename from l502/linux/l502_ioctls.h
rename to lib/l502/linux/l502_ioctls.h
diff --git a/l502/linux/l502_spec.c b/lib/l502/linux/l502_spec.c
similarity index 100%
rename from l502/linux/l502_spec.c
rename to lib/l502/linux/l502_spec.c
diff --git a/l502/lpcie_ioctls.h b/lib/l502/lpcie_ioctls.h
similarity index 100%
rename from l502/lpcie_ioctls.h
rename to lib/l502/lpcie_ioctls.h
diff --git a/l502/pas/l502api.pas b/lib/l502/pas/l502api.pas
similarity index 100%
rename from l502/pas/l502api.pas
rename to lib/l502/pas/l502api.pas
diff --git a/l502/win/l502_spec.c b/lib/l502/win/l502_spec.c
similarity index 100%
rename from l502/win/l502_spec.c
rename to lib/l502/win/l502_spec.c
diff --git a/l502_BF_enums.h b/lib/l502_BF_enums.h
similarity index 100%
rename from l502_BF_enums.h
rename to lib/l502_BF_enums.h
diff --git a/l502_fpga_regs.h b/lib/l502_fpga_regs.h
similarity index 100%
rename from l502_fpga_regs.h
rename to lib/l502_fpga_regs.h
diff --git a/x502/fast_crc_cfg.h b/lib/x502/fast_crc_cfg.h
similarity index 100%
rename from x502/fast_crc_cfg.h
rename to lib/x502/fast_crc_cfg.h
diff --git a/x502/l502_bf_cmd_defs.h b/lib/x502/l502_bf_cmd_defs.h
similarity index 100%
rename from x502/l502_bf_cmd_defs.h
rename to lib/x502/l502_bf_cmd_defs.h
diff --git a/x502/lboot_req.h b/lib/x502/lboot_req.h
similarity index 100%
rename from x502/lboot_req.h
rename to lib/x502/lboot_req.h
diff --git a/x502/lcard_pstdint.h b/lib/x502/lcard_pstdint.h
similarity index 100%
rename from x502/lcard_pstdint.h
rename to lib/x502/lcard_pstdint.h
diff --git a/x502/osspec_cfg.h b/lib/x502/osspec_cfg.h
similarity index 100%
rename from x502/osspec_cfg.h
rename to lib/x502/osspec_cfg.h
diff --git a/x502/x502_eeprom.h b/lib/x502/x502_eeprom.h
similarity index 100%
rename from x502/x502_eeprom.h
rename to lib/x502/x502_eeprom.h
diff --git a/x502/x502_fpga_regs.h b/lib/x502/x502_fpga_regs.h
similarity index 100%
rename from x502/x502_fpga_regs.h
rename to lib/x502/x502_fpga_regs.h
diff --git a/x502/x502api.c b/lib/x502/x502api.c
similarity index 100%
rename from x502/x502api.c
rename to lib/x502/x502api.c
diff --git a/x502/x502api.h b/lib/x502/x502api.h
similarity index 100%
rename from x502/x502api.h
rename to lib/x502/x502api.h
diff --git a/x502/x502api_async.c b/lib/x502/x502api_async.c
similarity index 100%
rename from x502/x502api_async.c
rename to lib/x502/x502api_async.c
diff --git a/x502/x502api_bf.c b/lib/x502/x502api_bf.c
similarity index 100%
rename from x502/x502api_bf.c
rename to lib/x502/x502api_bf.c
diff --git a/x502/x502api_config.c b/lib/x502/x502api_config.c
similarity index 100%
rename from x502/x502api_config.c
rename to lib/x502/x502api_config.c
diff --git a/x502/x502api_eeprom.c b/lib/x502/x502api_eeprom.c
similarity index 100%
rename from x502/x502api_eeprom.c
rename to lib/x502/x502api_eeprom.c
diff --git a/x502/x502api_errs.c b/lib/x502/x502api_errs.c
similarity index 100%
rename from x502/x502api_errs.c
rename to lib/x502/x502api_errs.c
diff --git a/x502/x502api_private.h b/lib/x502/x502api_private.h
similarity index 100%
rename from x502/x502api_private.h
rename to lib/x502/x502api_private.h
diff --git a/x502/x502api_streams.c b/lib/x502/x502api_streams.c
similarity index 100%
rename from x502/x502api_streams.c
rename to lib/x502/x502api_streams.c
diff --git a/x502/x502tstp.c b/lib/x502/x502tstp.c
similarity index 100%
rename from x502/x502tstp.c
rename to lib/x502/x502tstp.c
diff --git a/x502/x502tstp.h b/lib/x502/x502tstp.h
similarity index 100%
rename from x502/x502tstp.h
rename to lib/x502/x502tstp.h
diff --git a/x502api-1.1.34/CMakeLists.txt b/lib/x502api-1.1.34/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/CMakeLists.txt
rename to lib/x502api-1.1.34/CMakeLists.txt
diff --git a/x502api-1.1.34/arch/PKGBUILD.in b/lib/x502api-1.1.34/arch/PKGBUILD.in
similarity index 100%
rename from x502api-1.1.34/arch/PKGBUILD.in
rename to lib/x502api-1.1.34/arch/PKGBUILD.in
diff --git a/x502api-1.1.34/arch/x502api.install.in b/lib/x502api-1.1.34/arch/x502api.install.in
similarity index 100%
rename from x502api-1.1.34/arch/x502api.install.in
rename to lib/x502api-1.1.34/arch/x502api.install.in
diff --git a/x502api-1.1.34/debian/changelog b/lib/x502api-1.1.34/debian/changelog
similarity index 100%
rename from x502api-1.1.34/debian/changelog
rename to lib/x502api-1.1.34/debian/changelog
diff --git a/x502api-1.1.34/debian/changelog.in b/lib/x502api-1.1.34/debian/changelog.in
similarity index 100%
rename from x502api-1.1.34/debian/changelog.in
rename to lib/x502api-1.1.34/debian/changelog.in
diff --git a/x502api-1.1.34/debian/compat b/lib/x502api-1.1.34/debian/compat
similarity index 100%
rename from x502api-1.1.34/debian/compat
rename to lib/x502api-1.1.34/debian/compat
diff --git a/x502api-1.1.34/debian/control b/lib/x502api-1.1.34/debian/control
similarity index 100%
rename from x502api-1.1.34/debian/control
rename to lib/x502api-1.1.34/debian/control
diff --git a/x502api-1.1.34/debian/control.in b/lib/x502api-1.1.34/debian/control.in
similarity index 100%
rename from x502api-1.1.34/debian/control.in
rename to lib/x502api-1.1.34/debian/control.in
diff --git a/x502api-1.1.34/debian/copyright b/lib/x502api-1.1.34/debian/copyright
similarity index 100%
rename from x502api-1.1.34/debian/copyright
rename to lib/x502api-1.1.34/debian/copyright
diff --git a/x502api-1.1.34/debian/copyright.in b/lib/x502api-1.1.34/debian/copyright.in
similarity index 100%
rename from x502api-1.1.34/debian/copyright.in
rename to lib/x502api-1.1.34/debian/copyright.in
diff --git a/x502api-1.1.34/debian/libe502api1.dirs b/lib/x502api-1.1.34/debian/libe502api1.dirs
similarity index 100%
rename from x502api-1.1.34/debian/libe502api1.dirs
rename to lib/x502api-1.1.34/debian/libe502api1.dirs
diff --git a/x502api-1.1.34/debian/libe502api1.install b/lib/x502api-1.1.34/debian/libe502api1.install
similarity index 100%
rename from x502api-1.1.34/debian/libe502api1.install
rename to lib/x502api-1.1.34/debian/libe502api1.install
diff --git a/x502api-1.1.34/debian/libe502api1.postinst b/lib/x502api-1.1.34/debian/libe502api1.postinst
similarity index 100%
rename from x502api-1.1.34/debian/libe502api1.postinst
rename to lib/x502api-1.1.34/debian/libe502api1.postinst
diff --git a/x502api-1.1.34/debian/libl502api1.dirs b/lib/x502api-1.1.34/debian/libl502api1.dirs
similarity index 100%
rename from x502api-1.1.34/debian/libl502api1.dirs
rename to lib/x502api-1.1.34/debian/libl502api1.dirs
diff --git a/x502api-1.1.34/debian/libl502api1.install b/lib/x502api-1.1.34/debian/libl502api1.install
similarity index 100%
rename from x502api-1.1.34/debian/libl502api1.install
rename to lib/x502api-1.1.34/debian/libl502api1.install
diff --git a/x502api-1.1.34/debian/libx502api1-dev.dirs b/lib/x502api-1.1.34/debian/libx502api1-dev.dirs
similarity index 100%
rename from x502api-1.1.34/debian/libx502api1-dev.dirs
rename to lib/x502api-1.1.34/debian/libx502api1-dev.dirs
diff --git a/x502api-1.1.34/debian/libx502api1-dev.install b/lib/x502api-1.1.34/debian/libx502api1-dev.install
similarity index 100%
rename from x502api-1.1.34/debian/libx502api1-dev.install
rename to lib/x502api-1.1.34/debian/libx502api1-dev.install
diff --git a/x502api-1.1.34/debian/libx502api1.dirs b/lib/x502api-1.1.34/debian/libx502api1.dirs
similarity index 100%
rename from x502api-1.1.34/debian/libx502api1.dirs
rename to lib/x502api-1.1.34/debian/libx502api1.dirs
diff --git a/x502api-1.1.34/debian/libx502api1.install b/lib/x502api-1.1.34/debian/libx502api1.install
similarity index 100%
rename from x502api-1.1.34/debian/libx502api1.install
rename to lib/x502api-1.1.34/debian/libx502api1.install
diff --git a/x502api-1.1.34/debian/rules b/lib/x502api-1.1.34/debian/rules
similarity index 100%
rename from x502api-1.1.34/debian/rules
rename to lib/x502api-1.1.34/debian/rules
diff --git a/x502api-1.1.34/debian/source/format b/lib/x502api-1.1.34/debian/source/format
similarity index 100%
rename from x502api-1.1.34/debian/source/format
rename to lib/x502api-1.1.34/debian/source/format
diff --git a/x502api-1.1.34/devs/CMakeLists.txt b/lib/x502api-1.1.34/devs/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/devs/CMakeLists.txt
rename to lib/x502api-1.1.34/devs/CMakeLists.txt
diff --git a/x502api-1.1.34/devs/e502/.e502api_dnssd.c.kate-swp b/lib/x502api-1.1.34/devs/e502/.e502api_dnssd.c.kate-swp
similarity index 100%
rename from x502api-1.1.34/devs/e502/.e502api_dnssd.c.kate-swp
rename to lib/x502api-1.1.34/devs/e502/.e502api_dnssd.c.kate-swp
diff --git a/x502api-1.1.34/devs/e502/CMakeLists.txt b/lib/x502api-1.1.34/devs/e502/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/devs/e502/CMakeLists.txt
rename to lib/x502api-1.1.34/devs/e502/CMakeLists.txt
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindAvahi.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindAvahi.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindAvahi.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindAvahi.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindDNSSD.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindDNSSD.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindDNSSD.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindDNSSD.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindFFTW3.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindFFTW3.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindFFTW3.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindFFTW3.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindGpgError.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindGpgError.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindGpgError.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindGpgError.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindLTRAPI.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindLTRAPI.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindLTRAPI.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindLTRAPI.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindLibCBOR.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibCBOR.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindLibCBOR.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibCBOR.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindLibUSB.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibUSB.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindLibUSB.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibUSB.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindLibdaemon.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibdaemon.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindLibdaemon.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibdaemon.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindLibgcrypt.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibgcrypt.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindLibgcrypt.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindLibgcrypt.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindMKL.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindMKL.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindMKL.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindMKL.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindMODBUS.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindMODBUS.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindMODBUS.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindMODBUS.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindX502API.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindX502API.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindX502API.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindX502API.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindXLSXWriter.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindXLSXWriter.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindXLSXWriter.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindXLSXWriter.cmake
diff --git a/x502api-1.1.34/devs/e502/cmake/modules/FindZMQ.cmake b/lib/x502api-1.1.34/devs/e502/cmake/modules/FindZMQ.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/cmake/modules/FindZMQ.cmake
rename to lib/x502api-1.1.34/devs/e502/cmake/modules/FindZMQ.cmake
diff --git a/x502api-1.1.34/devs/e502/e16.rules b/lib/x502api-1.1.34/devs/e502/e16.rules
similarity index 100%
rename from x502api-1.1.34/devs/e502/e16.rules
rename to lib/x502api-1.1.34/devs/e502/e16.rules
diff --git a/x502api-1.1.34/devs/e502/e502.rules b/lib/x502api-1.1.34/devs/e502/e502.rules
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502.rules
rename to lib/x502api-1.1.34/devs/e502/e502.rules
diff --git a/x502api-1.1.34/devs/e502/e502_cm4_defs.h b/lib/x502api-1.1.34/devs/e502/e502_cm4_defs.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502_cm4_defs.h
rename to lib/x502api-1.1.34/devs/e502/e502_cm4_defs.h
diff --git a/x502api-1.1.34/devs/e502/e502_eth_config.h b/lib/x502api-1.1.34/devs/e502/e502_eth_config.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502_eth_config.h
rename to lib/x502api-1.1.34/devs/e502/e502_eth_config.h
diff --git a/x502api-1.1.34/devs/e502/e502_fpga_regs.h b/lib/x502api-1.1.34/devs/e502/e502_fpga_regs.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502_fpga_regs.h
rename to lib/x502api-1.1.34/devs/e502/e502_fpga_regs.h
diff --git a/x502api-1.1.34/devs/e502/e502_tcp_protocol.h b/lib/x502api-1.1.34/devs/e502/e502_tcp_protocol.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502_tcp_protocol.h
rename to lib/x502api-1.1.34/devs/e502/e502_tcp_protocol.h
diff --git a/x502api-1.1.34/devs/e502/e502api.c b/lib/x502api-1.1.34/devs/e502/e502api.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api.c
rename to lib/x502api-1.1.34/devs/e502/e502api.c
diff --git a/x502api-1.1.34/devs/e502/e502api.def b/lib/x502api-1.1.34/devs/e502/e502api.def
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api.def
rename to lib/x502api-1.1.34/devs/e502/e502api.def
diff --git a/x502api-1.1.34/devs/e502/e502api.h b/lib/x502api-1.1.34/devs/e502/e502api.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api.h
rename to lib/x502api-1.1.34/devs/e502/e502api.h
diff --git a/x502api-1.1.34/devs/e502/e502api.rc.in b/lib/x502api-1.1.34/devs/e502/e502api.rc.in
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api.rc.in
rename to lib/x502api-1.1.34/devs/e502/e502api.rc.in
diff --git a/x502api-1.1.34/devs/e502/e502api_dnssd.c b/lib/x502api-1.1.34/devs/e502/e502api_dnssd.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_dnssd.c
rename to lib/x502api-1.1.34/devs/e502/e502api_dnssd.c
diff --git a/x502api-1.1.34/devs/e502/e502api_eth_config.c b/lib/x502api-1.1.34/devs/e502/e502api_eth_config.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_eth_config.c
rename to lib/x502api-1.1.34/devs/e502/e502api_eth_config.c
diff --git a/x502api-1.1.34/devs/e502/e502api_private.h b/lib/x502api-1.1.34/devs/e502/e502api_private.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_private.h
rename to lib/x502api-1.1.34/devs/e502/e502api_private.h
diff --git a/x502api-1.1.34/devs/e502/e502api_tcp.c b/lib/x502api-1.1.34/devs/e502/e502api_tcp.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_tcp.c
rename to lib/x502api-1.1.34/devs/e502/e502api_tcp.c
diff --git a/x502api-1.1.34/devs/e502/e502api_tcp_private.h b/lib/x502api-1.1.34/devs/e502/e502api_tcp_private.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_tcp_private.h
rename to lib/x502api-1.1.34/devs/e502/e502api_tcp_private.h
diff --git a/x502api-1.1.34/devs/e502/e502api_usb.c b/lib/x502api-1.1.34/devs/e502/e502api_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/e502api_usb.c
rename to lib/x502api-1.1.34/devs/e502/e502api_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.am b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.am
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.am
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.am
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.in b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.in
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.in
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/Makefile.in
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/core.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/core.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/core.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/core.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/descriptor.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/descriptor.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/descriptor.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/descriptor.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/hotplug.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/io.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/io.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/io.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/io.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.def b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.def
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.def
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.def
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb-1.0.rc
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusb.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusbi.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusbi.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusbi.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/libusbi.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/config.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/config.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/config.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/config.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/errno/errno.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/inttypes/inttypes.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/missing.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/missing.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/missing.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/missing.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/msvc/stdint/stdint.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/darwin_usb.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_netlink.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_udev.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_udev.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_udev.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_udev.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/linux_usbfs.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/netbsd_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/openbsd_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_posix.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/poll_windows.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_posix.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/threads_windows.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/wince_usb.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_common.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_common.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_common.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_common.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/os/windows_usb.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/strerror.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/strerror.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/strerror.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/strerror.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/sync.c b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/sync.c
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/sync.c
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/sync.c
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version_nano.h b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version_nano.h
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version_nano.h
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb-1.0/version_nano.h
diff --git a/x502api-1.1.34/devs/e502/libusb-1.0/libusb.cmake b/lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb.cmake
similarity index 100%
rename from x502api-1.1.34/devs/e502/libusb-1.0/libusb.cmake
rename to lib/x502api-1.1.34/devs/e502/libusb-1.0/libusb.cmake
diff --git a/x502api-1.1.34/devs/e502/pas/e502api.pas b/lib/x502api-1.1.34/devs/e502/pas/e502api.pas
similarity index 100%
rename from x502api-1.1.34/devs/e502/pas/e502api.pas
rename to lib/x502api-1.1.34/devs/e502/pas/e502api.pas
diff --git a/x502api-1.1.34/devs/l502/CMakeLists.txt b/lib/x502api-1.1.34/devs/l502/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/devs/l502/CMakeLists.txt
rename to lib/x502api-1.1.34/devs/l502/CMakeLists.txt
diff --git a/x502api-1.1.34/devs/l502/l502_fpga_regs.h b/lib/x502api-1.1.34/devs/l502/l502_fpga_regs.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502_fpga_regs.h
rename to lib/x502api-1.1.34/devs/l502/l502_fpga_regs.h
diff --git a/x502api-1.1.34/devs/l502/l502api.c b/lib/x502api-1.1.34/devs/l502/l502api.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api.c
rename to lib/x502api-1.1.34/devs/l502/l502api.c
diff --git a/x502api-1.1.34/devs/l502/l502api.def b/lib/x502api-1.1.34/devs/l502/l502api.def
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api.def
rename to lib/x502api-1.1.34/devs/l502/l502api.def
diff --git a/x502api-1.1.34/devs/l502/l502api.h b/lib/x502api-1.1.34/devs/l502/l502api.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api.h
rename to lib/x502api-1.1.34/devs/l502/l502api.h
diff --git a/x502api-1.1.34/devs/l502/l502api.rc.in b/lib/x502api-1.1.34/devs/l502/l502api.rc.in
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api.rc.in
rename to lib/x502api-1.1.34/devs/l502/l502api.rc.in
diff --git a/x502api-1.1.34/devs/l502/l502api_bf.c b/lib/x502api-1.1.34/devs/l502/l502api_bf.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api_bf.c
rename to lib/x502api-1.1.34/devs/l502/l502api_bf.c
diff --git a/x502api-1.1.34/devs/l502/l502api_compat.c b/lib/x502api-1.1.34/devs/l502/l502api_compat.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api_compat.c
rename to lib/x502api-1.1.34/devs/l502/l502api_compat.c
diff --git a/x502api-1.1.34/devs/l502/l502api_compat.h b/lib/x502api-1.1.34/devs/l502/l502api_compat.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api_compat.h
rename to lib/x502api-1.1.34/devs/l502/l502api_compat.h
diff --git a/x502api-1.1.34/devs/l502/l502api_eeprom.c b/lib/x502api-1.1.34/devs/l502/l502api_eeprom.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api_eeprom.c
rename to lib/x502api-1.1.34/devs/l502/l502api_eeprom.c
diff --git a/x502api-1.1.34/devs/l502/l502api_private.h b/lib/x502api-1.1.34/devs/l502/l502api_private.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/l502api_private.h
rename to lib/x502api-1.1.34/devs/l502/l502api_private.h
diff --git a/x502api-1.1.34/devs/l502/linux/l502_ioctls.h b/lib/x502api-1.1.34/devs/l502/linux/l502_ioctls.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/linux/l502_ioctls.h
rename to lib/x502api-1.1.34/devs/l502/linux/l502_ioctls.h
diff --git a/x502api-1.1.34/devs/l502/linux/l502_spec.c b/lib/x502api-1.1.34/devs/l502/linux/l502_spec.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/linux/l502_spec.c
rename to lib/x502api-1.1.34/devs/l502/linux/l502_spec.c
diff --git a/x502api-1.1.34/devs/l502/lpcie_ioctls.h b/lib/x502api-1.1.34/devs/l502/lpcie_ioctls.h
similarity index 100%
rename from x502api-1.1.34/devs/l502/lpcie_ioctls.h
rename to lib/x502api-1.1.34/devs/l502/lpcie_ioctls.h
diff --git a/x502api-1.1.34/devs/l502/pas/l502api.pas b/lib/x502api-1.1.34/devs/l502/pas/l502api.pas
similarity index 100%
rename from x502api-1.1.34/devs/l502/pas/l502api.pas
rename to lib/x502api-1.1.34/devs/l502/pas/l502api.pas
diff --git a/x502api-1.1.34/devs/l502/win/l502_spec.c b/lib/x502api-1.1.34/devs/l502/win/l502_spec.c
similarity index 100%
rename from x502api-1.1.34/devs/l502/win/l502_spec.c
rename to lib/x502api-1.1.34/devs/l502/win/l502_spec.c
diff --git a/x502api-1.1.34/doc/Doxyfile.in b/lib/x502api-1.1.34/doc/Doxyfile.in
similarity index 100%
rename from x502api-1.1.34/doc/Doxyfile.in
rename to lib/x502api-1.1.34/doc/Doxyfile.in
diff --git a/x502api-1.1.34/doc/about.md b/lib/x502api-1.1.34/doc/about.md
similarity index 100%
rename from x502api-1.1.34/doc/about.md
rename to lib/x502api-1.1.34/doc/about.md
diff --git a/x502api-1.1.34/doc/config.xml.in b/lib/x502api-1.1.34/doc/config.xml.in
similarity index 100%
rename from x502api-1.1.34/doc/config.xml.in
rename to lib/x502api-1.1.34/doc/config.xml.in
diff --git a/x502api-1.1.34/doc/gen_descr.md b/lib/x502api-1.1.34/doc/gen_descr.md
similarity index 100%
rename from x502api-1.1.34/doc/gen_descr.md
rename to lib/x502api-1.1.34/doc/gen_descr.md
diff --git a/x502api-1.1.34/doc/images/adc_frame.jpeg b/lib/x502api-1.1.34/doc/images/adc_frame.jpeg
similarity index 100%
rename from x502api-1.1.34/doc/images/adc_frame.jpeg
rename to lib/x502api-1.1.34/doc/images/adc_frame.jpeg
diff --git a/x502api-1.1.34/doc/images/adc_frame.odg b/lib/x502api-1.1.34/doc/images/adc_frame.odg
similarity index 100%
rename from x502api-1.1.34/doc/images/adc_frame.odg
rename to lib/x502api-1.1.34/doc/images/adc_frame.odg
diff --git a/x502api-1.1.34/doc/mainpage.md b/lib/x502api-1.1.34/doc/mainpage.md
similarity index 100%
rename from x502api-1.1.34/doc/mainpage.md
rename to lib/x502api-1.1.34/doc/mainpage.md
diff --git a/x502api-1.1.34/doc/setup.md b/lib/x502api-1.1.34/doc/setup.md
similarity index 100%
rename from x502api-1.1.34/doc/setup.md
rename to lib/x502api-1.1.34/doc/setup.md
diff --git a/x502api-1.1.34/doc/tstp_descr.md b/lib/x502api-1.1.34/doc/tstp_descr.md
similarity index 100%
rename from x502api-1.1.34/doc/tstp_descr.md
rename to lib/x502api-1.1.34/doc/tstp_descr.md
diff --git a/x502api-1.1.34/doc/x502api.tex b/lib/x502api-1.1.34/doc/x502api.tex
similarity index 100%
rename from x502api-1.1.34/doc/x502api.tex
rename to lib/x502api-1.1.34/doc/x502api.tex
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/readme.txt b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/readme.txt
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/readme.txt
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/unit.cpp b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.cpp
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/unit.cpp
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.cpp
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/unit.dfm b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.dfm
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/unit.dfm
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.dfm
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/unit.h b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.h
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/unit.h
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/unit.h
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.bpr b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.bpr
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.bpr
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.bpr
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cbproj b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cbproj
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cbproj
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cbproj
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cpp b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cpp
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cpp
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.cpp
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.res b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.res
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.res
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_example.res
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.cpp b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.cpp
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.cpp
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.cpp
diff --git a/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.h b/lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.h
similarity index 100%
rename from x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.h
rename to lib/x502api-1.1.34/examples/CppBuilder/x502_general/x502_thread.h
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.dfm b/lib/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.dfm
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/MainUnit.dfm
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.dfm
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.pas b/lib/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.pas
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/MainUnit.pas
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/MainUnit.pas
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/X502_ProcessThread.pas b/lib/x502api-1.1.34/examples/Delphi/x502_general/X502_ProcessThread.pas
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/X502_ProcessThread.pas
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/X502_ProcessThread.pas
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/readme.txt b/lib/x502api-1.1.34/examples/Delphi/x502_general/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/readme.txt
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/readme.txt
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dof b/lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dof
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/x502_example.dof
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dof
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dpr b/lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dpr
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/x502_example.dpr
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dpr
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dproj b/lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dproj
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/x502_example.dproj
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.dproj
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/x502_example.res b/lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.res
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/x502_example.res
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example.res
diff --git a/x502api-1.1.34/examples/Delphi/x502_general/x502_example_Icon.ico b/lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example_Icon.ico
similarity index 100%
rename from x502api-1.1.34/examples/Delphi/x502_general/x502_example_Icon.ico
rename to lib/x502api-1.1.34/examples/Delphi/x502_general/x502_example_Icon.ico
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_multiharm_signal_points.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_multiharm_signal_points.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/generate_multiharm_signal_points.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_multiharm_signal_points.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_sin_point.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_sin_point.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/generate_sin_point.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/generate_sin_point.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/lcm.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/lcm.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/lcm.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/lcm.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_close.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_close.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_close.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_close.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_gen_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_gen_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_gen_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_gen_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_open.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_open.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_open.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_open.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out_cfg.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out_cfg.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out_cfg.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_out_cfg.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_set_cycle_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_set_cycle_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_set_cycle_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_set_cycle_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_stop.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_stop.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/10.0/x502_stop.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/10.0/x502_stop.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_multiharm_signal_points.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_multiharm_signal_points.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/generate_multiharm_signal_points.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_multiharm_signal_points.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_sin_point.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_sin_point.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/generate_sin_point.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/generate_sin_point.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/lcm.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/lcm.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/lcm.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/lcm.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_close.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_close.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_close.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_close.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_gen_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_gen_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_gen_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_gen_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_open.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_open.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_open.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_open.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out_cfg.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out_cfg.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out_cfg.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_out_cfg.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_set_cycle_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_set_cycle_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_set_cycle_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_set_cycle_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_stop.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_stop.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/8.0/x502_stop.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/8.0/x502_stop.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/generate_multiharm_signal_points.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/generate_multiharm_signal_points.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/generate_multiharm_signal_points.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/generate_multiharm_signal_points.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/generate_sin_point.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/generate_sin_point.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/generate_sin_point.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/generate_sin_point.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/lcm.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/lcm.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/lcm.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/lcm.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/readme.txt b/lib/x502api-1.1.34/examples/LabView/x502_out/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/readme.txt
rename to lib/x502api-1.1.34/examples/LabView/x502_out/readme.txt
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_close.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_close.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_close.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_close.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_gen_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_gen_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_gen_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_gen_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_open.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_open.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_open.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_open.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_out.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_out.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_out.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_out.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_out_cfg.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_out_cfg.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_out_cfg.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_out_cfg.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_set_cycle_signal.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_set_cycle_signal.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_set_cycle_signal.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_set_cycle_signal.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_out/x502_stop.vi b/lib/x502api-1.1.34/examples/LabView/x502_out/x502_stop.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_out/x502_stop.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_out/x502_stop.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_recv.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_recv.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_recv.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/10.0/x502_recv.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_recv.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_recv.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_recv.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/8.0/x502_recv.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/readme.txt b/lib/x502api-1.1.34/examples/LabView/x502_recv/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/readme.txt
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/readme.txt
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv/x502_recv.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv/x502_recv.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv/x502_recv.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv/x502_recv.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/10.0/x502_recv_out_cycle.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/8.0/x502_recv_out_cycle.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/readme.txt b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/readme.txt
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/readme.txt
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_recv_out_cycle.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_recv_out_cycle.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_recv_out_cycle.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle/x502_recv_out_cycle.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_recv_out_cycle_eng.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_recv_out_cycle_eng.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_recv_out_cycle_eng.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/10.0/x502_recv_out_cycle_eng.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_recv_out_cycle_eng.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_recv_out_cycle_eng.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_recv_out_cycle_eng.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/8.0/x502_recv_out_cycle_eng.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/readme.txt b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/readme.txt
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/readme.txt
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_err_sub.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_err_sub.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_err_sub.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_err_sub.vi
diff --git a/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_recv_out_cycle_eng.vi b/lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_recv_out_cycle_eng.vi
similarity index 100%
rename from x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_recv_out_cycle_eng.vi
rename to lib/x502api-1.1.34/examples/LabView/x502_recv_out_cycle_eng/x502_recv_out_cycle_eng.vi
diff --git a/x502api-1.1.34/examples/c/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/common/dev_funcs.c b/lib/x502api-1.1.34/examples/c/common/dev_funcs.c
similarity index 100%
rename from x502api-1.1.34/examples/c/common/dev_funcs.c
rename to lib/x502api-1.1.34/examples/c/common/dev_funcs.c
diff --git a/x502api-1.1.34/examples/c/common/dev_funcs.h b/lib/x502api-1.1.34/examples/c/common/dev_funcs.h
similarity index 100%
rename from x502api-1.1.34/examples/c/common/dev_funcs.h
rename to lib/x502api-1.1.34/examples/c/common/dev_funcs.h
diff --git a/x502api-1.1.34/examples/c/common/timespec_funcs.c b/lib/x502api-1.1.34/examples/c/common/timespec_funcs.c
similarity index 100%
rename from x502api-1.1.34/examples/c/common/timespec_funcs.c
rename to lib/x502api-1.1.34/examples/c/common/timespec_funcs.c
diff --git a/x502api-1.1.34/examples/c/common/timespec_funcs.h b/lib/x502api-1.1.34/examples/c/common/timespec_funcs.h
similarity index 100%
rename from x502api-1.1.34/examples/c/common/timespec_funcs.h
rename to lib/x502api-1.1.34/examples/c/common/timespec_funcs.h
diff --git a/x502api-1.1.34/examples/c/e16_dac_cntr_test/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_cntr_test/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/e16_dac_cntr_test/dev_funcs.c b/lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/dev_funcs.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_cntr_test/dev_funcs.c
rename to lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/dev_funcs.c
diff --git a/x502api-1.1.34/examples/c/e16_dac_cntr_test/main.c b/lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_cntr_test/main.c
rename to lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/main.c
diff --git a/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.c b/lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.c
rename to lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.c
diff --git a/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.h b/lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.h
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.h
rename to lib/x502api-1.1.34/examples/c/e16_dac_cntr_test/timespec_funcs.h
diff --git a/x502api-1.1.34/examples/c/e16_dac_shift_test/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/e16_dac_shift_test/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_shift_test/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/e16_dac_shift_test/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/e16_dac_shift_test/main.c b/lib/x502api-1.1.34/examples/c/e16_dac_shift_test/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_shift_test/main.c
rename to lib/x502api-1.1.34/examples/c/e16_dac_shift_test/main.c
diff --git a/x502api-1.1.34/examples/c/e16_dac_shift_test/makefile b/lib/x502api-1.1.34/examples/c/e16_dac_shift_test/makefile
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_dac_shift_test/makefile
rename to lib/x502api-1.1.34/examples/c/e16_dac_shift_test/makefile
diff --git a/x502api-1.1.34/examples/c/e16_overflow_test/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/e16_overflow_test/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_overflow_test/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/e16_overflow_test/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/e16_overflow_test/main.c b/lib/x502api-1.1.34/examples/c/e16_overflow_test/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e16_overflow_test/main.c
rename to lib/x502api-1.1.34/examples/c/e16_overflow_test/main.c
diff --git a/x502api-1.1.34/examples/c/e502_eth_svc_browse/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_eth_svc_browse/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln b/lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
rename to lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.sln
diff --git a/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj b/lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
rename to lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/e502_eth_svc_browse.vcproj
diff --git a/x502api-1.1.34/examples/c/e502_eth_svc_browse/main.c b/lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_eth_svc_browse/main.c
rename to lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/main.c
diff --git a/x502api-1.1.34/examples/c/e502_eth_svc_browse/makefile b/lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/makefile
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_eth_svc_browse/makefile
rename to lib/x502api-1.1.34/examples/c/e502_eth_svc_browse/makefile
diff --git a/x502api-1.1.34/examples/c/e502_timestamp_stream/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/e502_timestamp_stream/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_timestamp_stream/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/e502_timestamp_stream/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/e502_timestamp_stream/main.c b/lib/x502api-1.1.34/examples/c/e502_timestamp_stream/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/e502_timestamp_stream/main.c
rename to lib/x502api-1.1.34/examples/c/e502_timestamp_stream/main.c
diff --git a/x502api-1.1.34/examples/c/fw_update/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/fw_update/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/fw_update/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/fw_update/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/fw_update/main.c b/lib/x502api-1.1.34/examples/c/fw_update/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/fw_update/main.c
rename to lib/x502api-1.1.34/examples/c/fw_update/main.c
diff --git a/x502api-1.1.34/examples/c/x502_cycle_out/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/x502_cycle_out/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_cycle_out/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/x502_cycle_out/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/x502_cycle_out/main.c b/lib/x502api-1.1.34/examples/c/x502_cycle_out/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_cycle_out/main.c
rename to lib/x502api-1.1.34/examples/c/x502_cycle_out/main.c
diff --git a/x502api-1.1.34/examples/c/x502_cycle_out/makefile b/lib/x502api-1.1.34/examples/c/x502_cycle_out/makefile
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_cycle_out/makefile
rename to lib/x502api-1.1.34/examples/c/x502_cycle_out/makefile
diff --git a/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.sln b/lib/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.sln
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.sln
rename to lib/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.sln
diff --git a/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.vcproj b/lib/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.vcproj
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.vcproj
rename to lib/x502api-1.1.34/examples/c/x502_cycle_out/x502_cycle_out.vcproj
diff --git a/x502api-1.1.34/examples/c/x502_dac_cntr_test/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/x502_dac_cntr_test/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_dac_cntr_test/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/x502_dac_cntr_test/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/x502_dac_cntr_test/main.c b/lib/x502api-1.1.34/examples/c/x502_dac_cntr_test/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_dac_cntr_test/main.c
rename to lib/x502api-1.1.34/examples/c/x502_dac_cntr_test/main.c
diff --git a/x502api-1.1.34/examples/c/x502_ring_mode0_test/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/x502_ring_mode0_test/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_ring_mode0_test/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/x502_ring_mode0_test/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/x502_ring_mode0_test/main.c b/lib/x502api-1.1.34/examples/c/x502_ring_mode0_test/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_ring_mode0_test/main.c
rename to lib/x502api-1.1.34/examples/c/x502_ring_mode0_test/main.c
diff --git a/x502api-1.1.34/examples/c/x502_stream_read/CMakeLists.txt b/lib/x502api-1.1.34/examples/c/x502_stream_read/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_stream_read/CMakeLists.txt
rename to lib/x502api-1.1.34/examples/c/x502_stream_read/CMakeLists.txt
diff --git a/x502api-1.1.34/examples/c/x502_stream_read/main.c b/lib/x502api-1.1.34/examples/c/x502_stream_read/main.c
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_stream_read/main.c
rename to lib/x502api-1.1.34/examples/c/x502_stream_read/main.c
diff --git a/x502api-1.1.34/examples/c/x502_stream_read/makefile b/lib/x502api-1.1.34/examples/c/x502_stream_read/makefile
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_stream_read/makefile
rename to lib/x502api-1.1.34/examples/c/x502_stream_read/makefile
diff --git a/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.sln b/lib/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.sln
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.sln
rename to lib/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.sln
diff --git a/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.vcproj b/lib/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.vcproj
similarity index 100%
rename from x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.vcproj
rename to lib/x502api-1.1.34/examples/c/x502_stream_read/x502_stream_read.vcproj
diff --git a/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Program.cs b/lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Program.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/e502_eth_svc_browse/Program.cs
rename to lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Program.cs
diff --git a/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs b/lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
rename to lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/Properties/AssemblyInfo.cs
diff --git a/x502api-1.1.34/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj b/lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
similarity index 100%
rename from x502api-1.1.34/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
rename to lib/x502api-1.1.34/examples/cs/e502_eth_svc_browse/e502_eth_svc_browse.csproj
diff --git a/x502api-1.1.34/examples/cs/x502_general/MainForm.Designer.cs b/lib/x502api-1.1.34/examples/cs/x502_general/MainForm.Designer.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/MainForm.Designer.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/MainForm.Designer.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/MainForm.cs b/lib/x502api-1.1.34/examples/cs/x502_general/MainForm.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/MainForm.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/MainForm.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/MainForm.resx b/lib/x502api-1.1.34/examples/cs/x502_general/MainForm.resx
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/MainForm.resx
rename to lib/x502api-1.1.34/examples/cs/x502_general/MainForm.resx
diff --git a/x502api-1.1.34/examples/cs/x502_general/Program.cs b/lib/x502api-1.1.34/examples/cs/x502_general/Program.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/Program.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/Program.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/Properties/AssemblyInfo.cs b/lib/x502api-1.1.34/examples/cs/x502_general/Properties/AssemblyInfo.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/Properties/AssemblyInfo.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/Properties/AssemblyInfo.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.Designer.cs b/lib/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.Designer.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/Properties/Resources.Designer.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.Designer.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.resx b/lib/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.resx
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/Properties/Resources.resx
rename to lib/x502api-1.1.34/examples/cs/x502_general/Properties/Resources.resx
diff --git a/x502api-1.1.34/examples/cs/x502_general/Properties/Settings.Designer.cs b/lib/x502api-1.1.34/examples/cs/x502_general/Properties/Settings.Designer.cs
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/Properties/Settings.Designer.cs
rename to lib/x502api-1.1.34/examples/cs/x502_general/Properties/Settings.Designer.cs
diff --git a/x502api-1.1.34/examples/cs/x502_general/x502_general.csproj b/lib/x502api-1.1.34/examples/cs/x502_general/x502_general.csproj
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/x502_general.csproj
rename to lib/x502api-1.1.34/examples/cs/x502_general/x502_general.csproj
diff --git a/x502api-1.1.34/examples/cs/x502_general/x502_general.sln b/lib/x502api-1.1.34/examples/cs/x502_general/x502_general.sln
similarity index 100%
rename from x502api-1.1.34/examples/cs/x502_general/x502_general.sln
rename to lib/x502api-1.1.34/examples/cs/x502_general/x502_general.sln
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/MSSCCPRJ.SCC b/lib/x502api-1.1.34/examples/vb6/l502_recv/MSSCCPRJ.SCC
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/MSSCCPRJ.SCC
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/MSSCCPRJ.SCC
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frm b/lib/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frm
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/MainForm.frm
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frm
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frx b/lib/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frx
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/MainForm.frx
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/MainForm.frx
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbp b/lib/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbp
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbp
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbp
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbw b/lib/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbw
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbw
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/l502_recv.vbw
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/l502api.bas b/lib/x502api-1.1.34/examples/vb6/l502_recv/l502api.bas
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/l502api.bas
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/l502api.bas
diff --git a/x502api-1.1.34/examples/vb6/l502_recv/readme.txt b/lib/x502api-1.1.34/examples/vb6/l502_recv/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/vb6/l502_recv/readme.txt
rename to lib/x502api-1.1.34/examples/vb6/l502_recv/readme.txt
diff --git a/x502api-1.1.34/examples/vb6/x502_general/e502api.bas b/lib/x502api-1.1.34/examples/vb6/x502_general/e502api.bas
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/e502api.bas
rename to lib/x502api-1.1.34/examples/vb6/x502_general/e502api.bas
diff --git a/x502api-1.1.34/examples/vb6/x502_general/l502api.bas b/lib/x502api-1.1.34/examples/vb6/x502_general/l502api.bas
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/l502api.bas
rename to lib/x502api-1.1.34/examples/vb6/x502_general/l502api.bas
diff --git a/x502api-1.1.34/examples/vb6/x502_general/readme.txt b/lib/x502api-1.1.34/examples/vb6/x502_general/readme.txt
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/readme.txt
rename to lib/x502api-1.1.34/examples/vb6/x502_general/readme.txt
diff --git a/x502api-1.1.34/examples/vb6/x502_general/x502_example.frm b/lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.frm
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/x502_example.frm
rename to lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.frm
diff --git a/x502api-1.1.34/examples/vb6/x502_general/x502_example.frx b/lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.frx
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/x502_example.frx
rename to lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.frx
diff --git a/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbp b/lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbp
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/x502_example.vbp
rename to lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbp
diff --git a/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbw b/lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbw
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/x502_example.vbw
rename to lib/x502api-1.1.34/examples/vb6/x502_general/x502_example.vbw
diff --git a/x502api-1.1.34/examples/vb6/x502_general/x502api.bas b/lib/x502api-1.1.34/examples/vb6/x502_general/x502api.bas
similarity index 100%
rename from x502api-1.1.34/examples/vb6/x502_general/x502api.bas
rename to lib/x502api-1.1.34/examples/vb6/x502_general/x502api.bas
diff --git a/x502api-1.1.34/lib/crc/_crclib_cfg.h b/lib/x502api-1.1.34/lib/crc/_crclib_cfg.h
similarity index 100%
rename from x502api-1.1.34/lib/crc/_crclib_cfg.h
rename to lib/x502api-1.1.34/lib/crc/_crclib_cfg.h
diff --git a/x502api-1.1.34/lib/crc/_fast_crc_cfg.h b/lib/x502api-1.1.34/lib/crc/_fast_crc_cfg.h
similarity index 100%
rename from x502api-1.1.34/lib/crc/_fast_crc_cfg.h
rename to lib/x502api-1.1.34/lib/crc/_fast_crc_cfg.h
diff --git a/x502api-1.1.34/lib/crc/crc.c b/lib/x502api-1.1.34/lib/crc/crc.c
similarity index 100%
rename from x502api-1.1.34/lib/crc/crc.c
rename to lib/x502api-1.1.34/lib/crc/crc.c
diff --git a/x502api-1.1.34/lib/crc/crc.h b/lib/x502api-1.1.34/lib/crc/crc.h
similarity index 100%
rename from x502api-1.1.34/lib/crc/crc.h
rename to lib/x502api-1.1.34/lib/crc/crc.h
diff --git a/x502api-1.1.34/lib/crc/fast_crc.c b/lib/x502api-1.1.34/lib/crc/fast_crc.c
similarity index 100%
rename from x502api-1.1.34/lib/crc/fast_crc.c
rename to lib/x502api-1.1.34/lib/crc/fast_crc.c
diff --git a/x502api-1.1.34/lib/crc/fast_crc.h b/lib/x502api-1.1.34/lib/crc/fast_crc.h
similarity index 100%
rename from x502api-1.1.34/lib/crc/fast_crc.h
rename to lib/x502api-1.1.34/lib/crc/fast_crc.h
diff --git a/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_restore.h b/lib/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_restore.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_restore.h
rename to lib/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_restore.h
diff --git a/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_start.h b/lib/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_start.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_start.h
rename to lib/x502api-1.1.34/lib/lcspec/cvi/lcspec_pack_start.h
diff --git a/x502api-1.1.34/lib/lcspec/gcc/lcspec_align.h b/lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_align.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/gcc/lcspec_align.h
rename to lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_align.h
diff --git a/x502api-1.1.34/lib/lcspec/gcc/lcspec_interrupt.h b/lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_interrupt.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/gcc/lcspec_interrupt.h
rename to lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_interrupt.h
diff --git a/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_restore.h b/lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_restore.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_restore.h
rename to lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_restore.h
diff --git a/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_start.h b/lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_start.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_start.h
rename to lib/x502api-1.1.34/lib/lcspec/gcc/lcspec_pack_start.h
diff --git a/x502api-1.1.34/lib/lcspec/iar/lcspec_align.h b/lib/x502api-1.1.34/lib/lcspec/iar/lcspec_align.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/iar/lcspec_align.h
rename to lib/x502api-1.1.34/lib/lcspec/iar/lcspec_align.h
diff --git a/x502api-1.1.34/lib/lcspec/iar/lcspec_interrupt.h b/lib/x502api-1.1.34/lib/lcspec/iar/lcspec_interrupt.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/iar/lcspec_interrupt.h
rename to lib/x502api-1.1.34/lib/lcspec/iar/lcspec_interrupt.h
diff --git a/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_restore.h b/lib/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_restore.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/iar/lcspec_pack_restore.h
rename to lib/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_restore.h
diff --git a/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_start.h b/lib/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_start.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/iar/lcspec_pack_start.h
rename to lib/x502api-1.1.34/lib/lcspec/iar/lcspec_pack_start.h
diff --git a/x502api-1.1.34/lib/lcspec/lcspec.cmake b/lib/x502api-1.1.34/lib/lcspec/lcspec.cmake
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/lcspec.cmake
rename to lib/x502api-1.1.34/lib/lcspec/lcspec.cmake
diff --git a/x502api-1.1.34/lib/lcspec/lcspec.h b/lib/x502api-1.1.34/lib/lcspec/lcspec.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/lcspec.h
rename to lib/x502api-1.1.34/lib/lcspec/lcspec.h
diff --git a/x502api-1.1.34/lib/lcspec/msvc/lcspec_align.h b/lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_align.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/msvc/lcspec_align.h
rename to lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_align.h
diff --git a/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_restore.h b/lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_restore.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_restore.h
rename to lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_restore.h
diff --git a/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_start.h b/lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_start.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_start.h
rename to lib/x502api-1.1.34/lib/lcspec/msvc/lcspec_pack_start.h
diff --git a/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_restore.h b/lib/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_restore.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_restore.h
rename to lib/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_restore.h
diff --git a/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_start.h b/lib/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_start.h
similarity index 100%
rename from x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_start.h
rename to lib/x502api-1.1.34/lib/lcspec/watcom/lcspec_pack_start.h
diff --git a/x502api-1.1.34/lib/ltimer/lclock.h b/lib/x502api-1.1.34/lib/ltimer/lclock.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/lclock.h
rename to lib/x502api-1.1.34/lib/ltimer/lclock.h
diff --git a/x502api-1.1.34/lib/ltimer/ltimer.cmake b/lib/x502api-1.1.34/lib/ltimer/ltimer.cmake
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ltimer.cmake
rename to lib/x502api-1.1.34/lib/ltimer/ltimer.cmake
diff --git a/x502api-1.1.34/lib/ltimer/ltimer.h b/lib/x502api-1.1.34/lib/ltimer/ltimer.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ltimer.h
rename to lib/x502api-1.1.34/lib/ltimer/ltimer.h
diff --git a/x502api-1.1.34/lib/ltimer/ltimer.mk b/lib/x502api-1.1.34/lib/ltimer/ltimer.mk
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ltimer.mk
rename to lib/x502api-1.1.34/lib/ltimer/ltimer.mk
diff --git a/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/aarch64_gtim/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/atmega/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/atmega/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/atmega/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/atmega/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/atmega/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/atmega/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/atmega/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/atmega/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/bf_core_tmr/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/cm_systick/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/imx6_epit/_lclock_conf.h b/lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/_lclock_conf.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/imx6_epit/_lclock_conf.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/_lclock_conf.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/imx6_epit/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/imx_sysctr/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/linux/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/linux/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/linux/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/linux/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/linux/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/lpc17xx_rit/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/riscv_mchtmr/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/wch_systick/lclock_arch.h
diff --git a/x502api-1.1.34/lib/ltimer/ports/win/lclock.c b/lib/x502api-1.1.34/lib/ltimer/ports/win/lclock.c
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/win/lclock.c
rename to lib/x502api-1.1.34/lib/ltimer/ports/win/lclock.c
diff --git a/x502api-1.1.34/lib/ltimer/ports/win/lclock_arch.h b/lib/x502api-1.1.34/lib/ltimer/ports/win/lclock_arch.h
similarity index 100%
rename from x502api-1.1.34/lib/ltimer/ports/win/lclock_arch.h
rename to lib/x502api-1.1.34/lib/ltimer/ports/win/lclock_arch.h
diff --git a/x502api-1.1.34/lib/osspec/_osspec_cfg.h b/lib/x502api-1.1.34/lib/osspec/_osspec_cfg.h
similarity index 100%
rename from x502api-1.1.34/lib/osspec/_osspec_cfg.h
rename to lib/x502api-1.1.34/lib/osspec/_osspec_cfg.h
diff --git a/x502api-1.1.34/lib/osspec/osspec.c b/lib/x502api-1.1.34/lib/osspec/osspec.c
similarity index 100%
rename from x502api-1.1.34/lib/osspec/osspec.c
rename to lib/x502api-1.1.34/lib/osspec/osspec.c
diff --git a/x502api-1.1.34/lib/osspec/osspec.cmake b/lib/x502api-1.1.34/lib/osspec/osspec.cmake
similarity index 100%
rename from x502api-1.1.34/lib/osspec/osspec.cmake
rename to lib/x502api-1.1.34/lib/osspec/osspec.cmake
diff --git a/x502api-1.1.34/lib/osspec/osspec.h b/lib/x502api-1.1.34/lib/osspec/osspec.h
similarity index 100%
rename from x502api-1.1.34/lib/osspec/osspec.h
rename to lib/x502api-1.1.34/lib/osspec/osspec.h
diff --git a/x502api-1.1.34/pas/x502api.pas b/lib/x502api-1.1.34/pas/x502api.pas
similarity index 100%
rename from x502api-1.1.34/pas/x502api.pas
rename to lib/x502api-1.1.34/pas/x502api.pas
diff --git a/x502api-1.1.34/rpm/x502api.spec.in b/lib/x502api-1.1.34/rpm/x502api.spec.in
similarity index 100%
rename from x502api-1.1.34/rpm/x502api.spec.in
rename to lib/x502api-1.1.34/rpm/x502api.spec.in
diff --git a/x502api-1.1.34/src/fast_crc_cfg.h b/lib/x502api-1.1.34/src/fast_crc_cfg.h
similarity index 100%
rename from x502api-1.1.34/src/fast_crc_cfg.h
rename to lib/x502api-1.1.34/src/fast_crc_cfg.h
diff --git a/x502api-1.1.34/src/l502_bf_cmd_defs.h b/lib/x502api-1.1.34/src/l502_bf_cmd_defs.h
similarity index 100%
rename from x502api-1.1.34/src/l502_bf_cmd_defs.h
rename to lib/x502api-1.1.34/src/l502_bf_cmd_defs.h
diff --git a/x502api-1.1.34/src/lboot_req.h b/lib/x502api-1.1.34/src/lboot_req.h
similarity index 100%
rename from x502api-1.1.34/src/lboot_req.h
rename to lib/x502api-1.1.34/src/lboot_req.h
diff --git a/x502api-1.1.34/src/lcard_pstdint.h b/lib/x502api-1.1.34/src/lcard_pstdint.h
similarity index 100%
rename from x502api-1.1.34/src/lcard_pstdint.h
rename to lib/x502api-1.1.34/src/lcard_pstdint.h
diff --git a/x502api-1.1.34/src/osspec_cfg.h b/lib/x502api-1.1.34/src/osspec_cfg.h
similarity index 100%
rename from x502api-1.1.34/src/osspec_cfg.h
rename to lib/x502api-1.1.34/src/osspec_cfg.h
diff --git a/x502api-1.1.34/src/x502_eeprom.h b/lib/x502api-1.1.34/src/x502_eeprom.h
similarity index 100%
rename from x502api-1.1.34/src/x502_eeprom.h
rename to lib/x502api-1.1.34/src/x502_eeprom.h
diff --git a/x502api-1.1.34/src/x502_fpga_regs.h b/lib/x502api-1.1.34/src/x502_fpga_regs.h
similarity index 100%
rename from x502api-1.1.34/src/x502_fpga_regs.h
rename to lib/x502api-1.1.34/src/x502_fpga_regs.h
diff --git a/x502api-1.1.34/src/x502api.c b/lib/x502api-1.1.34/src/x502api.c
similarity index 100%
rename from x502api-1.1.34/src/x502api.c
rename to lib/x502api-1.1.34/src/x502api.c
diff --git a/x502api-1.1.34/src/x502api.h b/lib/x502api-1.1.34/src/x502api.h
similarity index 100%
rename from x502api-1.1.34/src/x502api.h
rename to lib/x502api-1.1.34/src/x502api.h
diff --git a/x502api-1.1.34/src/x502api_async.c b/lib/x502api-1.1.34/src/x502api_async.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_async.c
rename to lib/x502api-1.1.34/src/x502api_async.c
diff --git a/x502api-1.1.34/src/x502api_bf.c b/lib/x502api-1.1.34/src/x502api_bf.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_bf.c
rename to lib/x502api-1.1.34/src/x502api_bf.c
diff --git a/x502api-1.1.34/src/x502api_config.c b/lib/x502api-1.1.34/src/x502api_config.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_config.c
rename to lib/x502api-1.1.34/src/x502api_config.c
diff --git a/x502api-1.1.34/src/x502api_eeprom.c b/lib/x502api-1.1.34/src/x502api_eeprom.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_eeprom.c
rename to lib/x502api-1.1.34/src/x502api_eeprom.c
diff --git a/x502api-1.1.34/src/x502api_errs.c b/lib/x502api-1.1.34/src/x502api_errs.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_errs.c
rename to lib/x502api-1.1.34/src/x502api_errs.c
diff --git a/x502api-1.1.34/src/x502api_private.h b/lib/x502api-1.1.34/src/x502api_private.h
similarity index 100%
rename from x502api-1.1.34/src/x502api_private.h
rename to lib/x502api-1.1.34/src/x502api_private.h
diff --git a/x502api-1.1.34/src/x502api_streams.c b/lib/x502api-1.1.34/src/x502api_streams.c
similarity index 100%
rename from x502api-1.1.34/src/x502api_streams.c
rename to lib/x502api-1.1.34/src/x502api_streams.c
diff --git a/x502api-1.1.34/src/x502tstp.c b/lib/x502api-1.1.34/src/x502tstp.c
similarity index 100%
rename from x502api-1.1.34/src/x502tstp.c
rename to lib/x502api-1.1.34/src/x502tstp.c
diff --git a/x502api-1.1.34/src/x502tstp.h b/lib/x502api-1.1.34/src/x502tstp.h
similarity index 100%
rename from x502api-1.1.34/src/x502tstp.h
rename to lib/x502api-1.1.34/src/x502tstp.h
diff --git a/x502api-1.1.34/tests/CMakeLists.txt b/lib/x502api-1.1.34/tests/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/tests/CMakeLists.txt
rename to lib/x502api-1.1.34/tests/CMakeLists.txt
diff --git a/x502api-1.1.34/tests/x502_async_inout/CMakeLists.txt b/lib/x502api-1.1.34/tests/x502_async_inout/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/tests/x502_async_inout/CMakeLists.txt
rename to lib/x502api-1.1.34/tests/x502_async_inout/CMakeLists.txt
diff --git a/x502api-1.1.34/tests/x502_async_inout/main.c b/lib/x502api-1.1.34/tests/x502_async_inout/main.c
similarity index 100%
rename from x502api-1.1.34/tests/x502_async_inout/main.c
rename to lib/x502api-1.1.34/tests/x502_async_inout/main.c
diff --git a/x502api-1.1.34/tests/x502_rdy_cntr_tst/CMakeLists.txt b/lib/x502api-1.1.34/tests/x502_rdy_cntr_tst/CMakeLists.txt
similarity index 100%
rename from x502api-1.1.34/tests/x502_rdy_cntr_tst/CMakeLists.txt
rename to lib/x502api-1.1.34/tests/x502_rdy_cntr_tst/CMakeLists.txt
diff --git a/x502api-1.1.34/tests/x502_rdy_cntr_tst/main.c b/lib/x502api-1.1.34/tests/x502_rdy_cntr_tst/main.c
similarity index 100%
rename from x502api-1.1.34/tests/x502_rdy_cntr_tst/main.c
rename to lib/x502api-1.1.34/tests/x502_rdy_cntr_tst/main.c
diff --git a/x502api-1.1.34/win_install/conv_src_cp1251.bat.in b/lib/x502api-1.1.34/win_install/conv_src_cp1251.bat.in
similarity index 100%
rename from x502api-1.1.34/win_install/conv_src_cp1251.bat.in
rename to lib/x502api-1.1.34/win_install/conv_src_cp1251.bat.in
diff --git a/x502api-1.1.34/win_install/make32.bat.in b/lib/x502api-1.1.34/win_install/make32.bat.in
similarity index 100%
rename from x502api-1.1.34/win_install/make32.bat.in
rename to lib/x502api-1.1.34/win_install/make32.bat.in
diff --git a/x502api-1.1.34/win_install/make64.bat.in b/lib/x502api-1.1.34/win_install/make64.bat.in
similarity index 100%
rename from x502api-1.1.34/win_install/make64.bat.in
rename to lib/x502api-1.1.34/win_install/make64.bat.in
diff --git a/x502api-1.1.34/win_install/readme.txt b/lib/x502api-1.1.34/win_install/readme.txt
similarity index 100%
rename from x502api-1.1.34/win_install/readme.txt
rename to lib/x502api-1.1.34/win_install/readme.txt
diff --git a/x502api-1.1.34/x502api.def b/lib/x502api-1.1.34/x502api.def
similarity index 100%
rename from x502api-1.1.34/x502api.def
rename to lib/x502api-1.1.34/x502api.def
diff --git a/x502api-1.1.34/x502api.rc.in b/lib/x502api-1.1.34/x502api.rc.in
similarity index 100%
rename from x502api-1.1.34/x502api.rc.in
rename to lib/x502api-1.1.34/x502api.rc.in
diff --git a/x502api-1.1.34/x502libs.cmake b/lib/x502api-1.1.34/x502libs.cmake
similarity index 100%
rename from x502api-1.1.34/x502libs.cmake
rename to lib/x502api-1.1.34/x502libs.cmake
diff --git a/makefile b/makefile
index 706e0a4..1da5fdb 100644
--- a/makefile
+++ b/makefile
@@ -36,7 +36,7 @@ CC ?= gcc
 CFLAGS ?= -O2 -g
 BUILD_DIR ?= build
 
-X502API_ROOT := x502api-1.1.34
+X502API_ROOT := lib/x502api-1.1.34
 X502_SRC_DIR := $(X502API_ROOT)/src
 L502_SRC_DIR := $(X502API_ROOT)/devs/l502
 E502_SRC_DIR := $(X502API_ROOT)/devs/e502
@@ -56,7 +56,8 @@ INCLUDES := \
 	-I$(LTIMER_DIR)/ports/$(LTIMER_PORT) \
 	-I$(LCSPEC_DIR) \
 	-I$(LCSPEC_DIR)/$(LCSPEC_COMPILER) \
-	-I$(CRC_DIR)
+	-I$(CRC_DIR) \
+	-Ilib
 
 DEFINES := -DOSSPEC_USE_MUTEX -DOSSPEC_USE_EVENTS -DOSSPEC_USE_THREADS \
 	-DX502API_VER_MAJOR=1 -DX502API_VER_MINOR=1 -DX502API_VER_PATCH=34 \