diff --git a/libmbus/COPYING b/COPYING similarity index 100% rename from libmbus/COPYING rename to COPYING diff --git a/libmbus/INSTALL b/INSTALL similarity index 100% rename from libmbus/INSTALL rename to INSTALL diff --git a/libmbus/Makefile-static b/Makefile-static similarity index 100% rename from libmbus/Makefile-static rename to Makefile-static diff --git a/libmbus/Makefile.am b/Makefile.am similarity index 100% rename from libmbus/Makefile.am rename to Makefile.am diff --git a/libmbus/Makefile.in b/Makefile.in similarity index 100% rename from libmbus/Makefile.in rename to Makefile.in diff --git a/libmbus/README b/README similarity index 100% rename from libmbus/README rename to README diff --git a/libmbus/aclocal.m4 b/aclocal.m4 similarity index 100% rename from libmbus/aclocal.m4 rename to aclocal.m4 diff --git a/libmbus/autom4te.cache/output.0 b/autom4te.cache/output.0 similarity index 100% rename from libmbus/autom4te.cache/output.0 rename to autom4te.cache/output.0 diff --git a/libmbus/autom4te.cache/output.1 b/autom4te.cache/output.1 similarity index 100% rename from libmbus/autom4te.cache/output.1 rename to autom4te.cache/output.1 diff --git a/libmbus/autom4te.cache/output.2 b/autom4te.cache/output.2 similarity index 100% rename from libmbus/autom4te.cache/output.2 rename to autom4te.cache/output.2 diff --git a/libmbus/autom4te.cache/requests b/autom4te.cache/requests similarity index 100% rename from libmbus/autom4te.cache/requests rename to autom4te.cache/requests diff --git a/libmbus/autom4te.cache/traces.0 b/autom4te.cache/traces.0 similarity index 100% rename from libmbus/autom4te.cache/traces.0 rename to autom4te.cache/traces.0 diff --git a/libmbus/autom4te.cache/traces.1 b/autom4te.cache/traces.1 similarity index 100% rename from libmbus/autom4te.cache/traces.1 rename to autom4te.cache/traces.1 diff --git a/libmbus/autom4te.cache/traces.2 b/autom4te.cache/traces.2 similarity index 100% rename from libmbus/autom4te.cache/traces.2 rename to autom4te.cache/traces.2 diff --git a/libmbus/bin/Makefile-static b/bin/Makefile-static similarity index 100% rename from libmbus/bin/Makefile-static rename to bin/Makefile-static diff --git a/libmbus/bin/Makefile.am b/bin/Makefile.am similarity index 100% rename from libmbus/bin/Makefile.am rename to bin/Makefile.am diff --git a/libmbus/bin/Makefile.in b/bin/Makefile.in similarity index 100% rename from libmbus/bin/Makefile.in rename to bin/Makefile.in diff --git a/libmbus/bin/mbus-serial-request-data.c b/bin/mbus-serial-request-data.c similarity index 100% rename from libmbus/bin/mbus-serial-request-data.c rename to bin/mbus-serial-request-data.c diff --git a/libmbus/bin/mbus-serial-scan-secondary.c b/bin/mbus-serial-scan-secondary.c similarity index 100% rename from libmbus/bin/mbus-serial-scan-secondary.c rename to bin/mbus-serial-scan-secondary.c diff --git a/libmbus/bin/mbus-serial-scan.c b/bin/mbus-serial-scan.c similarity index 100% rename from libmbus/bin/mbus-serial-scan.c rename to bin/mbus-serial-scan.c diff --git a/libmbus/bin/mbus-serial-select-secondary.c b/bin/mbus-serial-select-secondary.c similarity index 100% rename from libmbus/bin/mbus-serial-select-secondary.c rename to bin/mbus-serial-select-secondary.c diff --git a/libmbus/bin/mbus-serial-switch-baudrate.c b/bin/mbus-serial-switch-baudrate.c similarity index 100% rename from libmbus/bin/mbus-serial-switch-baudrate.c rename to bin/mbus-serial-switch-baudrate.c diff --git a/libmbus/bin/mbus-tcp-request-data-multi-reply.c b/bin/mbus-tcp-request-data-multi-reply.c similarity index 100% rename from libmbus/bin/mbus-tcp-request-data-multi-reply.c rename to bin/mbus-tcp-request-data-multi-reply.c diff --git a/libmbus/bin/mbus-tcp-request-data.c b/bin/mbus-tcp-request-data.c similarity index 100% rename from libmbus/bin/mbus-tcp-request-data.c rename to bin/mbus-tcp-request-data.c diff --git a/libmbus/bin/mbus-tcp-scan-secondary.c b/bin/mbus-tcp-scan-secondary.c similarity index 100% rename from libmbus/bin/mbus-tcp-scan-secondary.c rename to bin/mbus-tcp-scan-secondary.c diff --git a/libmbus/bin/mbus-tcp-scan.c b/bin/mbus-tcp-scan.c similarity index 100% rename from libmbus/bin/mbus-tcp-scan.c rename to bin/mbus-tcp-scan.c diff --git a/libmbus/bin/mbus-tcp-select-secondary.c b/bin/mbus-tcp-select-secondary.c similarity index 100% rename from libmbus/bin/mbus-tcp-select-secondary.c rename to bin/mbus-tcp-select-secondary.c diff --git a/libmbus/build.sh b/build.sh similarity index 100% rename from libmbus/build.sh rename to build.sh diff --git a/libmbus/config.guess b/config.guess similarity index 100% rename from libmbus/config.guess rename to config.guess diff --git a/libmbus/config.h.in b/config.h.in similarity index 100% rename from libmbus/config.h.in rename to config.h.in diff --git a/libmbus/config.sub b/config.sub similarity index 100% rename from libmbus/config.sub rename to config.sub diff --git a/libmbus/configure b/configure similarity index 100% rename from libmbus/configure rename to configure diff --git a/libmbus/configure.ac b/configure.ac similarity index 100% rename from libmbus/configure.ac rename to configure.ac diff --git a/libmbus/depcomp b/depcomp similarity index 100% rename from libmbus/depcomp rename to depcomp diff --git a/libmbus/doxygen.cfg b/doxygen.cfg similarity index 100% rename from libmbus/doxygen.cfg rename to doxygen.cfg diff --git a/libmbus/hardware/MBus_USB.pdf b/hardware/MBus_USB.pdf similarity index 100% rename from libmbus/hardware/MBus_USB.pdf rename to hardware/MBus_USB.pdf diff --git a/libmbus/hardware/MBus_USB.txt b/hardware/MBus_USB.txt similarity index 100% rename from libmbus/hardware/MBus_USB.txt rename to hardware/MBus_USB.txt diff --git a/libmbus/install-sh b/install-sh similarity index 100% rename from libmbus/install-sh rename to install-sh diff --git a/libmbus/libmbus.pc.in b/libmbus.pc.in similarity index 100% rename from libmbus/libmbus.pc.in rename to libmbus.pc.in diff --git a/libmbus/ltmain.sh b/ltmain.sh similarity index 100% rename from libmbus/ltmain.sh rename to ltmain.sh diff --git a/libmbus/m4/libtool.m4 b/m4/libtool.m4 similarity index 100% rename from libmbus/m4/libtool.m4 rename to m4/libtool.m4 diff --git a/libmbus/m4/ltoptions.m4 b/m4/ltoptions.m4 similarity index 100% rename from libmbus/m4/ltoptions.m4 rename to m4/ltoptions.m4 diff --git a/libmbus/m4/ltsugar.m4 b/m4/ltsugar.m4 similarity index 100% rename from libmbus/m4/ltsugar.m4 rename to m4/ltsugar.m4 diff --git a/libmbus/m4/ltversion.m4 b/m4/ltversion.m4 similarity index 100% rename from libmbus/m4/ltversion.m4 rename to m4/ltversion.m4 diff --git a/libmbus/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 similarity index 100% rename from libmbus/m4/lt~obsolete.m4 rename to m4/lt~obsolete.m4 diff --git a/libmbus/mbus/Makefile.am b/mbus/Makefile.am similarity index 100% rename from libmbus/mbus/Makefile.am rename to mbus/Makefile.am diff --git a/libmbus/mbus/Makefile.in b/mbus/Makefile.in similarity index 100% rename from libmbus/mbus/Makefile.in rename to mbus/Makefile.in diff --git a/libmbus/mbus/mbus-protocol-aux.c b/mbus/mbus-protocol-aux.c similarity index 100% rename from libmbus/mbus/mbus-protocol-aux.c rename to mbus/mbus-protocol-aux.c diff --git a/libmbus/mbus/mbus-protocol-aux.h b/mbus/mbus-protocol-aux.h similarity index 100% rename from libmbus/mbus/mbus-protocol-aux.h rename to mbus/mbus-protocol-aux.h diff --git a/libmbus/mbus/mbus-protocol.c b/mbus/mbus-protocol.c similarity index 100% rename from libmbus/mbus/mbus-protocol.c rename to mbus/mbus-protocol.c diff --git a/libmbus/mbus/mbus-protocol.h b/mbus/mbus-protocol.h similarity index 100% rename from libmbus/mbus/mbus-protocol.h rename to mbus/mbus-protocol.h diff --git a/libmbus/mbus/mbus-serial.c b/mbus/mbus-serial.c similarity index 100% rename from libmbus/mbus/mbus-serial.c rename to mbus/mbus-serial.c diff --git a/libmbus/mbus/mbus-serial.h b/mbus/mbus-serial.h similarity index 100% rename from libmbus/mbus/mbus-serial.h rename to mbus/mbus-serial.h diff --git a/libmbus/mbus/mbus-tcp.c b/mbus/mbus-tcp.c similarity index 100% rename from libmbus/mbus/mbus-tcp.c rename to mbus/mbus-tcp.c diff --git a/libmbus/mbus/mbus-tcp.h b/mbus/mbus-tcp.h similarity index 100% rename from libmbus/mbus/mbus-tcp.h rename to mbus/mbus-tcp.h diff --git a/libmbus/mbus/mbus.c b/mbus/mbus.c similarity index 100% rename from libmbus/mbus/mbus.c rename to mbus/mbus.c diff --git a/libmbus/mbus/mbus.h b/mbus/mbus.h similarity index 100% rename from libmbus/mbus/mbus.h rename to mbus/mbus.h diff --git a/libmbus/missing b/missing similarity index 100% rename from libmbus/missing rename to missing diff --git a/libmbus/release_notes.txt b/release_notes.txt similarity index 100% rename from libmbus/release_notes.txt rename to release_notes.txt diff --git a/libmbus/test/Makefile.am b/test/Makefile.am similarity index 100% rename from libmbus/test/Makefile.am rename to test/Makefile.am diff --git a/libmbus/test/Makefile.in b/test/Makefile.in similarity index 100% rename from libmbus/test/Makefile.in rename to test/Makefile.in diff --git a/libmbus/test/mbus_parse.c b/test/mbus_parse.c similarity index 100% rename from libmbus/test/mbus_parse.c rename to test/mbus_parse.c diff --git a/libmbus/test/mbus_parse_hex.c b/test/mbus_parse_hex.c similarity index 100% rename from libmbus/test/mbus_parse_hex.c rename to test/mbus_parse_hex.c diff --git a/libmbus/test/mbus_unit_test1.c b/test/mbus_unit_test1.c similarity index 100% rename from libmbus/test/mbus_unit_test1.c rename to test/mbus_unit_test1.c diff --git a/libmbus/test/test-frames/electricity-meter-1.hex b/test/test-frames/electricity-meter-1.hex similarity index 100% rename from libmbus/test/test-frames/electricity-meter-1.hex rename to test/test-frames/electricity-meter-1.hex diff --git a/libmbus/test/test-frames/electricity-meter-1.xml b/test/test-frames/electricity-meter-1.xml similarity index 100% rename from libmbus/test/test-frames/electricity-meter-1.xml rename to test/test-frames/electricity-meter-1.xml diff --git a/libmbus/test/test-frames/electricity-meter-2.hex b/test/test-frames/electricity-meter-2.hex similarity index 100% rename from libmbus/test/test-frames/electricity-meter-2.hex rename to test/test-frames/electricity-meter-2.hex diff --git a/libmbus/test/test-frames/electricity-meter-2.xml b/test/test-frames/electricity-meter-2.xml similarity index 100% rename from libmbus/test/test-frames/electricity-meter-2.xml rename to test/test-frames/electricity-meter-2.xml diff --git a/libmbus/test/test-frames/frame1.hex b/test/test-frames/frame1.hex similarity index 100% rename from libmbus/test/test-frames/frame1.hex rename to test/test-frames/frame1.hex diff --git a/libmbus/test/test-frames/frame1.xml b/test/test-frames/frame1.xml similarity index 100% rename from libmbus/test/test-frames/frame1.xml rename to test/test-frames/frame1.xml diff --git a/libmbus/test/test-frames/frame2.hex b/test/test-frames/frame2.hex similarity index 100% rename from libmbus/test/test-frames/frame2.hex rename to test/test-frames/frame2.hex diff --git a/libmbus/test/test-frames/frame2.xml b/test/test-frames/frame2.xml similarity index 100% rename from libmbus/test/test-frames/frame2.xml rename to test/test-frames/frame2.xml diff --git a/libmbus/test/test-frames/kamstrup_multical_601.hex b/test/test-frames/kamstrup_multical_601.hex similarity index 100% rename from libmbus/test/test-frames/kamstrup_multical_601.hex rename to test/test-frames/kamstrup_multical_601.hex diff --git a/libmbus/test/test-frames/kamstrup_multical_601.xml b/test/test-frames/kamstrup_multical_601.xml similarity index 100% rename from libmbus/test/test-frames/kamstrup_multical_601.xml rename to test/test-frames/kamstrup_multical_601.xml diff --git a/libmbus/test/test-frames/manual_frame2.hex b/test/test-frames/manual_frame2.hex similarity index 100% rename from libmbus/test/test-frames/manual_frame2.hex rename to test/test-frames/manual_frame2.hex diff --git a/libmbus/test/test-frames/manual_frame2.xml b/test/test-frames/manual_frame2.xml similarity index 100% rename from libmbus/test/test-frames/manual_frame2.xml rename to test/test-frames/manual_frame2.xml diff --git a/libmbus/test/test-frames/manual_frame3.hex b/test/test-frames/manual_frame3.hex similarity index 100% rename from libmbus/test/test-frames/manual_frame3.hex rename to test/test-frames/manual_frame3.hex diff --git a/libmbus/test/test-frames/manual_frame3.xml b/test/test-frames/manual_frame3.xml similarity index 100% rename from libmbus/test/test-frames/manual_frame3.xml rename to test/test-frames/manual_frame3.xml diff --git a/libmbus/test/test-frames/manual_frame7.hex b/test/test-frames/manual_frame7.hex similarity index 100% rename from libmbus/test/test-frames/manual_frame7.hex rename to test/test-frames/manual_frame7.hex diff --git a/libmbus/test/test-frames/manual_frame7.xml b/test/test-frames/manual_frame7.xml similarity index 100% rename from libmbus/test/test-frames/manual_frame7.xml rename to test/test-frames/manual_frame7.xml diff --git a/libmbus/test/test-frames/svm_f22_telegram1.hex b/test/test-frames/svm_f22_telegram1.hex similarity index 100% rename from libmbus/test/test-frames/svm_f22_telegram1.hex rename to test/test-frames/svm_f22_telegram1.hex diff --git a/libmbus/test/test-frames/svm_f22_telegram1.xml b/test/test-frames/svm_f22_telegram1.xml similarity index 100% rename from libmbus/test/test-frames/svm_f22_telegram1.xml rename to test/test-frames/svm_f22_telegram1.xml diff --git a/libmbus/test/unsupported-frames/manual_frame1.hex b/test/unsupported-frames/manual_frame1.hex similarity index 100% rename from libmbus/test/unsupported-frames/manual_frame1.hex rename to test/unsupported-frames/manual_frame1.hex diff --git a/libmbus/test/unsupported-frames/manual_frame4.hex b/test/unsupported-frames/manual_frame4.hex similarity index 100% rename from libmbus/test/unsupported-frames/manual_frame4.hex rename to test/unsupported-frames/manual_frame4.hex diff --git a/libmbus/test/unsupported-frames/manual_frame5.hex b/test/unsupported-frames/manual_frame5.hex similarity index 100% rename from libmbus/test/unsupported-frames/manual_frame5.hex rename to test/unsupported-frames/manual_frame5.hex diff --git a/libmbus/test/unsupported-frames/manual_frame6.hex b/test/unsupported-frames/manual_frame6.hex similarity index 100% rename from libmbus/test/unsupported-frames/manual_frame6.hex rename to test/unsupported-frames/manual_frame6.hex diff --git a/libmbus/test/unsupported-frames/rvd235.hex b/test/unsupported-frames/rvd235.hex similarity index 100% rename from libmbus/test/unsupported-frames/rvd235.hex rename to test/unsupported-frames/rvd235.hex diff --git a/libmbus/test/unsupported-frames/siemens_rvd235.hex b/test/unsupported-frames/siemens_rvd235.hex similarity index 100% rename from libmbus/test/unsupported-frames/siemens_rvd235.hex rename to test/unsupported-frames/siemens_rvd235.hex diff --git a/libmbus/test/unsupported-frames/svm_f22_telegram2.hex b/test/unsupported-frames/svm_f22_telegram2.hex similarity index 100% rename from libmbus/test/unsupported-frames/svm_f22_telegram2.hex rename to test/unsupported-frames/svm_f22_telegram2.hex