From e14b904cbd6816cb0227d519d308ae71ddaf6e07 Mon Sep 17 00:00:00 2001
From: Aleksander Morgado <aleksandermj@chromium.org>
Date: Thu, 8 Dec 2022 13:37:55 +0000
Subject: [PATCH] build: move plugins directory to src/plugins

We are going to allow including the plugin sources built within the
ModemManager daemon binary; moving the sources within the daemon
sources directory makes it easier.
---
 data/tests/meson.build                                         | 2 +-
 meson.build                                                    | 3 +--
 src/meson.build                                                | 3 +++
 {plugins => src/plugins}/README.txt                            | 0
 .../plugins}/altair/mm-broadband-bearer-altair-lte.c           | 0
 .../plugins}/altair/mm-broadband-bearer-altair-lte.h           | 0
 .../plugins}/altair/mm-broadband-modem-altair-lte.c            | 0
 .../plugins}/altair/mm-broadband-modem-altair-lte.h            | 0
 {plugins => src/plugins}/altair/mm-modem-helpers-altair-lte.c  | 0
 {plugins => src/plugins}/altair/mm-modem-helpers-altair-lte.h  | 0
 {plugins => src/plugins}/altair/mm-plugin-altair-lte.c         | 0
 {plugins => src/plugins}/altair/mm-plugin-altair-lte.h         | 0
 .../plugins}/altair/tests/test-modem-helpers-altair-lte.c      | 0
 {plugins => src/plugins}/anydata/mm-broadband-modem-anydata.c  | 0
 {plugins => src/plugins}/anydata/mm-broadband-modem-anydata.h  | 0
 {plugins => src/plugins}/anydata/mm-plugin-anydata.c           | 0
 {plugins => src/plugins}/anydata/mm-plugin-anydata.h           | 0
 .../plugins}/broadmobi/77-mm-broadmobi-port-types.rules        | 0
 {plugins => src/plugins}/broadmobi/mm-plugin-broadmobi.c       | 0
 {plugins => src/plugins}/broadmobi/mm-plugin-broadmobi.h       | 0
 .../plugins}/cinterion/77-mm-cinterion-port-types.rules        | 0
 .../plugins}/cinterion/mm-broadband-bearer-cinterion.c         | 0
 .../plugins}/cinterion/mm-broadband-bearer-cinterion.h         | 0
 .../plugins}/cinterion/mm-broadband-modem-cinterion.c          | 0
 .../plugins}/cinterion/mm-broadband-modem-cinterion.h          | 0
 .../plugins}/cinterion/mm-broadband-modem-mbim-cinterion.c     | 0
 .../plugins}/cinterion/mm-broadband-modem-mbim-cinterion.h     | 0
 .../plugins}/cinterion/mm-broadband-modem-qmi-cinterion.c      | 0
 .../plugins}/cinterion/mm-broadband-modem-qmi-cinterion.h      | 0
 .../plugins}/cinterion/mm-modem-helpers-cinterion.c            | 0
 .../plugins}/cinterion/mm-modem-helpers-cinterion.h            | 0
 {plugins => src/plugins}/cinterion/mm-plugin-cinterion.c       | 0
 {plugins => src/plugins}/cinterion/mm-plugin-cinterion.h       | 0
 {plugins => src/plugins}/cinterion/mm-shared-cinterion.c       | 0
 {plugins => src/plugins}/cinterion/mm-shared-cinterion.h       | 0
 .../plugins}/cinterion/tests/test-modem-helpers-cinterion.c    | 0
 {plugins => src/plugins}/dell/77-mm-dell-port-types.rules      | 0
 {plugins => src/plugins}/dell/mm-plugin-dell.c                 | 0
 {plugins => src/plugins}/dell/mm-plugin-dell.h                 | 0
 {plugins => src/plugins}/dlink/77-mm-dlink-port-types.rules    | 0
 {plugins => src/plugins}/dlink/mm-plugin-dlink.c               | 0
 {plugins => src/plugins}/dlink/mm-plugin-dlink.h               | 0
 .../plugins}/fibocom/77-mm-fibocom-port-types.rules            | 0
 .../plugins}/fibocom/mm-broadband-bearer-fibocom-ecm.c         | 0
 .../plugins}/fibocom/mm-broadband-bearer-fibocom-ecm.h         | 0
 {plugins => src/plugins}/fibocom/mm-broadband-modem-fibocom.c  | 0
 {plugins => src/plugins}/fibocom/mm-broadband-modem-fibocom.h  | 0
 .../plugins}/fibocom/mm-broadband-modem-mbim-fibocom.c         | 0
 .../plugins}/fibocom/mm-broadband-modem-mbim-fibocom.h         | 0
 .../plugins}/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c     | 0
 .../plugins}/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h     | 0
 {plugins => src/plugins}/fibocom/mm-plugin-fibocom.c           | 0
 {plugins => src/plugins}/fibocom/mm-plugin-fibocom.h           | 0
 {plugins => src/plugins}/fibocom/mm-shared-fibocom.c           | 0
 {plugins => src/plugins}/fibocom/mm-shared-fibocom.h           | 0
 {plugins => src/plugins}/fibocom/mm-shared.c                   | 0
 .../plugins}/foxconn/77-mm-foxconn-port-types.rules            | 0
 .../plugins}/foxconn/mm-broadband-modem-mbim-foxconn.c         | 0
 .../plugins}/foxconn/mm-broadband-modem-mbim-foxconn.h         | 0
 .../plugins}/foxconn/mm-foxconn-t77w968-carrier-mapping.conf   | 0
 {plugins => src/plugins}/foxconn/mm-plugin-foxconn.c           | 0
 {plugins => src/plugins}/foxconn/mm-plugin-foxconn.h           | 0
 {plugins => src/plugins}/foxconn/mm-shared.c                   | 0
 {plugins => src/plugins}/generic/mm-plugin-generic.c           | 0
 {plugins => src/plugins}/generic/mm-plugin-generic.h           | 0
 {plugins => src/plugins}/generic/tests/test-service-generic.c  | 0
 .../plugins}/gosuncn/77-mm-gosuncn-port-types.rules            | 0
 {plugins => src/plugins}/gosuncn/mm-plugin-gosuncn.c           | 0
 {plugins => src/plugins}/gosuncn/mm-plugin-gosuncn.h           | 0
 {plugins => src/plugins}/haier/77-mm-haier-port-types.rules    | 0
 {plugins => src/plugins}/haier/mm-plugin-haier.c               | 0
 {plugins => src/plugins}/haier/mm-plugin-haier.h               | 0
 .../plugins}/huawei/77-mm-huawei-net-port-types.rules          | 0
 {plugins => src/plugins}/huawei/mm-broadband-bearer-huawei.c   | 0
 {plugins => src/plugins}/huawei/mm-broadband-bearer-huawei.h   | 0
 {plugins => src/plugins}/huawei/mm-broadband-modem-huawei.c    | 0
 {plugins => src/plugins}/huawei/mm-broadband-modem-huawei.h    | 0
 {plugins => src/plugins}/huawei/mm-modem-helpers-huawei.c      | 0
 {plugins => src/plugins}/huawei/mm-modem-helpers-huawei.h      | 0
 {plugins => src/plugins}/huawei/mm-plugin-huawei.c             | 0
 {plugins => src/plugins}/huawei/mm-plugin-huawei.h             | 0
 {plugins => src/plugins}/huawei/mm-sim-huawei.c                | 0
 {plugins => src/plugins}/huawei/mm-sim-huawei.h                | 0
 .../plugins}/huawei/tests/test-modem-helpers-huawei.c          | 0
 {plugins => src/plugins}/icera/mm-broadband-bearer-icera.c     | 0
 {plugins => src/plugins}/icera/mm-broadband-bearer-icera.h     | 0
 {plugins => src/plugins}/icera/mm-broadband-modem-icera.c      | 0
 {plugins => src/plugins}/icera/mm-broadband-modem-icera.h      | 0
 {plugins => src/plugins}/icera/mm-modem-helpers-icera.c        | 0
 {plugins => src/plugins}/icera/mm-modem-helpers-icera.h        | 0
 {plugins => src/plugins}/icera/mm-shared.c                     | 0
 .../plugins}/icera/tests/test-modem-helpers-icera.c            | 0
 {plugins => src/plugins}/intel/mm-broadband-modem-mbim-intel.c | 0
 {plugins => src/plugins}/intel/mm-broadband-modem-mbim-intel.h | 0
 {plugins => src/plugins}/intel/mm-plugin-intel.c               | 0
 {plugins => src/plugins}/intel/mm-plugin-intel.h               | 0
 {plugins => src/plugins}/iridium/mm-bearer-iridium.c           | 0
 {plugins => src/plugins}/iridium/mm-bearer-iridium.h           | 0
 {plugins => src/plugins}/iridium/mm-broadband-modem-iridium.c  | 0
 {plugins => src/plugins}/iridium/mm-broadband-modem-iridium.h  | 0
 {plugins => src/plugins}/iridium/mm-plugin-iridium.c           | 0
 {plugins => src/plugins}/iridium/mm-plugin-iridium.h           | 0
 {plugins => src/plugins}/iridium/mm-sim-iridium.c              | 0
 {plugins => src/plugins}/iridium/mm-sim-iridium.h              | 0
 .../plugins}/linktop/77-mm-linktop-port-types.rules            | 0
 {plugins => src/plugins}/linktop/mm-broadband-modem-linktop.c  | 0
 {plugins => src/plugins}/linktop/mm-broadband-modem-linktop.h  | 0
 {plugins => src/plugins}/linktop/mm-modem-helpers-linktop.c    | 0
 {plugins => src/plugins}/linktop/mm-modem-helpers-linktop.h    | 0
 {plugins => src/plugins}/linktop/mm-plugin-linktop.c           | 0
 {plugins => src/plugins}/linktop/mm-plugin-linktop.h           | 0
 .../plugins}/linktop/tests/test-modem-helpers-linktop.c        | 0
 .../plugins}/longcheer/77-mm-longcheer-port-types.rules        | 0
 .../plugins}/longcheer/mm-broadband-modem-longcheer.c          | 0
 .../plugins}/longcheer/mm-broadband-modem-longcheer.h          | 0
 {plugins => src/plugins}/longcheer/mm-plugin-longcheer.c       | 0
 {plugins => src/plugins}/longcheer/mm-plugin-longcheer.h       | 0
 {plugins => src/plugins}/mbm/77-mm-ericsson-mbm.rules          | 0
 {plugins => src/plugins}/mbm/mm-broadband-bearer-mbm.c         | 0
 {plugins => src/plugins}/mbm/mm-broadband-bearer-mbm.h         | 0
 {plugins => src/plugins}/mbm/mm-broadband-modem-mbm.c          | 0
 {plugins => src/plugins}/mbm/mm-broadband-modem-mbm.h          | 0
 {plugins => src/plugins}/mbm/mm-modem-helpers-mbm.c            | 0
 {plugins => src/plugins}/mbm/mm-modem-helpers-mbm.h            | 0
 {plugins => src/plugins}/mbm/mm-plugin-mbm.c                   | 0
 {plugins => src/plugins}/mbm/mm-plugin-mbm.h                   | 0
 {plugins => src/plugins}/mbm/mm-sim-mbm.c                      | 0
 {plugins => src/plugins}/mbm/mm-sim-mbm.h                      | 0
 {plugins => src/plugins}/mbm/tests/test-modem-helpers-mbm.c    | 0
 {plugins => src/plugins}/meson.build                           | 0
 .../plugins}/motorola/mm-broadband-modem-motorola.c            | 0
 .../plugins}/motorola/mm-broadband-modem-motorola.h            | 0
 {plugins => src/plugins}/motorola/mm-plugin-motorola.c         | 0
 {plugins => src/plugins}/motorola/mm-plugin-motorola.h         | 0
 {plugins => src/plugins}/mtk/77-mm-mtk-port-types.rules        | 0
 {plugins => src/plugins}/mtk/mm-broadband-modem-mtk.c          | 0
 {plugins => src/plugins}/mtk/mm-broadband-modem-mtk.h          | 0
 {plugins => src/plugins}/mtk/mm-plugin-mtk.c                   | 0
 {plugins => src/plugins}/mtk/mm-plugin-mtk.h                   | 0
 {plugins => src/plugins}/nokia/77-mm-nokia-port-types.rules    | 0
 {plugins => src/plugins}/nokia/mm-broadband-modem-nokia.c      | 0
 {plugins => src/plugins}/nokia/mm-broadband-modem-nokia.h      | 0
 {plugins => src/plugins}/nokia/mm-plugin-nokia-icera.c         | 0
 {plugins => src/plugins}/nokia/mm-plugin-nokia-icera.h         | 0
 {plugins => src/plugins}/nokia/mm-plugin-nokia.c               | 0
 {plugins => src/plugins}/nokia/mm-plugin-nokia.h               | 0
 {plugins => src/plugins}/nokia/mm-sim-nokia.c                  | 0
 {plugins => src/plugins}/nokia/mm-sim-nokia.h                  | 0
 .../plugins}/novatel/mm-broadband-bearer-novatel-lte.c         | 0
 .../plugins}/novatel/mm-broadband-bearer-novatel-lte.h         | 0
 .../plugins}/novatel/mm-broadband-modem-novatel-lte.c          | 0
 .../plugins}/novatel/mm-broadband-modem-novatel-lte.h          | 0
 {plugins => src/plugins}/novatel/mm-broadband-modem-novatel.c  | 0
 {plugins => src/plugins}/novatel/mm-broadband-modem-novatel.h  | 0
 {plugins => src/plugins}/novatel/mm-common-novatel.c           | 0
 {plugins => src/plugins}/novatel/mm-common-novatel.h           | 0
 {plugins => src/plugins}/novatel/mm-plugin-novatel-lte.c       | 0
 {plugins => src/plugins}/novatel/mm-plugin-novatel-lte.h       | 0
 {plugins => src/plugins}/novatel/mm-plugin-novatel.c           | 0
 {plugins => src/plugins}/novatel/mm-plugin-novatel.h           | 0
 {plugins => src/plugins}/novatel/mm-shared.c                   | 0
 {plugins => src/plugins}/novatel/mm-sim-novatel-lte.c          | 0
 {plugins => src/plugins}/novatel/mm-sim-novatel-lte.h          | 0
 {plugins => src/plugins}/option/mm-broadband-bearer-hso.c      | 0
 {plugins => src/plugins}/option/mm-broadband-bearer-hso.h      | 0
 {plugins => src/plugins}/option/mm-broadband-modem-hso.c       | 0
 {plugins => src/plugins}/option/mm-broadband-modem-hso.h       | 0
 {plugins => src/plugins}/option/mm-broadband-modem-option.c    | 0
 {plugins => src/plugins}/option/mm-broadband-modem-option.h    | 0
 {plugins => src/plugins}/option/mm-plugin-hso.c                | 0
 {plugins => src/plugins}/option/mm-plugin-hso.h                | 0
 {plugins => src/plugins}/option/mm-plugin-option.c             | 0
 {plugins => src/plugins}/option/mm-plugin-option.h             | 0
 {plugins => src/plugins}/option/mm-shared-option.c             | 0
 {plugins => src/plugins}/option/mm-shared-option.h             | 0
 {plugins => src/plugins}/option/mm-shared.c                    | 0
 {plugins => src/plugins}/option/mm-sim-option.c                | 0
 {plugins => src/plugins}/option/mm-sim-option.h                | 0
 {plugins => src/plugins}/pantech/mm-broadband-modem-pantech.c  | 0
 {plugins => src/plugins}/pantech/mm-broadband-modem-pantech.h  | 0
 {plugins => src/plugins}/pantech/mm-plugin-pantech.c           | 0
 {plugins => src/plugins}/pantech/mm-plugin-pantech.h           | 0
 {plugins => src/plugins}/pantech/mm-sim-pantech.c              | 0
 {plugins => src/plugins}/pantech/mm-sim-pantech.h              | 0
 {plugins => src/plugins}/qcom-soc/77-mm-qcom-soc.rules         | 0
 .../plugins}/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c        | 0
 .../plugins}/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h        | 0
 {plugins => src/plugins}/qcom-soc/mm-plugin-qcom-soc.c         | 0
 {plugins => src/plugins}/qcom-soc/mm-plugin-qcom-soc.h         | 0
 .../plugins}/quectel/77-mm-quectel-port-types.rules            | 0
 .../plugins}/quectel/mm-broadband-modem-mbim-quectel.c         | 0
 .../plugins}/quectel/mm-broadband-modem-mbim-quectel.h         | 0
 .../plugins}/quectel/mm-broadband-modem-qmi-quectel.c          | 0
 .../plugins}/quectel/mm-broadband-modem-qmi-quectel.h          | 0
 {plugins => src/plugins}/quectel/mm-broadband-modem-quectel.c  | 0
 {plugins => src/plugins}/quectel/mm-broadband-modem-quectel.h  | 0
 {plugins => src/plugins}/quectel/mm-modem-helpers-quectel.c    | 0
 {plugins => src/plugins}/quectel/mm-modem-helpers-quectel.h    | 0
 {plugins => src/plugins}/quectel/mm-plugin-quectel.c           | 0
 {plugins => src/plugins}/quectel/mm-plugin-quectel.h           | 0
 {plugins => src/plugins}/quectel/mm-shared-quectel.c           | 0
 {plugins => src/plugins}/quectel/mm-shared-quectel.h           | 0
 .../plugins}/quectel/tests/test-modem-helpers-quectel.c        | 0
 {plugins => src/plugins}/samsung/mm-broadband-modem-samsung.c  | 0
 {plugins => src/plugins}/samsung/mm-broadband-modem-samsung.h  | 0
 {plugins => src/plugins}/samsung/mm-plugin-samsung.c           | 0
 {plugins => src/plugins}/samsung/mm-plugin-samsung.h           | 0
 {plugins => src/plugins}/sierra/77-mm-sierra.rules             | 0
 {plugins => src/plugins}/sierra/mm-broadband-bearer-sierra.c   | 0
 {plugins => src/plugins}/sierra/mm-broadband-bearer-sierra.h   | 0
 .../plugins}/sierra/mm-broadband-modem-sierra-icera.c          | 0
 .../plugins}/sierra/mm-broadband-modem-sierra-icera.h          | 0
 {plugins => src/plugins}/sierra/mm-broadband-modem-sierra.c    | 0
 {plugins => src/plugins}/sierra/mm-broadband-modem-sierra.h    | 0
 {plugins => src/plugins}/sierra/mm-common-sierra.c             | 0
 {plugins => src/plugins}/sierra/mm-common-sierra.h             | 0
 {plugins => src/plugins}/sierra/mm-modem-helpers-sierra.c      | 0
 {plugins => src/plugins}/sierra/mm-modem-helpers-sierra.h      | 0
 {plugins => src/plugins}/sierra/mm-plugin-sierra-legacy.c      | 0
 {plugins => src/plugins}/sierra/mm-plugin-sierra-legacy.h      | 0
 {plugins => src/plugins}/sierra/mm-plugin-sierra.c             | 0
 {plugins => src/plugins}/sierra/mm-plugin-sierra.h             | 0
 {plugins => src/plugins}/sierra/mm-shared.c                    | 0
 {plugins => src/plugins}/sierra/mm-sim-sierra.c                | 0
 {plugins => src/plugins}/sierra/mm-sim-sierra.h                | 0
 .../plugins}/sierra/tests/test-modem-helpers-sierra.c          | 0
 .../plugins}/simtech/77-mm-simtech-port-types.rules            | 0
 .../plugins}/simtech/mm-broadband-modem-qmi-simtech.c          | 0
 .../plugins}/simtech/mm-broadband-modem-qmi-simtech.h          | 0
 {plugins => src/plugins}/simtech/mm-broadband-modem-simtech.c  | 0
 {plugins => src/plugins}/simtech/mm-broadband-modem-simtech.h  | 0
 {plugins => src/plugins}/simtech/mm-modem-helpers-simtech.c    | 0
 {plugins => src/plugins}/simtech/mm-modem-helpers-simtech.h    | 0
 {plugins => src/plugins}/simtech/mm-plugin-simtech.c           | 0
 {plugins => src/plugins}/simtech/mm-plugin-simtech.h           | 0
 {plugins => src/plugins}/simtech/mm-shared-simtech.c           | 0
 {plugins => src/plugins}/simtech/mm-shared-simtech.h           | 0
 .../plugins}/simtech/tests/test-modem-helpers-simtech.c        | 0
 {plugins => src/plugins}/symbol.map                            | 0
 {plugins => src/plugins}/telit/77-mm-telit-port-types.rules    | 0
 {plugins => src/plugins}/telit/mm-broadband-modem-mbim-telit.c | 0
 {plugins => src/plugins}/telit/mm-broadband-modem-mbim-telit.h | 0
 {plugins => src/plugins}/telit/mm-broadband-modem-telit.c      | 0
 {plugins => src/plugins}/telit/mm-broadband-modem-telit.h      | 0
 {plugins => src/plugins}/telit/mm-common-telit.c               | 0
 {plugins => src/plugins}/telit/mm-common-telit.h               | 0
 {plugins => src/plugins}/telit/mm-modem-helpers-telit.c        | 0
 {plugins => src/plugins}/telit/mm-modem-helpers-telit.h        | 0
 {plugins => src/plugins}/telit/mm-plugin-telit.c               | 0
 {plugins => src/plugins}/telit/mm-plugin-telit.h               | 0
 {plugins => src/plugins}/telit/mm-shared-telit.c               | 0
 {plugins => src/plugins}/telit/mm-shared-telit.h               | 0
 {plugins => src/plugins}/telit/mm-shared.c                     | 0
 .../plugins}/telit/tests/test-mm-modem-helpers-telit.c         | 0
 {plugins => src/plugins}/tests/gsm-port.conf                   | 0
 {plugins => src/plugins}/tests/test-fixture.c                  | 0
 {plugins => src/plugins}/tests/test-fixture.h                  | 0
 {plugins => src/plugins}/tests/test-helpers.c                  | 0
 {plugins => src/plugins}/tests/test-helpers.h                  | 0
 {plugins => src/plugins}/tests/test-keyfiles.c                 | 0
 {plugins => src/plugins}/tests/test-port-context.c             | 0
 {plugins => src/plugins}/tests/test-port-context.h             | 0
 {plugins => src/plugins}/tests/test-udev-rules.c               | 0
 {plugins => src/plugins}/thuraya/mm-broadband-modem-thuraya.c  | 0
 {plugins => src/plugins}/thuraya/mm-broadband-modem-thuraya.h  | 0
 {plugins => src/plugins}/thuraya/mm-modem-helpers-thuraya.c    | 0
 {plugins => src/plugins}/thuraya/mm-modem-helpers-thuraya.h    | 0
 {plugins => src/plugins}/thuraya/mm-plugin-thuraya.c           | 0
 {plugins => src/plugins}/thuraya/mm-plugin-thuraya.h           | 0
 .../plugins}/thuraya/tests/test-mm-modem-helpers-thuraya.c     | 0
 {plugins => src/plugins}/tplink/77-mm-tplink-port-types.rules  | 0
 {plugins => src/plugins}/tplink/mm-plugin-tplink.c             | 0
 {plugins => src/plugins}/tplink/mm-plugin-tplink.h             | 0
 {plugins => src/plugins}/ublox/77-mm-ublox-port-types.rules    | 0
 {plugins => src/plugins}/ublox/README                          | 0
 {plugins => src/plugins}/ublox/mm-broadband-bearer-ublox.c     | 0
 {plugins => src/plugins}/ublox/mm-broadband-bearer-ublox.h     | 0
 {plugins => src/plugins}/ublox/mm-broadband-modem-ublox.c      | 0
 {plugins => src/plugins}/ublox/mm-broadband-modem-ublox.h      | 0
 {plugins => src/plugins}/ublox/mm-modem-helpers-ublox.c        | 0
 {plugins => src/plugins}/ublox/mm-modem-helpers-ublox.h        | 0
 {plugins => src/plugins}/ublox/mm-plugin-ublox.c               | 0
 {plugins => src/plugins}/ublox/mm-plugin-ublox.h               | 0
 {plugins => src/plugins}/ublox/mm-sim-ublox.c                  | 0
 {plugins => src/plugins}/ublox/mm-sim-ublox.h                  | 0
 .../plugins}/ublox/tests/test-modem-helpers-ublox.c            | 0
 {plugins => src/plugins}/via/mm-broadband-modem-via.c          | 0
 {plugins => src/plugins}/via/mm-broadband-modem-via.h          | 0
 {plugins => src/plugins}/via/mm-plugin-via.c                   | 0
 {plugins => src/plugins}/via/mm-plugin-via.h                   | 0
 {plugins => src/plugins}/wavecom/mm-broadband-modem-wavecom.c  | 0
 {plugins => src/plugins}/wavecom/mm-broadband-modem-wavecom.h  | 0
 {plugins => src/plugins}/wavecom/mm-plugin-wavecom.c           | 0
 {plugins => src/plugins}/wavecom/mm-plugin-wavecom.h           | 0
 {plugins => src/plugins}/x22x/77-mm-x22x-port-types.rules      | 0
 {plugins => src/plugins}/x22x/mm-broadband-modem-x22x.c        | 0
 {plugins => src/plugins}/x22x/mm-broadband-modem-x22x.h        | 0
 {plugins => src/plugins}/x22x/mm-plugin-x22x.c                 | 0
 {plugins => src/plugins}/x22x/mm-plugin-x22x.h                 | 0
 {plugins => src/plugins}/xmm/mm-broadband-modem-mbim-xmm.c     | 0
 {plugins => src/plugins}/xmm/mm-broadband-modem-mbim-xmm.h     | 0
 {plugins => src/plugins}/xmm/mm-broadband-modem-xmm.c          | 0
 {plugins => src/plugins}/xmm/mm-broadband-modem-xmm.h          | 0
 {plugins => src/plugins}/xmm/mm-modem-helpers-xmm.c            | 0
 {plugins => src/plugins}/xmm/mm-modem-helpers-xmm.h            | 0
 {plugins => src/plugins}/xmm/mm-shared-xmm.c                   | 0
 {plugins => src/plugins}/xmm/mm-shared-xmm.h                   | 0
 {plugins => src/plugins}/xmm/mm-shared.c                       | 0
 {plugins => src/plugins}/xmm/tests/test-modem-helpers-xmm.c    | 0
 {plugins => src/plugins}/zte/77-mm-zte-port-types.rules        | 0
 {plugins => src/plugins}/zte/mm-broadband-modem-zte-icera.c    | 0
 {plugins => src/plugins}/zte/mm-broadband-modem-zte-icera.h    | 0
 {plugins => src/plugins}/zte/mm-broadband-modem-zte.c          | 0
 {plugins => src/plugins}/zte/mm-broadband-modem-zte.h          | 0
 {plugins => src/plugins}/zte/mm-common-zte.c                   | 0
 {plugins => src/plugins}/zte/mm-common-zte.h                   | 0
 {plugins => src/plugins}/zte/mm-plugin-zte.c                   | 0
 {plugins => src/plugins}/zte/mm-plugin-zte.h                   | 0
 318 files changed, 5 insertions(+), 3 deletions(-)
 rename {plugins => src/plugins}/README.txt (100%)
 rename {plugins => src/plugins}/altair/mm-broadband-bearer-altair-lte.c (100%)
 rename {plugins => src/plugins}/altair/mm-broadband-bearer-altair-lte.h (100%)
 rename {plugins => src/plugins}/altair/mm-broadband-modem-altair-lte.c (100%)
 rename {plugins => src/plugins}/altair/mm-broadband-modem-altair-lte.h (100%)
 rename {plugins => src/plugins}/altair/mm-modem-helpers-altair-lte.c (100%)
 rename {plugins => src/plugins}/altair/mm-modem-helpers-altair-lte.h (100%)
 rename {plugins => src/plugins}/altair/mm-plugin-altair-lte.c (100%)
 rename {plugins => src/plugins}/altair/mm-plugin-altair-lte.h (100%)
 rename {plugins => src/plugins}/altair/tests/test-modem-helpers-altair-lte.c (100%)
 rename {plugins => src/plugins}/anydata/mm-broadband-modem-anydata.c (100%)
 rename {plugins => src/plugins}/anydata/mm-broadband-modem-anydata.h (100%)
 rename {plugins => src/plugins}/anydata/mm-plugin-anydata.c (100%)
 rename {plugins => src/plugins}/anydata/mm-plugin-anydata.h (100%)
 rename {plugins => src/plugins}/broadmobi/77-mm-broadmobi-port-types.rules (100%)
 rename {plugins => src/plugins}/broadmobi/mm-plugin-broadmobi.c (100%)
 rename {plugins => src/plugins}/broadmobi/mm-plugin-broadmobi.h (100%)
 rename {plugins => src/plugins}/cinterion/77-mm-cinterion-port-types.rules (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-bearer-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-bearer-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-mbim-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-mbim-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-qmi-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-broadband-modem-qmi-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-modem-helpers-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-modem-helpers-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-plugin-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-plugin-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/mm-shared-cinterion.c (100%)
 rename {plugins => src/plugins}/cinterion/mm-shared-cinterion.h (100%)
 rename {plugins => src/plugins}/cinterion/tests/test-modem-helpers-cinterion.c (100%)
 rename {plugins => src/plugins}/dell/77-mm-dell-port-types.rules (100%)
 rename {plugins => src/plugins}/dell/mm-plugin-dell.c (100%)
 rename {plugins => src/plugins}/dell/mm-plugin-dell.h (100%)
 rename {plugins => src/plugins}/dlink/77-mm-dlink-port-types.rules (100%)
 rename {plugins => src/plugins}/dlink/mm-plugin-dlink.c (100%)
 rename {plugins => src/plugins}/dlink/mm-plugin-dlink.h (100%)
 rename {plugins => src/plugins}/fibocom/77-mm-fibocom-port-types.rules (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-bearer-fibocom-ecm.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-bearer-fibocom-ecm.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-fibocom.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-fibocom.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-mbim-fibocom.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-mbim-fibocom.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-plugin-fibocom.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-plugin-fibocom.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-shared-fibocom.c (100%)
 rename {plugins => src/plugins}/fibocom/mm-shared-fibocom.h (100%)
 rename {plugins => src/plugins}/fibocom/mm-shared.c (100%)
 rename {plugins => src/plugins}/foxconn/77-mm-foxconn-port-types.rules (100%)
 rename {plugins => src/plugins}/foxconn/mm-broadband-modem-mbim-foxconn.c (100%)
 rename {plugins => src/plugins}/foxconn/mm-broadband-modem-mbim-foxconn.h (100%)
 rename {plugins => src/plugins}/foxconn/mm-foxconn-t77w968-carrier-mapping.conf (100%)
 rename {plugins => src/plugins}/foxconn/mm-plugin-foxconn.c (100%)
 rename {plugins => src/plugins}/foxconn/mm-plugin-foxconn.h (100%)
 rename {plugins => src/plugins}/foxconn/mm-shared.c (100%)
 rename {plugins => src/plugins}/generic/mm-plugin-generic.c (100%)
 rename {plugins => src/plugins}/generic/mm-plugin-generic.h (100%)
 rename {plugins => src/plugins}/generic/tests/test-service-generic.c (100%)
 rename {plugins => src/plugins}/gosuncn/77-mm-gosuncn-port-types.rules (100%)
 rename {plugins => src/plugins}/gosuncn/mm-plugin-gosuncn.c (100%)
 rename {plugins => src/plugins}/gosuncn/mm-plugin-gosuncn.h (100%)
 rename {plugins => src/plugins}/haier/77-mm-haier-port-types.rules (100%)
 rename {plugins => src/plugins}/haier/mm-plugin-haier.c (100%)
 rename {plugins => src/plugins}/haier/mm-plugin-haier.h (100%)
 rename {plugins => src/plugins}/huawei/77-mm-huawei-net-port-types.rules (100%)
 rename {plugins => src/plugins}/huawei/mm-broadband-bearer-huawei.c (100%)
 rename {plugins => src/plugins}/huawei/mm-broadband-bearer-huawei.h (100%)
 rename {plugins => src/plugins}/huawei/mm-broadband-modem-huawei.c (100%)
 rename {plugins => src/plugins}/huawei/mm-broadband-modem-huawei.h (100%)
 rename {plugins => src/plugins}/huawei/mm-modem-helpers-huawei.c (100%)
 rename {plugins => src/plugins}/huawei/mm-modem-helpers-huawei.h (100%)
 rename {plugins => src/plugins}/huawei/mm-plugin-huawei.c (100%)
 rename {plugins => src/plugins}/huawei/mm-plugin-huawei.h (100%)
 rename {plugins => src/plugins}/huawei/mm-sim-huawei.c (100%)
 rename {plugins => src/plugins}/huawei/mm-sim-huawei.h (100%)
 rename {plugins => src/plugins}/huawei/tests/test-modem-helpers-huawei.c (100%)
 rename {plugins => src/plugins}/icera/mm-broadband-bearer-icera.c (100%)
 rename {plugins => src/plugins}/icera/mm-broadband-bearer-icera.h (100%)
 rename {plugins => src/plugins}/icera/mm-broadband-modem-icera.c (100%)
 rename {plugins => src/plugins}/icera/mm-broadband-modem-icera.h (100%)
 rename {plugins => src/plugins}/icera/mm-modem-helpers-icera.c (100%)
 rename {plugins => src/plugins}/icera/mm-modem-helpers-icera.h (100%)
 rename {plugins => src/plugins}/icera/mm-shared.c (100%)
 rename {plugins => src/plugins}/icera/tests/test-modem-helpers-icera.c (100%)
 rename {plugins => src/plugins}/intel/mm-broadband-modem-mbim-intel.c (100%)
 rename {plugins => src/plugins}/intel/mm-broadband-modem-mbim-intel.h (100%)
 rename {plugins => src/plugins}/intel/mm-plugin-intel.c (100%)
 rename {plugins => src/plugins}/intel/mm-plugin-intel.h (100%)
 rename {plugins => src/plugins}/iridium/mm-bearer-iridium.c (100%)
 rename {plugins => src/plugins}/iridium/mm-bearer-iridium.h (100%)
 rename {plugins => src/plugins}/iridium/mm-broadband-modem-iridium.c (100%)
 rename {plugins => src/plugins}/iridium/mm-broadband-modem-iridium.h (100%)
 rename {plugins => src/plugins}/iridium/mm-plugin-iridium.c (100%)
 rename {plugins => src/plugins}/iridium/mm-plugin-iridium.h (100%)
 rename {plugins => src/plugins}/iridium/mm-sim-iridium.c (100%)
 rename {plugins => src/plugins}/iridium/mm-sim-iridium.h (100%)
 rename {plugins => src/plugins}/linktop/77-mm-linktop-port-types.rules (100%)
 rename {plugins => src/plugins}/linktop/mm-broadband-modem-linktop.c (100%)
 rename {plugins => src/plugins}/linktop/mm-broadband-modem-linktop.h (100%)
 rename {plugins => src/plugins}/linktop/mm-modem-helpers-linktop.c (100%)
 rename {plugins => src/plugins}/linktop/mm-modem-helpers-linktop.h (100%)
 rename {plugins => src/plugins}/linktop/mm-plugin-linktop.c (100%)
 rename {plugins => src/plugins}/linktop/mm-plugin-linktop.h (100%)
 rename {plugins => src/plugins}/linktop/tests/test-modem-helpers-linktop.c (100%)
 rename {plugins => src/plugins}/longcheer/77-mm-longcheer-port-types.rules (100%)
 rename {plugins => src/plugins}/longcheer/mm-broadband-modem-longcheer.c (100%)
 rename {plugins => src/plugins}/longcheer/mm-broadband-modem-longcheer.h (100%)
 rename {plugins => src/plugins}/longcheer/mm-plugin-longcheer.c (100%)
 rename {plugins => src/plugins}/longcheer/mm-plugin-longcheer.h (100%)
 rename {plugins => src/plugins}/mbm/77-mm-ericsson-mbm.rules (100%)
 rename {plugins => src/plugins}/mbm/mm-broadband-bearer-mbm.c (100%)
 rename {plugins => src/plugins}/mbm/mm-broadband-bearer-mbm.h (100%)
 rename {plugins => src/plugins}/mbm/mm-broadband-modem-mbm.c (100%)
 rename {plugins => src/plugins}/mbm/mm-broadband-modem-mbm.h (100%)
 rename {plugins => src/plugins}/mbm/mm-modem-helpers-mbm.c (100%)
 rename {plugins => src/plugins}/mbm/mm-modem-helpers-mbm.h (100%)
 rename {plugins => src/plugins}/mbm/mm-plugin-mbm.c (100%)
 rename {plugins => src/plugins}/mbm/mm-plugin-mbm.h (100%)
 rename {plugins => src/plugins}/mbm/mm-sim-mbm.c (100%)
 rename {plugins => src/plugins}/mbm/mm-sim-mbm.h (100%)
 rename {plugins => src/plugins}/mbm/tests/test-modem-helpers-mbm.c (100%)
 rename {plugins => src/plugins}/meson.build (100%)
 rename {plugins => src/plugins}/motorola/mm-broadband-modem-motorola.c (100%)
 rename {plugins => src/plugins}/motorola/mm-broadband-modem-motorola.h (100%)
 rename {plugins => src/plugins}/motorola/mm-plugin-motorola.c (100%)
 rename {plugins => src/plugins}/motorola/mm-plugin-motorola.h (100%)
 rename {plugins => src/plugins}/mtk/77-mm-mtk-port-types.rules (100%)
 rename {plugins => src/plugins}/mtk/mm-broadband-modem-mtk.c (100%)
 rename {plugins => src/plugins}/mtk/mm-broadband-modem-mtk.h (100%)
 rename {plugins => src/plugins}/mtk/mm-plugin-mtk.c (100%)
 rename {plugins => src/plugins}/mtk/mm-plugin-mtk.h (100%)
 rename {plugins => src/plugins}/nokia/77-mm-nokia-port-types.rules (100%)
 rename {plugins => src/plugins}/nokia/mm-broadband-modem-nokia.c (100%)
 rename {plugins => src/plugins}/nokia/mm-broadband-modem-nokia.h (100%)
 rename {plugins => src/plugins}/nokia/mm-plugin-nokia-icera.c (100%)
 rename {plugins => src/plugins}/nokia/mm-plugin-nokia-icera.h (100%)
 rename {plugins => src/plugins}/nokia/mm-plugin-nokia.c (100%)
 rename {plugins => src/plugins}/nokia/mm-plugin-nokia.h (100%)
 rename {plugins => src/plugins}/nokia/mm-sim-nokia.c (100%)
 rename {plugins => src/plugins}/nokia/mm-sim-nokia.h (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-bearer-novatel-lte.c (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-bearer-novatel-lte.h (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-modem-novatel-lte.c (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-modem-novatel-lte.h (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-modem-novatel.c (100%)
 rename {plugins => src/plugins}/novatel/mm-broadband-modem-novatel.h (100%)
 rename {plugins => src/plugins}/novatel/mm-common-novatel.c (100%)
 rename {plugins => src/plugins}/novatel/mm-common-novatel.h (100%)
 rename {plugins => src/plugins}/novatel/mm-plugin-novatel-lte.c (100%)
 rename {plugins => src/plugins}/novatel/mm-plugin-novatel-lte.h (100%)
 rename {plugins => src/plugins}/novatel/mm-plugin-novatel.c (100%)
 rename {plugins => src/plugins}/novatel/mm-plugin-novatel.h (100%)
 rename {plugins => src/plugins}/novatel/mm-shared.c (100%)
 rename {plugins => src/plugins}/novatel/mm-sim-novatel-lte.c (100%)
 rename {plugins => src/plugins}/novatel/mm-sim-novatel-lte.h (100%)
 rename {plugins => src/plugins}/option/mm-broadband-bearer-hso.c (100%)
 rename {plugins => src/plugins}/option/mm-broadband-bearer-hso.h (100%)
 rename {plugins => src/plugins}/option/mm-broadband-modem-hso.c (100%)
 rename {plugins => src/plugins}/option/mm-broadband-modem-hso.h (100%)
 rename {plugins => src/plugins}/option/mm-broadband-modem-option.c (100%)
 rename {plugins => src/plugins}/option/mm-broadband-modem-option.h (100%)
 rename {plugins => src/plugins}/option/mm-plugin-hso.c (100%)
 rename {plugins => src/plugins}/option/mm-plugin-hso.h (100%)
 rename {plugins => src/plugins}/option/mm-plugin-option.c (100%)
 rename {plugins => src/plugins}/option/mm-plugin-option.h (100%)
 rename {plugins => src/plugins}/option/mm-shared-option.c (100%)
 rename {plugins => src/plugins}/option/mm-shared-option.h (100%)
 rename {plugins => src/plugins}/option/mm-shared.c (100%)
 rename {plugins => src/plugins}/option/mm-sim-option.c (100%)
 rename {plugins => src/plugins}/option/mm-sim-option.h (100%)
 rename {plugins => src/plugins}/pantech/mm-broadband-modem-pantech.c (100%)
 rename {plugins => src/plugins}/pantech/mm-broadband-modem-pantech.h (100%)
 rename {plugins => src/plugins}/pantech/mm-plugin-pantech.c (100%)
 rename {plugins => src/plugins}/pantech/mm-plugin-pantech.h (100%)
 rename {plugins => src/plugins}/pantech/mm-sim-pantech.c (100%)
 rename {plugins => src/plugins}/pantech/mm-sim-pantech.h (100%)
 rename {plugins => src/plugins}/qcom-soc/77-mm-qcom-soc.rules (100%)
 rename {plugins => src/plugins}/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c (100%)
 rename {plugins => src/plugins}/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h (100%)
 rename {plugins => src/plugins}/qcom-soc/mm-plugin-qcom-soc.c (100%)
 rename {plugins => src/plugins}/qcom-soc/mm-plugin-qcom-soc.h (100%)
 rename {plugins => src/plugins}/quectel/77-mm-quectel-port-types.rules (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-mbim-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-mbim-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-qmi-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-qmi-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-broadband-modem-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/mm-modem-helpers-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-modem-helpers-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/mm-plugin-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-plugin-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/mm-shared-quectel.c (100%)
 rename {plugins => src/plugins}/quectel/mm-shared-quectel.h (100%)
 rename {plugins => src/plugins}/quectel/tests/test-modem-helpers-quectel.c (100%)
 rename {plugins => src/plugins}/samsung/mm-broadband-modem-samsung.c (100%)
 rename {plugins => src/plugins}/samsung/mm-broadband-modem-samsung.h (100%)
 rename {plugins => src/plugins}/samsung/mm-plugin-samsung.c (100%)
 rename {plugins => src/plugins}/samsung/mm-plugin-samsung.h (100%)
 rename {plugins => src/plugins}/sierra/77-mm-sierra.rules (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-bearer-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-bearer-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-modem-sierra-icera.c (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-modem-sierra-icera.h (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-modem-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-broadband-modem-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/mm-common-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-common-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/mm-modem-helpers-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-modem-helpers-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/mm-plugin-sierra-legacy.c (100%)
 rename {plugins => src/plugins}/sierra/mm-plugin-sierra-legacy.h (100%)
 rename {plugins => src/plugins}/sierra/mm-plugin-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-plugin-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/mm-shared.c (100%)
 rename {plugins => src/plugins}/sierra/mm-sim-sierra.c (100%)
 rename {plugins => src/plugins}/sierra/mm-sim-sierra.h (100%)
 rename {plugins => src/plugins}/sierra/tests/test-modem-helpers-sierra.c (100%)
 rename {plugins => src/plugins}/simtech/77-mm-simtech-port-types.rules (100%)
 rename {plugins => src/plugins}/simtech/mm-broadband-modem-qmi-simtech.c (100%)
 rename {plugins => src/plugins}/simtech/mm-broadband-modem-qmi-simtech.h (100%)
 rename {plugins => src/plugins}/simtech/mm-broadband-modem-simtech.c (100%)
 rename {plugins => src/plugins}/simtech/mm-broadband-modem-simtech.h (100%)
 rename {plugins => src/plugins}/simtech/mm-modem-helpers-simtech.c (100%)
 rename {plugins => src/plugins}/simtech/mm-modem-helpers-simtech.h (100%)
 rename {plugins => src/plugins}/simtech/mm-plugin-simtech.c (100%)
 rename {plugins => src/plugins}/simtech/mm-plugin-simtech.h (100%)
 rename {plugins => src/plugins}/simtech/mm-shared-simtech.c (100%)
 rename {plugins => src/plugins}/simtech/mm-shared-simtech.h (100%)
 rename {plugins => src/plugins}/simtech/tests/test-modem-helpers-simtech.c (100%)
 rename {plugins => src/plugins}/symbol.map (100%)
 rename {plugins => src/plugins}/telit/77-mm-telit-port-types.rules (100%)
 rename {plugins => src/plugins}/telit/mm-broadband-modem-mbim-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-broadband-modem-mbim-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-broadband-modem-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-broadband-modem-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-common-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-common-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-modem-helpers-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-modem-helpers-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-plugin-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-plugin-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-shared-telit.c (100%)
 rename {plugins => src/plugins}/telit/mm-shared-telit.h (100%)
 rename {plugins => src/plugins}/telit/mm-shared.c (100%)
 rename {plugins => src/plugins}/telit/tests/test-mm-modem-helpers-telit.c (100%)
 rename {plugins => src/plugins}/tests/gsm-port.conf (100%)
 rename {plugins => src/plugins}/tests/test-fixture.c (100%)
 rename {plugins => src/plugins}/tests/test-fixture.h (100%)
 rename {plugins => src/plugins}/tests/test-helpers.c (100%)
 rename {plugins => src/plugins}/tests/test-helpers.h (100%)
 rename {plugins => src/plugins}/tests/test-keyfiles.c (100%)
 rename {plugins => src/plugins}/tests/test-port-context.c (100%)
 rename {plugins => src/plugins}/tests/test-port-context.h (100%)
 rename {plugins => src/plugins}/tests/test-udev-rules.c (100%)
 rename {plugins => src/plugins}/thuraya/mm-broadband-modem-thuraya.c (100%)
 rename {plugins => src/plugins}/thuraya/mm-broadband-modem-thuraya.h (100%)
 rename {plugins => src/plugins}/thuraya/mm-modem-helpers-thuraya.c (100%)
 rename {plugins => src/plugins}/thuraya/mm-modem-helpers-thuraya.h (100%)
 rename {plugins => src/plugins}/thuraya/mm-plugin-thuraya.c (100%)
 rename {plugins => src/plugins}/thuraya/mm-plugin-thuraya.h (100%)
 rename {plugins => src/plugins}/thuraya/tests/test-mm-modem-helpers-thuraya.c (100%)
 rename {plugins => src/plugins}/tplink/77-mm-tplink-port-types.rules (100%)
 rename {plugins => src/plugins}/tplink/mm-plugin-tplink.c (100%)
 rename {plugins => src/plugins}/tplink/mm-plugin-tplink.h (100%)
 rename {plugins => src/plugins}/ublox/77-mm-ublox-port-types.rules (100%)
 rename {plugins => src/plugins}/ublox/README (100%)
 rename {plugins => src/plugins}/ublox/mm-broadband-bearer-ublox.c (100%)
 rename {plugins => src/plugins}/ublox/mm-broadband-bearer-ublox.h (100%)
 rename {plugins => src/plugins}/ublox/mm-broadband-modem-ublox.c (100%)
 rename {plugins => src/plugins}/ublox/mm-broadband-modem-ublox.h (100%)
 rename {plugins => src/plugins}/ublox/mm-modem-helpers-ublox.c (100%)
 rename {plugins => src/plugins}/ublox/mm-modem-helpers-ublox.h (100%)
 rename {plugins => src/plugins}/ublox/mm-plugin-ublox.c (100%)
 rename {plugins => src/plugins}/ublox/mm-plugin-ublox.h (100%)
 rename {plugins => src/plugins}/ublox/mm-sim-ublox.c (100%)
 rename {plugins => src/plugins}/ublox/mm-sim-ublox.h (100%)
 rename {plugins => src/plugins}/ublox/tests/test-modem-helpers-ublox.c (100%)
 rename {plugins => src/plugins}/via/mm-broadband-modem-via.c (100%)
 rename {plugins => src/plugins}/via/mm-broadband-modem-via.h (100%)
 rename {plugins => src/plugins}/via/mm-plugin-via.c (100%)
 rename {plugins => src/plugins}/via/mm-plugin-via.h (100%)
 rename {plugins => src/plugins}/wavecom/mm-broadband-modem-wavecom.c (100%)
 rename {plugins => src/plugins}/wavecom/mm-broadband-modem-wavecom.h (100%)
 rename {plugins => src/plugins}/wavecom/mm-plugin-wavecom.c (100%)
 rename {plugins => src/plugins}/wavecom/mm-plugin-wavecom.h (100%)
 rename {plugins => src/plugins}/x22x/77-mm-x22x-port-types.rules (100%)
 rename {plugins => src/plugins}/x22x/mm-broadband-modem-x22x.c (100%)
 rename {plugins => src/plugins}/x22x/mm-broadband-modem-x22x.h (100%)
 rename {plugins => src/plugins}/x22x/mm-plugin-x22x.c (100%)
 rename {plugins => src/plugins}/x22x/mm-plugin-x22x.h (100%)
 rename {plugins => src/plugins}/xmm/mm-broadband-modem-mbim-xmm.c (100%)
 rename {plugins => src/plugins}/xmm/mm-broadband-modem-mbim-xmm.h (100%)
 rename {plugins => src/plugins}/xmm/mm-broadband-modem-xmm.c (100%)
 rename {plugins => src/plugins}/xmm/mm-broadband-modem-xmm.h (100%)
 rename {plugins => src/plugins}/xmm/mm-modem-helpers-xmm.c (100%)
 rename {plugins => src/plugins}/xmm/mm-modem-helpers-xmm.h (100%)
 rename {plugins => src/plugins}/xmm/mm-shared-xmm.c (100%)
 rename {plugins => src/plugins}/xmm/mm-shared-xmm.h (100%)
 rename {plugins => src/plugins}/xmm/mm-shared.c (100%)
 rename {plugins => src/plugins}/xmm/tests/test-modem-helpers-xmm.c (100%)
 rename {plugins => src/plugins}/zte/77-mm-zte-port-types.rules (100%)
 rename {plugins => src/plugins}/zte/mm-broadband-modem-zte-icera.c (100%)
 rename {plugins => src/plugins}/zte/mm-broadband-modem-zte-icera.h (100%)
 rename {plugins => src/plugins}/zte/mm-broadband-modem-zte.c (100%)
 rename {plugins => src/plugins}/zte/mm-broadband-modem-zte.h (100%)
 rename {plugins => src/plugins}/zte/mm-common-zte.c (100%)
 rename {plugins => src/plugins}/zte/mm-common-zte.h (100%)
 rename {plugins => src/plugins}/zte/mm-plugin-zte.c (100%)
 rename {plugins => src/plugins}/zte/mm-plugin-zte.h (100%)

diff --git a/data/tests/meson.build b/data/tests/meson.build
index fa0b2c00..1cc0826b 100644
--- a/data/tests/meson.build
+++ b/data/tests/meson.build
@@ -3,7 +3,7 @@
 
 test_conf = {
   'abs_top_builddir': build_root,
-  'PLUGIN_BUILD_SUBDIR': 'plugins/',
+  'PLUGIN_BUILD_SUBDIR': 'src/plugins/',
 }
 
 configure_file(
diff --git a/meson.build b/meson.build
index 34b93486..cc2191fe 100644
--- a/meson.build
+++ b/meson.build
@@ -55,9 +55,9 @@ source_root = meson.current_source_dir()
 build_root = meson.current_build_dir()
 
 build_aux_dir = source_root / 'build-aux'
-plugins_dir = source_root / 'plugins'
 po_dir = source_root / 'po'
 src_dir = source_root / 'src'
+plugins_dir = source_root / 'src/plugins'
 
 top_inc = include_directories('.')
 
@@ -397,7 +397,6 @@ endif
 
 subdir('libmm-glib')
 subdir('src')
-subdir('plugins')
 subdir('cli')
 
 if enable_tests
diff --git a/src/meson.build b/src/meson.build
index 30aedbe9..db345e4c 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -336,3 +336,6 @@ install_data(
 if enable_tests
   subdir('tests')
 endif
+
+# Additional vendor plugins
+subdir('plugins')
\ No newline at end of file
diff --git a/plugins/README.txt b/src/plugins/README.txt
similarity index 100%
rename from plugins/README.txt
rename to src/plugins/README.txt
diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.c b/src/plugins/altair/mm-broadband-bearer-altair-lte.c
similarity index 100%
rename from plugins/altair/mm-broadband-bearer-altair-lte.c
rename to src/plugins/altair/mm-broadband-bearer-altair-lte.c
diff --git a/plugins/altair/mm-broadband-bearer-altair-lte.h b/src/plugins/altair/mm-broadband-bearer-altair-lte.h
similarity index 100%
rename from plugins/altair/mm-broadband-bearer-altair-lte.h
rename to src/plugins/altair/mm-broadband-bearer-altair-lte.h
diff --git a/plugins/altair/mm-broadband-modem-altair-lte.c b/src/plugins/altair/mm-broadband-modem-altair-lte.c
similarity index 100%
rename from plugins/altair/mm-broadband-modem-altair-lte.c
rename to src/plugins/altair/mm-broadband-modem-altair-lte.c
diff --git a/plugins/altair/mm-broadband-modem-altair-lte.h b/src/plugins/altair/mm-broadband-modem-altair-lte.h
similarity index 100%
rename from plugins/altair/mm-broadband-modem-altair-lte.h
rename to src/plugins/altair/mm-broadband-modem-altair-lte.h
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.c b/src/plugins/altair/mm-modem-helpers-altair-lte.c
similarity index 100%
rename from plugins/altair/mm-modem-helpers-altair-lte.c
rename to src/plugins/altair/mm-modem-helpers-altair-lte.c
diff --git a/plugins/altair/mm-modem-helpers-altair-lte.h b/src/plugins/altair/mm-modem-helpers-altair-lte.h
similarity index 100%
rename from plugins/altair/mm-modem-helpers-altair-lte.h
rename to src/plugins/altair/mm-modem-helpers-altair-lte.h
diff --git a/plugins/altair/mm-plugin-altair-lte.c b/src/plugins/altair/mm-plugin-altair-lte.c
similarity index 100%
rename from plugins/altair/mm-plugin-altair-lte.c
rename to src/plugins/altair/mm-plugin-altair-lte.c
diff --git a/plugins/altair/mm-plugin-altair-lte.h b/src/plugins/altair/mm-plugin-altair-lte.h
similarity index 100%
rename from plugins/altair/mm-plugin-altair-lte.h
rename to src/plugins/altair/mm-plugin-altair-lte.h
diff --git a/plugins/altair/tests/test-modem-helpers-altair-lte.c b/src/plugins/altair/tests/test-modem-helpers-altair-lte.c
similarity index 100%
rename from plugins/altair/tests/test-modem-helpers-altair-lte.c
rename to src/plugins/altair/tests/test-modem-helpers-altair-lte.c
diff --git a/plugins/anydata/mm-broadband-modem-anydata.c b/src/plugins/anydata/mm-broadband-modem-anydata.c
similarity index 100%
rename from plugins/anydata/mm-broadband-modem-anydata.c
rename to src/plugins/anydata/mm-broadband-modem-anydata.c
diff --git a/plugins/anydata/mm-broadband-modem-anydata.h b/src/plugins/anydata/mm-broadband-modem-anydata.h
similarity index 100%
rename from plugins/anydata/mm-broadband-modem-anydata.h
rename to src/plugins/anydata/mm-broadband-modem-anydata.h
diff --git a/plugins/anydata/mm-plugin-anydata.c b/src/plugins/anydata/mm-plugin-anydata.c
similarity index 100%
rename from plugins/anydata/mm-plugin-anydata.c
rename to src/plugins/anydata/mm-plugin-anydata.c
diff --git a/plugins/anydata/mm-plugin-anydata.h b/src/plugins/anydata/mm-plugin-anydata.h
similarity index 100%
rename from plugins/anydata/mm-plugin-anydata.h
rename to src/plugins/anydata/mm-plugin-anydata.h
diff --git a/plugins/broadmobi/77-mm-broadmobi-port-types.rules b/src/plugins/broadmobi/77-mm-broadmobi-port-types.rules
similarity index 100%
rename from plugins/broadmobi/77-mm-broadmobi-port-types.rules
rename to src/plugins/broadmobi/77-mm-broadmobi-port-types.rules
diff --git a/plugins/broadmobi/mm-plugin-broadmobi.c b/src/plugins/broadmobi/mm-plugin-broadmobi.c
similarity index 100%
rename from plugins/broadmobi/mm-plugin-broadmobi.c
rename to src/plugins/broadmobi/mm-plugin-broadmobi.c
diff --git a/plugins/broadmobi/mm-plugin-broadmobi.h b/src/plugins/broadmobi/mm-plugin-broadmobi.h
similarity index 100%
rename from plugins/broadmobi/mm-plugin-broadmobi.h
rename to src/plugins/broadmobi/mm-plugin-broadmobi.h
diff --git a/plugins/cinterion/77-mm-cinterion-port-types.rules b/src/plugins/cinterion/77-mm-cinterion-port-types.rules
similarity index 100%
rename from plugins/cinterion/77-mm-cinterion-port-types.rules
rename to src/plugins/cinterion/77-mm-cinterion-port-types.rules
diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.c b/src/plugins/cinterion/mm-broadband-bearer-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-broadband-bearer-cinterion.c
rename to src/plugins/cinterion/mm-broadband-bearer-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-bearer-cinterion.h b/src/plugins/cinterion/mm-broadband-bearer-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-broadband-bearer-cinterion.h
rename to src/plugins/cinterion/mm-broadband-bearer-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-cinterion.c
rename to src/plugins/cinterion/mm-broadband-modem-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-cinterion.h
rename to src/plugins/cinterion/mm-broadband-modem-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
rename to src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
rename to src/plugins/cinterion/mm-broadband-modem-mbim-cinterion.h
diff --git a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
rename to src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.c
diff --git a/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h b/src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
rename to src/plugins/cinterion/mm-broadband-modem-qmi-cinterion.h
diff --git a/plugins/cinterion/mm-modem-helpers-cinterion.c b/src/plugins/cinterion/mm-modem-helpers-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-modem-helpers-cinterion.c
rename to src/plugins/cinterion/mm-modem-helpers-cinterion.c
diff --git a/plugins/cinterion/mm-modem-helpers-cinterion.h b/src/plugins/cinterion/mm-modem-helpers-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-modem-helpers-cinterion.h
rename to src/plugins/cinterion/mm-modem-helpers-cinterion.h
diff --git a/plugins/cinterion/mm-plugin-cinterion.c b/src/plugins/cinterion/mm-plugin-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-plugin-cinterion.c
rename to src/plugins/cinterion/mm-plugin-cinterion.c
diff --git a/plugins/cinterion/mm-plugin-cinterion.h b/src/plugins/cinterion/mm-plugin-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-plugin-cinterion.h
rename to src/plugins/cinterion/mm-plugin-cinterion.h
diff --git a/plugins/cinterion/mm-shared-cinterion.c b/src/plugins/cinterion/mm-shared-cinterion.c
similarity index 100%
rename from plugins/cinterion/mm-shared-cinterion.c
rename to src/plugins/cinterion/mm-shared-cinterion.c
diff --git a/plugins/cinterion/mm-shared-cinterion.h b/src/plugins/cinterion/mm-shared-cinterion.h
similarity index 100%
rename from plugins/cinterion/mm-shared-cinterion.h
rename to src/plugins/cinterion/mm-shared-cinterion.h
diff --git a/plugins/cinterion/tests/test-modem-helpers-cinterion.c b/src/plugins/cinterion/tests/test-modem-helpers-cinterion.c
similarity index 100%
rename from plugins/cinterion/tests/test-modem-helpers-cinterion.c
rename to src/plugins/cinterion/tests/test-modem-helpers-cinterion.c
diff --git a/plugins/dell/77-mm-dell-port-types.rules b/src/plugins/dell/77-mm-dell-port-types.rules
similarity index 100%
rename from plugins/dell/77-mm-dell-port-types.rules
rename to src/plugins/dell/77-mm-dell-port-types.rules
diff --git a/plugins/dell/mm-plugin-dell.c b/src/plugins/dell/mm-plugin-dell.c
similarity index 100%
rename from plugins/dell/mm-plugin-dell.c
rename to src/plugins/dell/mm-plugin-dell.c
diff --git a/plugins/dell/mm-plugin-dell.h b/src/plugins/dell/mm-plugin-dell.h
similarity index 100%
rename from plugins/dell/mm-plugin-dell.h
rename to src/plugins/dell/mm-plugin-dell.h
diff --git a/plugins/dlink/77-mm-dlink-port-types.rules b/src/plugins/dlink/77-mm-dlink-port-types.rules
similarity index 100%
rename from plugins/dlink/77-mm-dlink-port-types.rules
rename to src/plugins/dlink/77-mm-dlink-port-types.rules
diff --git a/plugins/dlink/mm-plugin-dlink.c b/src/plugins/dlink/mm-plugin-dlink.c
similarity index 100%
rename from plugins/dlink/mm-plugin-dlink.c
rename to src/plugins/dlink/mm-plugin-dlink.c
diff --git a/plugins/dlink/mm-plugin-dlink.h b/src/plugins/dlink/mm-plugin-dlink.h
similarity index 100%
rename from plugins/dlink/mm-plugin-dlink.h
rename to src/plugins/dlink/mm-plugin-dlink.h
diff --git a/plugins/fibocom/77-mm-fibocom-port-types.rules b/src/plugins/fibocom/77-mm-fibocom-port-types.rules
similarity index 100%
rename from plugins/fibocom/77-mm-fibocom-port-types.rules
rename to src/plugins/fibocom/77-mm-fibocom-port-types.rules
diff --git a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
similarity index 100%
rename from plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
rename to src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.c
diff --git a/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h b/src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
similarity index 100%
rename from plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
rename to src/plugins/fibocom/mm-broadband-bearer-fibocom-ecm.h
diff --git a/plugins/fibocom/mm-broadband-modem-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-fibocom.c
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-fibocom.c
rename to src/plugins/fibocom/mm-broadband-modem-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-fibocom.h
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-fibocom.h
rename to src/plugins/fibocom/mm-broadband-modem-fibocom.h
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
rename to src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
rename to src/plugins/fibocom/mm-broadband-modem-mbim-fibocom.h
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
rename to src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.c
diff --git a/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h b/src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
similarity index 100%
rename from plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
rename to src/plugins/fibocom/mm-broadband-modem-mbim-xmm-fibocom.h
diff --git a/plugins/fibocom/mm-plugin-fibocom.c b/src/plugins/fibocom/mm-plugin-fibocom.c
similarity index 100%
rename from plugins/fibocom/mm-plugin-fibocom.c
rename to src/plugins/fibocom/mm-plugin-fibocom.c
diff --git a/plugins/fibocom/mm-plugin-fibocom.h b/src/plugins/fibocom/mm-plugin-fibocom.h
similarity index 100%
rename from plugins/fibocom/mm-plugin-fibocom.h
rename to src/plugins/fibocom/mm-plugin-fibocom.h
diff --git a/plugins/fibocom/mm-shared-fibocom.c b/src/plugins/fibocom/mm-shared-fibocom.c
similarity index 100%
rename from plugins/fibocom/mm-shared-fibocom.c
rename to src/plugins/fibocom/mm-shared-fibocom.c
diff --git a/plugins/fibocom/mm-shared-fibocom.h b/src/plugins/fibocom/mm-shared-fibocom.h
similarity index 100%
rename from plugins/fibocom/mm-shared-fibocom.h
rename to src/plugins/fibocom/mm-shared-fibocom.h
diff --git a/plugins/fibocom/mm-shared.c b/src/plugins/fibocom/mm-shared.c
similarity index 100%
rename from plugins/fibocom/mm-shared.c
rename to src/plugins/fibocom/mm-shared.c
diff --git a/plugins/foxconn/77-mm-foxconn-port-types.rules b/src/plugins/foxconn/77-mm-foxconn-port-types.rules
similarity index 100%
rename from plugins/foxconn/77-mm-foxconn-port-types.rules
rename to src/plugins/foxconn/77-mm-foxconn-port-types.rules
diff --git a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
similarity index 100%
rename from plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
rename to src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.c
diff --git a/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h b/src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
similarity index 100%
rename from plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
rename to src/plugins/foxconn/mm-broadband-modem-mbim-foxconn.h
diff --git a/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf b/src/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
similarity index 100%
rename from plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
rename to src/plugins/foxconn/mm-foxconn-t77w968-carrier-mapping.conf
diff --git a/plugins/foxconn/mm-plugin-foxconn.c b/src/plugins/foxconn/mm-plugin-foxconn.c
similarity index 100%
rename from plugins/foxconn/mm-plugin-foxconn.c
rename to src/plugins/foxconn/mm-plugin-foxconn.c
diff --git a/plugins/foxconn/mm-plugin-foxconn.h b/src/plugins/foxconn/mm-plugin-foxconn.h
similarity index 100%
rename from plugins/foxconn/mm-plugin-foxconn.h
rename to src/plugins/foxconn/mm-plugin-foxconn.h
diff --git a/plugins/foxconn/mm-shared.c b/src/plugins/foxconn/mm-shared.c
similarity index 100%
rename from plugins/foxconn/mm-shared.c
rename to src/plugins/foxconn/mm-shared.c
diff --git a/plugins/generic/mm-plugin-generic.c b/src/plugins/generic/mm-plugin-generic.c
similarity index 100%
rename from plugins/generic/mm-plugin-generic.c
rename to src/plugins/generic/mm-plugin-generic.c
diff --git a/plugins/generic/mm-plugin-generic.h b/src/plugins/generic/mm-plugin-generic.h
similarity index 100%
rename from plugins/generic/mm-plugin-generic.h
rename to src/plugins/generic/mm-plugin-generic.h
diff --git a/plugins/generic/tests/test-service-generic.c b/src/plugins/generic/tests/test-service-generic.c
similarity index 100%
rename from plugins/generic/tests/test-service-generic.c
rename to src/plugins/generic/tests/test-service-generic.c
diff --git a/plugins/gosuncn/77-mm-gosuncn-port-types.rules b/src/plugins/gosuncn/77-mm-gosuncn-port-types.rules
similarity index 100%
rename from plugins/gosuncn/77-mm-gosuncn-port-types.rules
rename to src/plugins/gosuncn/77-mm-gosuncn-port-types.rules
diff --git a/plugins/gosuncn/mm-plugin-gosuncn.c b/src/plugins/gosuncn/mm-plugin-gosuncn.c
similarity index 100%
rename from plugins/gosuncn/mm-plugin-gosuncn.c
rename to src/plugins/gosuncn/mm-plugin-gosuncn.c
diff --git a/plugins/gosuncn/mm-plugin-gosuncn.h b/src/plugins/gosuncn/mm-plugin-gosuncn.h
similarity index 100%
rename from plugins/gosuncn/mm-plugin-gosuncn.h
rename to src/plugins/gosuncn/mm-plugin-gosuncn.h
diff --git a/plugins/haier/77-mm-haier-port-types.rules b/src/plugins/haier/77-mm-haier-port-types.rules
similarity index 100%
rename from plugins/haier/77-mm-haier-port-types.rules
rename to src/plugins/haier/77-mm-haier-port-types.rules
diff --git a/plugins/haier/mm-plugin-haier.c b/src/plugins/haier/mm-plugin-haier.c
similarity index 100%
rename from plugins/haier/mm-plugin-haier.c
rename to src/plugins/haier/mm-plugin-haier.c
diff --git a/plugins/haier/mm-plugin-haier.h b/src/plugins/haier/mm-plugin-haier.h
similarity index 100%
rename from plugins/haier/mm-plugin-haier.h
rename to src/plugins/haier/mm-plugin-haier.h
diff --git a/plugins/huawei/77-mm-huawei-net-port-types.rules b/src/plugins/huawei/77-mm-huawei-net-port-types.rules
similarity index 100%
rename from plugins/huawei/77-mm-huawei-net-port-types.rules
rename to src/plugins/huawei/77-mm-huawei-net-port-types.rules
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.c b/src/plugins/huawei/mm-broadband-bearer-huawei.c
similarity index 100%
rename from plugins/huawei/mm-broadband-bearer-huawei.c
rename to src/plugins/huawei/mm-broadband-bearer-huawei.c
diff --git a/plugins/huawei/mm-broadband-bearer-huawei.h b/src/plugins/huawei/mm-broadband-bearer-huawei.h
similarity index 100%
rename from plugins/huawei/mm-broadband-bearer-huawei.h
rename to src/plugins/huawei/mm-broadband-bearer-huawei.h
diff --git a/plugins/huawei/mm-broadband-modem-huawei.c b/src/plugins/huawei/mm-broadband-modem-huawei.c
similarity index 100%
rename from plugins/huawei/mm-broadband-modem-huawei.c
rename to src/plugins/huawei/mm-broadband-modem-huawei.c
diff --git a/plugins/huawei/mm-broadband-modem-huawei.h b/src/plugins/huawei/mm-broadband-modem-huawei.h
similarity index 100%
rename from plugins/huawei/mm-broadband-modem-huawei.h
rename to src/plugins/huawei/mm-broadband-modem-huawei.h
diff --git a/plugins/huawei/mm-modem-helpers-huawei.c b/src/plugins/huawei/mm-modem-helpers-huawei.c
similarity index 100%
rename from plugins/huawei/mm-modem-helpers-huawei.c
rename to src/plugins/huawei/mm-modem-helpers-huawei.c
diff --git a/plugins/huawei/mm-modem-helpers-huawei.h b/src/plugins/huawei/mm-modem-helpers-huawei.h
similarity index 100%
rename from plugins/huawei/mm-modem-helpers-huawei.h
rename to src/plugins/huawei/mm-modem-helpers-huawei.h
diff --git a/plugins/huawei/mm-plugin-huawei.c b/src/plugins/huawei/mm-plugin-huawei.c
similarity index 100%
rename from plugins/huawei/mm-plugin-huawei.c
rename to src/plugins/huawei/mm-plugin-huawei.c
diff --git a/plugins/huawei/mm-plugin-huawei.h b/src/plugins/huawei/mm-plugin-huawei.h
similarity index 100%
rename from plugins/huawei/mm-plugin-huawei.h
rename to src/plugins/huawei/mm-plugin-huawei.h
diff --git a/plugins/huawei/mm-sim-huawei.c b/src/plugins/huawei/mm-sim-huawei.c
similarity index 100%
rename from plugins/huawei/mm-sim-huawei.c
rename to src/plugins/huawei/mm-sim-huawei.c
diff --git a/plugins/huawei/mm-sim-huawei.h b/src/plugins/huawei/mm-sim-huawei.h
similarity index 100%
rename from plugins/huawei/mm-sim-huawei.h
rename to src/plugins/huawei/mm-sim-huawei.h
diff --git a/plugins/huawei/tests/test-modem-helpers-huawei.c b/src/plugins/huawei/tests/test-modem-helpers-huawei.c
similarity index 100%
rename from plugins/huawei/tests/test-modem-helpers-huawei.c
rename to src/plugins/huawei/tests/test-modem-helpers-huawei.c
diff --git a/plugins/icera/mm-broadband-bearer-icera.c b/src/plugins/icera/mm-broadband-bearer-icera.c
similarity index 100%
rename from plugins/icera/mm-broadband-bearer-icera.c
rename to src/plugins/icera/mm-broadband-bearer-icera.c
diff --git a/plugins/icera/mm-broadband-bearer-icera.h b/src/plugins/icera/mm-broadband-bearer-icera.h
similarity index 100%
rename from plugins/icera/mm-broadband-bearer-icera.h
rename to src/plugins/icera/mm-broadband-bearer-icera.h
diff --git a/plugins/icera/mm-broadband-modem-icera.c b/src/plugins/icera/mm-broadband-modem-icera.c
similarity index 100%
rename from plugins/icera/mm-broadband-modem-icera.c
rename to src/plugins/icera/mm-broadband-modem-icera.c
diff --git a/plugins/icera/mm-broadband-modem-icera.h b/src/plugins/icera/mm-broadband-modem-icera.h
similarity index 100%
rename from plugins/icera/mm-broadband-modem-icera.h
rename to src/plugins/icera/mm-broadband-modem-icera.h
diff --git a/plugins/icera/mm-modem-helpers-icera.c b/src/plugins/icera/mm-modem-helpers-icera.c
similarity index 100%
rename from plugins/icera/mm-modem-helpers-icera.c
rename to src/plugins/icera/mm-modem-helpers-icera.c
diff --git a/plugins/icera/mm-modem-helpers-icera.h b/src/plugins/icera/mm-modem-helpers-icera.h
similarity index 100%
rename from plugins/icera/mm-modem-helpers-icera.h
rename to src/plugins/icera/mm-modem-helpers-icera.h
diff --git a/plugins/icera/mm-shared.c b/src/plugins/icera/mm-shared.c
similarity index 100%
rename from plugins/icera/mm-shared.c
rename to src/plugins/icera/mm-shared.c
diff --git a/plugins/icera/tests/test-modem-helpers-icera.c b/src/plugins/icera/tests/test-modem-helpers-icera.c
similarity index 100%
rename from plugins/icera/tests/test-modem-helpers-icera.c
rename to src/plugins/icera/tests/test-modem-helpers-icera.c
diff --git a/plugins/intel/mm-broadband-modem-mbim-intel.c b/src/plugins/intel/mm-broadband-modem-mbim-intel.c
similarity index 100%
rename from plugins/intel/mm-broadband-modem-mbim-intel.c
rename to src/plugins/intel/mm-broadband-modem-mbim-intel.c
diff --git a/plugins/intel/mm-broadband-modem-mbim-intel.h b/src/plugins/intel/mm-broadband-modem-mbim-intel.h
similarity index 100%
rename from plugins/intel/mm-broadband-modem-mbim-intel.h
rename to src/plugins/intel/mm-broadband-modem-mbim-intel.h
diff --git a/plugins/intel/mm-plugin-intel.c b/src/plugins/intel/mm-plugin-intel.c
similarity index 100%
rename from plugins/intel/mm-plugin-intel.c
rename to src/plugins/intel/mm-plugin-intel.c
diff --git a/plugins/intel/mm-plugin-intel.h b/src/plugins/intel/mm-plugin-intel.h
similarity index 100%
rename from plugins/intel/mm-plugin-intel.h
rename to src/plugins/intel/mm-plugin-intel.h
diff --git a/plugins/iridium/mm-bearer-iridium.c b/src/plugins/iridium/mm-bearer-iridium.c
similarity index 100%
rename from plugins/iridium/mm-bearer-iridium.c
rename to src/plugins/iridium/mm-bearer-iridium.c
diff --git a/plugins/iridium/mm-bearer-iridium.h b/src/plugins/iridium/mm-bearer-iridium.h
similarity index 100%
rename from plugins/iridium/mm-bearer-iridium.h
rename to src/plugins/iridium/mm-bearer-iridium.h
diff --git a/plugins/iridium/mm-broadband-modem-iridium.c b/src/plugins/iridium/mm-broadband-modem-iridium.c
similarity index 100%
rename from plugins/iridium/mm-broadband-modem-iridium.c
rename to src/plugins/iridium/mm-broadband-modem-iridium.c
diff --git a/plugins/iridium/mm-broadband-modem-iridium.h b/src/plugins/iridium/mm-broadband-modem-iridium.h
similarity index 100%
rename from plugins/iridium/mm-broadband-modem-iridium.h
rename to src/plugins/iridium/mm-broadband-modem-iridium.h
diff --git a/plugins/iridium/mm-plugin-iridium.c b/src/plugins/iridium/mm-plugin-iridium.c
similarity index 100%
rename from plugins/iridium/mm-plugin-iridium.c
rename to src/plugins/iridium/mm-plugin-iridium.c
diff --git a/plugins/iridium/mm-plugin-iridium.h b/src/plugins/iridium/mm-plugin-iridium.h
similarity index 100%
rename from plugins/iridium/mm-plugin-iridium.h
rename to src/plugins/iridium/mm-plugin-iridium.h
diff --git a/plugins/iridium/mm-sim-iridium.c b/src/plugins/iridium/mm-sim-iridium.c
similarity index 100%
rename from plugins/iridium/mm-sim-iridium.c
rename to src/plugins/iridium/mm-sim-iridium.c
diff --git a/plugins/iridium/mm-sim-iridium.h b/src/plugins/iridium/mm-sim-iridium.h
similarity index 100%
rename from plugins/iridium/mm-sim-iridium.h
rename to src/plugins/iridium/mm-sim-iridium.h
diff --git a/plugins/linktop/77-mm-linktop-port-types.rules b/src/plugins/linktop/77-mm-linktop-port-types.rules
similarity index 100%
rename from plugins/linktop/77-mm-linktop-port-types.rules
rename to src/plugins/linktop/77-mm-linktop-port-types.rules
diff --git a/plugins/linktop/mm-broadband-modem-linktop.c b/src/plugins/linktop/mm-broadband-modem-linktop.c
similarity index 100%
rename from plugins/linktop/mm-broadband-modem-linktop.c
rename to src/plugins/linktop/mm-broadband-modem-linktop.c
diff --git a/plugins/linktop/mm-broadband-modem-linktop.h b/src/plugins/linktop/mm-broadband-modem-linktop.h
similarity index 100%
rename from plugins/linktop/mm-broadband-modem-linktop.h
rename to src/plugins/linktop/mm-broadband-modem-linktop.h
diff --git a/plugins/linktop/mm-modem-helpers-linktop.c b/src/plugins/linktop/mm-modem-helpers-linktop.c
similarity index 100%
rename from plugins/linktop/mm-modem-helpers-linktop.c
rename to src/plugins/linktop/mm-modem-helpers-linktop.c
diff --git a/plugins/linktop/mm-modem-helpers-linktop.h b/src/plugins/linktop/mm-modem-helpers-linktop.h
similarity index 100%
rename from plugins/linktop/mm-modem-helpers-linktop.h
rename to src/plugins/linktop/mm-modem-helpers-linktop.h
diff --git a/plugins/linktop/mm-plugin-linktop.c b/src/plugins/linktop/mm-plugin-linktop.c
similarity index 100%
rename from plugins/linktop/mm-plugin-linktop.c
rename to src/plugins/linktop/mm-plugin-linktop.c
diff --git a/plugins/linktop/mm-plugin-linktop.h b/src/plugins/linktop/mm-plugin-linktop.h
similarity index 100%
rename from plugins/linktop/mm-plugin-linktop.h
rename to src/plugins/linktop/mm-plugin-linktop.h
diff --git a/plugins/linktop/tests/test-modem-helpers-linktop.c b/src/plugins/linktop/tests/test-modem-helpers-linktop.c
similarity index 100%
rename from plugins/linktop/tests/test-modem-helpers-linktop.c
rename to src/plugins/linktop/tests/test-modem-helpers-linktop.c
diff --git a/plugins/longcheer/77-mm-longcheer-port-types.rules b/src/plugins/longcheer/77-mm-longcheer-port-types.rules
similarity index 100%
rename from plugins/longcheer/77-mm-longcheer-port-types.rules
rename to src/plugins/longcheer/77-mm-longcheer-port-types.rules
diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.c b/src/plugins/longcheer/mm-broadband-modem-longcheer.c
similarity index 100%
rename from plugins/longcheer/mm-broadband-modem-longcheer.c
rename to src/plugins/longcheer/mm-broadband-modem-longcheer.c
diff --git a/plugins/longcheer/mm-broadband-modem-longcheer.h b/src/plugins/longcheer/mm-broadband-modem-longcheer.h
similarity index 100%
rename from plugins/longcheer/mm-broadband-modem-longcheer.h
rename to src/plugins/longcheer/mm-broadband-modem-longcheer.h
diff --git a/plugins/longcheer/mm-plugin-longcheer.c b/src/plugins/longcheer/mm-plugin-longcheer.c
similarity index 100%
rename from plugins/longcheer/mm-plugin-longcheer.c
rename to src/plugins/longcheer/mm-plugin-longcheer.c
diff --git a/plugins/longcheer/mm-plugin-longcheer.h b/src/plugins/longcheer/mm-plugin-longcheer.h
similarity index 100%
rename from plugins/longcheer/mm-plugin-longcheer.h
rename to src/plugins/longcheer/mm-plugin-longcheer.h
diff --git a/plugins/mbm/77-mm-ericsson-mbm.rules b/src/plugins/mbm/77-mm-ericsson-mbm.rules
similarity index 100%
rename from plugins/mbm/77-mm-ericsson-mbm.rules
rename to src/plugins/mbm/77-mm-ericsson-mbm.rules
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.c b/src/plugins/mbm/mm-broadband-bearer-mbm.c
similarity index 100%
rename from plugins/mbm/mm-broadband-bearer-mbm.c
rename to src/plugins/mbm/mm-broadband-bearer-mbm.c
diff --git a/plugins/mbm/mm-broadband-bearer-mbm.h b/src/plugins/mbm/mm-broadband-bearer-mbm.h
similarity index 100%
rename from plugins/mbm/mm-broadband-bearer-mbm.h
rename to src/plugins/mbm/mm-broadband-bearer-mbm.h
diff --git a/plugins/mbm/mm-broadband-modem-mbm.c b/src/plugins/mbm/mm-broadband-modem-mbm.c
similarity index 100%
rename from plugins/mbm/mm-broadband-modem-mbm.c
rename to src/plugins/mbm/mm-broadband-modem-mbm.c
diff --git a/plugins/mbm/mm-broadband-modem-mbm.h b/src/plugins/mbm/mm-broadband-modem-mbm.h
similarity index 100%
rename from plugins/mbm/mm-broadband-modem-mbm.h
rename to src/plugins/mbm/mm-broadband-modem-mbm.h
diff --git a/plugins/mbm/mm-modem-helpers-mbm.c b/src/plugins/mbm/mm-modem-helpers-mbm.c
similarity index 100%
rename from plugins/mbm/mm-modem-helpers-mbm.c
rename to src/plugins/mbm/mm-modem-helpers-mbm.c
diff --git a/plugins/mbm/mm-modem-helpers-mbm.h b/src/plugins/mbm/mm-modem-helpers-mbm.h
similarity index 100%
rename from plugins/mbm/mm-modem-helpers-mbm.h
rename to src/plugins/mbm/mm-modem-helpers-mbm.h
diff --git a/plugins/mbm/mm-plugin-mbm.c b/src/plugins/mbm/mm-plugin-mbm.c
similarity index 100%
rename from plugins/mbm/mm-plugin-mbm.c
rename to src/plugins/mbm/mm-plugin-mbm.c
diff --git a/plugins/mbm/mm-plugin-mbm.h b/src/plugins/mbm/mm-plugin-mbm.h
similarity index 100%
rename from plugins/mbm/mm-plugin-mbm.h
rename to src/plugins/mbm/mm-plugin-mbm.h
diff --git a/plugins/mbm/mm-sim-mbm.c b/src/plugins/mbm/mm-sim-mbm.c
similarity index 100%
rename from plugins/mbm/mm-sim-mbm.c
rename to src/plugins/mbm/mm-sim-mbm.c
diff --git a/plugins/mbm/mm-sim-mbm.h b/src/plugins/mbm/mm-sim-mbm.h
similarity index 100%
rename from plugins/mbm/mm-sim-mbm.h
rename to src/plugins/mbm/mm-sim-mbm.h
diff --git a/plugins/mbm/tests/test-modem-helpers-mbm.c b/src/plugins/mbm/tests/test-modem-helpers-mbm.c
similarity index 100%
rename from plugins/mbm/tests/test-modem-helpers-mbm.c
rename to src/plugins/mbm/tests/test-modem-helpers-mbm.c
diff --git a/plugins/meson.build b/src/plugins/meson.build
similarity index 100%
rename from plugins/meson.build
rename to src/plugins/meson.build
diff --git a/plugins/motorola/mm-broadband-modem-motorola.c b/src/plugins/motorola/mm-broadband-modem-motorola.c
similarity index 100%
rename from plugins/motorola/mm-broadband-modem-motorola.c
rename to src/plugins/motorola/mm-broadband-modem-motorola.c
diff --git a/plugins/motorola/mm-broadband-modem-motorola.h b/src/plugins/motorola/mm-broadband-modem-motorola.h
similarity index 100%
rename from plugins/motorola/mm-broadband-modem-motorola.h
rename to src/plugins/motorola/mm-broadband-modem-motorola.h
diff --git a/plugins/motorola/mm-plugin-motorola.c b/src/plugins/motorola/mm-plugin-motorola.c
similarity index 100%
rename from plugins/motorola/mm-plugin-motorola.c
rename to src/plugins/motorola/mm-plugin-motorola.c
diff --git a/plugins/motorola/mm-plugin-motorola.h b/src/plugins/motorola/mm-plugin-motorola.h
similarity index 100%
rename from plugins/motorola/mm-plugin-motorola.h
rename to src/plugins/motorola/mm-plugin-motorola.h
diff --git a/plugins/mtk/77-mm-mtk-port-types.rules b/src/plugins/mtk/77-mm-mtk-port-types.rules
similarity index 100%
rename from plugins/mtk/77-mm-mtk-port-types.rules
rename to src/plugins/mtk/77-mm-mtk-port-types.rules
diff --git a/plugins/mtk/mm-broadband-modem-mtk.c b/src/plugins/mtk/mm-broadband-modem-mtk.c
similarity index 100%
rename from plugins/mtk/mm-broadband-modem-mtk.c
rename to src/plugins/mtk/mm-broadband-modem-mtk.c
diff --git a/plugins/mtk/mm-broadband-modem-mtk.h b/src/plugins/mtk/mm-broadband-modem-mtk.h
similarity index 100%
rename from plugins/mtk/mm-broadband-modem-mtk.h
rename to src/plugins/mtk/mm-broadband-modem-mtk.h
diff --git a/plugins/mtk/mm-plugin-mtk.c b/src/plugins/mtk/mm-plugin-mtk.c
similarity index 100%
rename from plugins/mtk/mm-plugin-mtk.c
rename to src/plugins/mtk/mm-plugin-mtk.c
diff --git a/plugins/mtk/mm-plugin-mtk.h b/src/plugins/mtk/mm-plugin-mtk.h
similarity index 100%
rename from plugins/mtk/mm-plugin-mtk.h
rename to src/plugins/mtk/mm-plugin-mtk.h
diff --git a/plugins/nokia/77-mm-nokia-port-types.rules b/src/plugins/nokia/77-mm-nokia-port-types.rules
similarity index 100%
rename from plugins/nokia/77-mm-nokia-port-types.rules
rename to src/plugins/nokia/77-mm-nokia-port-types.rules
diff --git a/plugins/nokia/mm-broadband-modem-nokia.c b/src/plugins/nokia/mm-broadband-modem-nokia.c
similarity index 100%
rename from plugins/nokia/mm-broadband-modem-nokia.c
rename to src/plugins/nokia/mm-broadband-modem-nokia.c
diff --git a/plugins/nokia/mm-broadband-modem-nokia.h b/src/plugins/nokia/mm-broadband-modem-nokia.h
similarity index 100%
rename from plugins/nokia/mm-broadband-modem-nokia.h
rename to src/plugins/nokia/mm-broadband-modem-nokia.h
diff --git a/plugins/nokia/mm-plugin-nokia-icera.c b/src/plugins/nokia/mm-plugin-nokia-icera.c
similarity index 100%
rename from plugins/nokia/mm-plugin-nokia-icera.c
rename to src/plugins/nokia/mm-plugin-nokia-icera.c
diff --git a/plugins/nokia/mm-plugin-nokia-icera.h b/src/plugins/nokia/mm-plugin-nokia-icera.h
similarity index 100%
rename from plugins/nokia/mm-plugin-nokia-icera.h
rename to src/plugins/nokia/mm-plugin-nokia-icera.h
diff --git a/plugins/nokia/mm-plugin-nokia.c b/src/plugins/nokia/mm-plugin-nokia.c
similarity index 100%
rename from plugins/nokia/mm-plugin-nokia.c
rename to src/plugins/nokia/mm-plugin-nokia.c
diff --git a/plugins/nokia/mm-plugin-nokia.h b/src/plugins/nokia/mm-plugin-nokia.h
similarity index 100%
rename from plugins/nokia/mm-plugin-nokia.h
rename to src/plugins/nokia/mm-plugin-nokia.h
diff --git a/plugins/nokia/mm-sim-nokia.c b/src/plugins/nokia/mm-sim-nokia.c
similarity index 100%
rename from plugins/nokia/mm-sim-nokia.c
rename to src/plugins/nokia/mm-sim-nokia.c
diff --git a/plugins/nokia/mm-sim-nokia.h b/src/plugins/nokia/mm-sim-nokia.h
similarity index 100%
rename from plugins/nokia/mm-sim-nokia.h
rename to src/plugins/nokia/mm-sim-nokia.h
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.c b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.c
similarity index 100%
rename from plugins/novatel/mm-broadband-bearer-novatel-lte.c
rename to src/plugins/novatel/mm-broadband-bearer-novatel-lte.c
diff --git a/plugins/novatel/mm-broadband-bearer-novatel-lte.h b/src/plugins/novatel/mm-broadband-bearer-novatel-lte.h
similarity index 100%
rename from plugins/novatel/mm-broadband-bearer-novatel-lte.h
rename to src/plugins/novatel/mm-broadband-bearer-novatel-lte.h
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.c b/src/plugins/novatel/mm-broadband-modem-novatel-lte.c
similarity index 100%
rename from plugins/novatel/mm-broadband-modem-novatel-lte.c
rename to src/plugins/novatel/mm-broadband-modem-novatel-lte.c
diff --git a/plugins/novatel/mm-broadband-modem-novatel-lte.h b/src/plugins/novatel/mm-broadband-modem-novatel-lte.h
similarity index 100%
rename from plugins/novatel/mm-broadband-modem-novatel-lte.h
rename to src/plugins/novatel/mm-broadband-modem-novatel-lte.h
diff --git a/plugins/novatel/mm-broadband-modem-novatel.c b/src/plugins/novatel/mm-broadband-modem-novatel.c
similarity index 100%
rename from plugins/novatel/mm-broadband-modem-novatel.c
rename to src/plugins/novatel/mm-broadband-modem-novatel.c
diff --git a/plugins/novatel/mm-broadband-modem-novatel.h b/src/plugins/novatel/mm-broadband-modem-novatel.h
similarity index 100%
rename from plugins/novatel/mm-broadband-modem-novatel.h
rename to src/plugins/novatel/mm-broadband-modem-novatel.h
diff --git a/plugins/novatel/mm-common-novatel.c b/src/plugins/novatel/mm-common-novatel.c
similarity index 100%
rename from plugins/novatel/mm-common-novatel.c
rename to src/plugins/novatel/mm-common-novatel.c
diff --git a/plugins/novatel/mm-common-novatel.h b/src/plugins/novatel/mm-common-novatel.h
similarity index 100%
rename from plugins/novatel/mm-common-novatel.h
rename to src/plugins/novatel/mm-common-novatel.h
diff --git a/plugins/novatel/mm-plugin-novatel-lte.c b/src/plugins/novatel/mm-plugin-novatel-lte.c
similarity index 100%
rename from plugins/novatel/mm-plugin-novatel-lte.c
rename to src/plugins/novatel/mm-plugin-novatel-lte.c
diff --git a/plugins/novatel/mm-plugin-novatel-lte.h b/src/plugins/novatel/mm-plugin-novatel-lte.h
similarity index 100%
rename from plugins/novatel/mm-plugin-novatel-lte.h
rename to src/plugins/novatel/mm-plugin-novatel-lte.h
diff --git a/plugins/novatel/mm-plugin-novatel.c b/src/plugins/novatel/mm-plugin-novatel.c
similarity index 100%
rename from plugins/novatel/mm-plugin-novatel.c
rename to src/plugins/novatel/mm-plugin-novatel.c
diff --git a/plugins/novatel/mm-plugin-novatel.h b/src/plugins/novatel/mm-plugin-novatel.h
similarity index 100%
rename from plugins/novatel/mm-plugin-novatel.h
rename to src/plugins/novatel/mm-plugin-novatel.h
diff --git a/plugins/novatel/mm-shared.c b/src/plugins/novatel/mm-shared.c
similarity index 100%
rename from plugins/novatel/mm-shared.c
rename to src/plugins/novatel/mm-shared.c
diff --git a/plugins/novatel/mm-sim-novatel-lte.c b/src/plugins/novatel/mm-sim-novatel-lte.c
similarity index 100%
rename from plugins/novatel/mm-sim-novatel-lte.c
rename to src/plugins/novatel/mm-sim-novatel-lte.c
diff --git a/plugins/novatel/mm-sim-novatel-lte.h b/src/plugins/novatel/mm-sim-novatel-lte.h
similarity index 100%
rename from plugins/novatel/mm-sim-novatel-lte.h
rename to src/plugins/novatel/mm-sim-novatel-lte.h
diff --git a/plugins/option/mm-broadband-bearer-hso.c b/src/plugins/option/mm-broadband-bearer-hso.c
similarity index 100%
rename from plugins/option/mm-broadband-bearer-hso.c
rename to src/plugins/option/mm-broadband-bearer-hso.c
diff --git a/plugins/option/mm-broadband-bearer-hso.h b/src/plugins/option/mm-broadband-bearer-hso.h
similarity index 100%
rename from plugins/option/mm-broadband-bearer-hso.h
rename to src/plugins/option/mm-broadband-bearer-hso.h
diff --git a/plugins/option/mm-broadband-modem-hso.c b/src/plugins/option/mm-broadband-modem-hso.c
similarity index 100%
rename from plugins/option/mm-broadband-modem-hso.c
rename to src/plugins/option/mm-broadband-modem-hso.c
diff --git a/plugins/option/mm-broadband-modem-hso.h b/src/plugins/option/mm-broadband-modem-hso.h
similarity index 100%
rename from plugins/option/mm-broadband-modem-hso.h
rename to src/plugins/option/mm-broadband-modem-hso.h
diff --git a/plugins/option/mm-broadband-modem-option.c b/src/plugins/option/mm-broadband-modem-option.c
similarity index 100%
rename from plugins/option/mm-broadband-modem-option.c
rename to src/plugins/option/mm-broadband-modem-option.c
diff --git a/plugins/option/mm-broadband-modem-option.h b/src/plugins/option/mm-broadband-modem-option.h
similarity index 100%
rename from plugins/option/mm-broadband-modem-option.h
rename to src/plugins/option/mm-broadband-modem-option.h
diff --git a/plugins/option/mm-plugin-hso.c b/src/plugins/option/mm-plugin-hso.c
similarity index 100%
rename from plugins/option/mm-plugin-hso.c
rename to src/plugins/option/mm-plugin-hso.c
diff --git a/plugins/option/mm-plugin-hso.h b/src/plugins/option/mm-plugin-hso.h
similarity index 100%
rename from plugins/option/mm-plugin-hso.h
rename to src/plugins/option/mm-plugin-hso.h
diff --git a/plugins/option/mm-plugin-option.c b/src/plugins/option/mm-plugin-option.c
similarity index 100%
rename from plugins/option/mm-plugin-option.c
rename to src/plugins/option/mm-plugin-option.c
diff --git a/plugins/option/mm-plugin-option.h b/src/plugins/option/mm-plugin-option.h
similarity index 100%
rename from plugins/option/mm-plugin-option.h
rename to src/plugins/option/mm-plugin-option.h
diff --git a/plugins/option/mm-shared-option.c b/src/plugins/option/mm-shared-option.c
similarity index 100%
rename from plugins/option/mm-shared-option.c
rename to src/plugins/option/mm-shared-option.c
diff --git a/plugins/option/mm-shared-option.h b/src/plugins/option/mm-shared-option.h
similarity index 100%
rename from plugins/option/mm-shared-option.h
rename to src/plugins/option/mm-shared-option.h
diff --git a/plugins/option/mm-shared.c b/src/plugins/option/mm-shared.c
similarity index 100%
rename from plugins/option/mm-shared.c
rename to src/plugins/option/mm-shared.c
diff --git a/plugins/option/mm-sim-option.c b/src/plugins/option/mm-sim-option.c
similarity index 100%
rename from plugins/option/mm-sim-option.c
rename to src/plugins/option/mm-sim-option.c
diff --git a/plugins/option/mm-sim-option.h b/src/plugins/option/mm-sim-option.h
similarity index 100%
rename from plugins/option/mm-sim-option.h
rename to src/plugins/option/mm-sim-option.h
diff --git a/plugins/pantech/mm-broadband-modem-pantech.c b/src/plugins/pantech/mm-broadband-modem-pantech.c
similarity index 100%
rename from plugins/pantech/mm-broadband-modem-pantech.c
rename to src/plugins/pantech/mm-broadband-modem-pantech.c
diff --git a/plugins/pantech/mm-broadband-modem-pantech.h b/src/plugins/pantech/mm-broadband-modem-pantech.h
similarity index 100%
rename from plugins/pantech/mm-broadband-modem-pantech.h
rename to src/plugins/pantech/mm-broadband-modem-pantech.h
diff --git a/plugins/pantech/mm-plugin-pantech.c b/src/plugins/pantech/mm-plugin-pantech.c
similarity index 100%
rename from plugins/pantech/mm-plugin-pantech.c
rename to src/plugins/pantech/mm-plugin-pantech.c
diff --git a/plugins/pantech/mm-plugin-pantech.h b/src/plugins/pantech/mm-plugin-pantech.h
similarity index 100%
rename from plugins/pantech/mm-plugin-pantech.h
rename to src/plugins/pantech/mm-plugin-pantech.h
diff --git a/plugins/pantech/mm-sim-pantech.c b/src/plugins/pantech/mm-sim-pantech.c
similarity index 100%
rename from plugins/pantech/mm-sim-pantech.c
rename to src/plugins/pantech/mm-sim-pantech.c
diff --git a/plugins/pantech/mm-sim-pantech.h b/src/plugins/pantech/mm-sim-pantech.h
similarity index 100%
rename from plugins/pantech/mm-sim-pantech.h
rename to src/plugins/pantech/mm-sim-pantech.h
diff --git a/plugins/qcom-soc/77-mm-qcom-soc.rules b/src/plugins/qcom-soc/77-mm-qcom-soc.rules
similarity index 100%
rename from plugins/qcom-soc/77-mm-qcom-soc.rules
rename to src/plugins/qcom-soc/77-mm-qcom-soc.rules
diff --git a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
similarity index 100%
rename from plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
rename to src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.c
diff --git a/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h b/src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
similarity index 100%
rename from plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
rename to src/plugins/qcom-soc/mm-broadband-modem-qmi-qcom-soc.h
diff --git a/plugins/qcom-soc/mm-plugin-qcom-soc.c b/src/plugins/qcom-soc/mm-plugin-qcom-soc.c
similarity index 100%
rename from plugins/qcom-soc/mm-plugin-qcom-soc.c
rename to src/plugins/qcom-soc/mm-plugin-qcom-soc.c
diff --git a/plugins/qcom-soc/mm-plugin-qcom-soc.h b/src/plugins/qcom-soc/mm-plugin-qcom-soc.h
similarity index 100%
rename from plugins/qcom-soc/mm-plugin-qcom-soc.h
rename to src/plugins/qcom-soc/mm-plugin-qcom-soc.h
diff --git a/plugins/quectel/77-mm-quectel-port-types.rules b/src/plugins/quectel/77-mm-quectel-port-types.rules
similarity index 100%
rename from plugins/quectel/77-mm-quectel-port-types.rules
rename to src/plugins/quectel/77-mm-quectel-port-types.rules
diff --git a/plugins/quectel/mm-broadband-modem-mbim-quectel.c b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-mbim-quectel.c
rename to src/plugins/quectel/mm-broadband-modem-mbim-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-mbim-quectel.h b/src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-mbim-quectel.h
rename to src/plugins/quectel/mm-broadband-modem-mbim-quectel.h
diff --git a/plugins/quectel/mm-broadband-modem-qmi-quectel.c b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-qmi-quectel.c
rename to src/plugins/quectel/mm-broadband-modem-qmi-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-qmi-quectel.h b/src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-qmi-quectel.h
rename to src/plugins/quectel/mm-broadband-modem-qmi-quectel.h
diff --git a/plugins/quectel/mm-broadband-modem-quectel.c b/src/plugins/quectel/mm-broadband-modem-quectel.c
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-quectel.c
rename to src/plugins/quectel/mm-broadband-modem-quectel.c
diff --git a/plugins/quectel/mm-broadband-modem-quectel.h b/src/plugins/quectel/mm-broadband-modem-quectel.h
similarity index 100%
rename from plugins/quectel/mm-broadband-modem-quectel.h
rename to src/plugins/quectel/mm-broadband-modem-quectel.h
diff --git a/plugins/quectel/mm-modem-helpers-quectel.c b/src/plugins/quectel/mm-modem-helpers-quectel.c
similarity index 100%
rename from plugins/quectel/mm-modem-helpers-quectel.c
rename to src/plugins/quectel/mm-modem-helpers-quectel.c
diff --git a/plugins/quectel/mm-modem-helpers-quectel.h b/src/plugins/quectel/mm-modem-helpers-quectel.h
similarity index 100%
rename from plugins/quectel/mm-modem-helpers-quectel.h
rename to src/plugins/quectel/mm-modem-helpers-quectel.h
diff --git a/plugins/quectel/mm-plugin-quectel.c b/src/plugins/quectel/mm-plugin-quectel.c
similarity index 100%
rename from plugins/quectel/mm-plugin-quectel.c
rename to src/plugins/quectel/mm-plugin-quectel.c
diff --git a/plugins/quectel/mm-plugin-quectel.h b/src/plugins/quectel/mm-plugin-quectel.h
similarity index 100%
rename from plugins/quectel/mm-plugin-quectel.h
rename to src/plugins/quectel/mm-plugin-quectel.h
diff --git a/plugins/quectel/mm-shared-quectel.c b/src/plugins/quectel/mm-shared-quectel.c
similarity index 100%
rename from plugins/quectel/mm-shared-quectel.c
rename to src/plugins/quectel/mm-shared-quectel.c
diff --git a/plugins/quectel/mm-shared-quectel.h b/src/plugins/quectel/mm-shared-quectel.h
similarity index 100%
rename from plugins/quectel/mm-shared-quectel.h
rename to src/plugins/quectel/mm-shared-quectel.h
diff --git a/plugins/quectel/tests/test-modem-helpers-quectel.c b/src/plugins/quectel/tests/test-modem-helpers-quectel.c
similarity index 100%
rename from plugins/quectel/tests/test-modem-helpers-quectel.c
rename to src/plugins/quectel/tests/test-modem-helpers-quectel.c
diff --git a/plugins/samsung/mm-broadband-modem-samsung.c b/src/plugins/samsung/mm-broadband-modem-samsung.c
similarity index 100%
rename from plugins/samsung/mm-broadband-modem-samsung.c
rename to src/plugins/samsung/mm-broadband-modem-samsung.c
diff --git a/plugins/samsung/mm-broadband-modem-samsung.h b/src/plugins/samsung/mm-broadband-modem-samsung.h
similarity index 100%
rename from plugins/samsung/mm-broadband-modem-samsung.h
rename to src/plugins/samsung/mm-broadband-modem-samsung.h
diff --git a/plugins/samsung/mm-plugin-samsung.c b/src/plugins/samsung/mm-plugin-samsung.c
similarity index 100%
rename from plugins/samsung/mm-plugin-samsung.c
rename to src/plugins/samsung/mm-plugin-samsung.c
diff --git a/plugins/samsung/mm-plugin-samsung.h b/src/plugins/samsung/mm-plugin-samsung.h
similarity index 100%
rename from plugins/samsung/mm-plugin-samsung.h
rename to src/plugins/samsung/mm-plugin-samsung.h
diff --git a/plugins/sierra/77-mm-sierra.rules b/src/plugins/sierra/77-mm-sierra.rules
similarity index 100%
rename from plugins/sierra/77-mm-sierra.rules
rename to src/plugins/sierra/77-mm-sierra.rules
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.c b/src/plugins/sierra/mm-broadband-bearer-sierra.c
similarity index 100%
rename from plugins/sierra/mm-broadband-bearer-sierra.c
rename to src/plugins/sierra/mm-broadband-bearer-sierra.c
diff --git a/plugins/sierra/mm-broadband-bearer-sierra.h b/src/plugins/sierra/mm-broadband-bearer-sierra.h
similarity index 100%
rename from plugins/sierra/mm-broadband-bearer-sierra.h
rename to src/plugins/sierra/mm-broadband-bearer-sierra.h
diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.c b/src/plugins/sierra/mm-broadband-modem-sierra-icera.c
similarity index 100%
rename from plugins/sierra/mm-broadband-modem-sierra-icera.c
rename to src/plugins/sierra/mm-broadband-modem-sierra-icera.c
diff --git a/plugins/sierra/mm-broadband-modem-sierra-icera.h b/src/plugins/sierra/mm-broadband-modem-sierra-icera.h
similarity index 100%
rename from plugins/sierra/mm-broadband-modem-sierra-icera.h
rename to src/plugins/sierra/mm-broadband-modem-sierra-icera.h
diff --git a/plugins/sierra/mm-broadband-modem-sierra.c b/src/plugins/sierra/mm-broadband-modem-sierra.c
similarity index 100%
rename from plugins/sierra/mm-broadband-modem-sierra.c
rename to src/plugins/sierra/mm-broadband-modem-sierra.c
diff --git a/plugins/sierra/mm-broadband-modem-sierra.h b/src/plugins/sierra/mm-broadband-modem-sierra.h
similarity index 100%
rename from plugins/sierra/mm-broadband-modem-sierra.h
rename to src/plugins/sierra/mm-broadband-modem-sierra.h
diff --git a/plugins/sierra/mm-common-sierra.c b/src/plugins/sierra/mm-common-sierra.c
similarity index 100%
rename from plugins/sierra/mm-common-sierra.c
rename to src/plugins/sierra/mm-common-sierra.c
diff --git a/plugins/sierra/mm-common-sierra.h b/src/plugins/sierra/mm-common-sierra.h
similarity index 100%
rename from plugins/sierra/mm-common-sierra.h
rename to src/plugins/sierra/mm-common-sierra.h
diff --git a/plugins/sierra/mm-modem-helpers-sierra.c b/src/plugins/sierra/mm-modem-helpers-sierra.c
similarity index 100%
rename from plugins/sierra/mm-modem-helpers-sierra.c
rename to src/plugins/sierra/mm-modem-helpers-sierra.c
diff --git a/plugins/sierra/mm-modem-helpers-sierra.h b/src/plugins/sierra/mm-modem-helpers-sierra.h
similarity index 100%
rename from plugins/sierra/mm-modem-helpers-sierra.h
rename to src/plugins/sierra/mm-modem-helpers-sierra.h
diff --git a/plugins/sierra/mm-plugin-sierra-legacy.c b/src/plugins/sierra/mm-plugin-sierra-legacy.c
similarity index 100%
rename from plugins/sierra/mm-plugin-sierra-legacy.c
rename to src/plugins/sierra/mm-plugin-sierra-legacy.c
diff --git a/plugins/sierra/mm-plugin-sierra-legacy.h b/src/plugins/sierra/mm-plugin-sierra-legacy.h
similarity index 100%
rename from plugins/sierra/mm-plugin-sierra-legacy.h
rename to src/plugins/sierra/mm-plugin-sierra-legacy.h
diff --git a/plugins/sierra/mm-plugin-sierra.c b/src/plugins/sierra/mm-plugin-sierra.c
similarity index 100%
rename from plugins/sierra/mm-plugin-sierra.c
rename to src/plugins/sierra/mm-plugin-sierra.c
diff --git a/plugins/sierra/mm-plugin-sierra.h b/src/plugins/sierra/mm-plugin-sierra.h
similarity index 100%
rename from plugins/sierra/mm-plugin-sierra.h
rename to src/plugins/sierra/mm-plugin-sierra.h
diff --git a/plugins/sierra/mm-shared.c b/src/plugins/sierra/mm-shared.c
similarity index 100%
rename from plugins/sierra/mm-shared.c
rename to src/plugins/sierra/mm-shared.c
diff --git a/plugins/sierra/mm-sim-sierra.c b/src/plugins/sierra/mm-sim-sierra.c
similarity index 100%
rename from plugins/sierra/mm-sim-sierra.c
rename to src/plugins/sierra/mm-sim-sierra.c
diff --git a/plugins/sierra/mm-sim-sierra.h b/src/plugins/sierra/mm-sim-sierra.h
similarity index 100%
rename from plugins/sierra/mm-sim-sierra.h
rename to src/plugins/sierra/mm-sim-sierra.h
diff --git a/plugins/sierra/tests/test-modem-helpers-sierra.c b/src/plugins/sierra/tests/test-modem-helpers-sierra.c
similarity index 100%
rename from plugins/sierra/tests/test-modem-helpers-sierra.c
rename to src/plugins/sierra/tests/test-modem-helpers-sierra.c
diff --git a/plugins/simtech/77-mm-simtech-port-types.rules b/src/plugins/simtech/77-mm-simtech-port-types.rules
similarity index 100%
rename from plugins/simtech/77-mm-simtech-port-types.rules
rename to src/plugins/simtech/77-mm-simtech-port-types.rules
diff --git a/plugins/simtech/mm-broadband-modem-qmi-simtech.c b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
similarity index 100%
rename from plugins/simtech/mm-broadband-modem-qmi-simtech.c
rename to src/plugins/simtech/mm-broadband-modem-qmi-simtech.c
diff --git a/plugins/simtech/mm-broadband-modem-qmi-simtech.h b/src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
similarity index 100%
rename from plugins/simtech/mm-broadband-modem-qmi-simtech.h
rename to src/plugins/simtech/mm-broadband-modem-qmi-simtech.h
diff --git a/plugins/simtech/mm-broadband-modem-simtech.c b/src/plugins/simtech/mm-broadband-modem-simtech.c
similarity index 100%
rename from plugins/simtech/mm-broadband-modem-simtech.c
rename to src/plugins/simtech/mm-broadband-modem-simtech.c
diff --git a/plugins/simtech/mm-broadband-modem-simtech.h b/src/plugins/simtech/mm-broadband-modem-simtech.h
similarity index 100%
rename from plugins/simtech/mm-broadband-modem-simtech.h
rename to src/plugins/simtech/mm-broadband-modem-simtech.h
diff --git a/plugins/simtech/mm-modem-helpers-simtech.c b/src/plugins/simtech/mm-modem-helpers-simtech.c
similarity index 100%
rename from plugins/simtech/mm-modem-helpers-simtech.c
rename to src/plugins/simtech/mm-modem-helpers-simtech.c
diff --git a/plugins/simtech/mm-modem-helpers-simtech.h b/src/plugins/simtech/mm-modem-helpers-simtech.h
similarity index 100%
rename from plugins/simtech/mm-modem-helpers-simtech.h
rename to src/plugins/simtech/mm-modem-helpers-simtech.h
diff --git a/plugins/simtech/mm-plugin-simtech.c b/src/plugins/simtech/mm-plugin-simtech.c
similarity index 100%
rename from plugins/simtech/mm-plugin-simtech.c
rename to src/plugins/simtech/mm-plugin-simtech.c
diff --git a/plugins/simtech/mm-plugin-simtech.h b/src/plugins/simtech/mm-plugin-simtech.h
similarity index 100%
rename from plugins/simtech/mm-plugin-simtech.h
rename to src/plugins/simtech/mm-plugin-simtech.h
diff --git a/plugins/simtech/mm-shared-simtech.c b/src/plugins/simtech/mm-shared-simtech.c
similarity index 100%
rename from plugins/simtech/mm-shared-simtech.c
rename to src/plugins/simtech/mm-shared-simtech.c
diff --git a/plugins/simtech/mm-shared-simtech.h b/src/plugins/simtech/mm-shared-simtech.h
similarity index 100%
rename from plugins/simtech/mm-shared-simtech.h
rename to src/plugins/simtech/mm-shared-simtech.h
diff --git a/plugins/simtech/tests/test-modem-helpers-simtech.c b/src/plugins/simtech/tests/test-modem-helpers-simtech.c
similarity index 100%
rename from plugins/simtech/tests/test-modem-helpers-simtech.c
rename to src/plugins/simtech/tests/test-modem-helpers-simtech.c
diff --git a/plugins/symbol.map b/src/plugins/symbol.map
similarity index 100%
rename from plugins/symbol.map
rename to src/plugins/symbol.map
diff --git a/plugins/telit/77-mm-telit-port-types.rules b/src/plugins/telit/77-mm-telit-port-types.rules
similarity index 100%
rename from plugins/telit/77-mm-telit-port-types.rules
rename to src/plugins/telit/77-mm-telit-port-types.rules
diff --git a/plugins/telit/mm-broadband-modem-mbim-telit.c b/src/plugins/telit/mm-broadband-modem-mbim-telit.c
similarity index 100%
rename from plugins/telit/mm-broadband-modem-mbim-telit.c
rename to src/plugins/telit/mm-broadband-modem-mbim-telit.c
diff --git a/plugins/telit/mm-broadband-modem-mbim-telit.h b/src/plugins/telit/mm-broadband-modem-mbim-telit.h
similarity index 100%
rename from plugins/telit/mm-broadband-modem-mbim-telit.h
rename to src/plugins/telit/mm-broadband-modem-mbim-telit.h
diff --git a/plugins/telit/mm-broadband-modem-telit.c b/src/plugins/telit/mm-broadband-modem-telit.c
similarity index 100%
rename from plugins/telit/mm-broadband-modem-telit.c
rename to src/plugins/telit/mm-broadband-modem-telit.c
diff --git a/plugins/telit/mm-broadband-modem-telit.h b/src/plugins/telit/mm-broadband-modem-telit.h
similarity index 100%
rename from plugins/telit/mm-broadband-modem-telit.h
rename to src/plugins/telit/mm-broadband-modem-telit.h
diff --git a/plugins/telit/mm-common-telit.c b/src/plugins/telit/mm-common-telit.c
similarity index 100%
rename from plugins/telit/mm-common-telit.c
rename to src/plugins/telit/mm-common-telit.c
diff --git a/plugins/telit/mm-common-telit.h b/src/plugins/telit/mm-common-telit.h
similarity index 100%
rename from plugins/telit/mm-common-telit.h
rename to src/plugins/telit/mm-common-telit.h
diff --git a/plugins/telit/mm-modem-helpers-telit.c b/src/plugins/telit/mm-modem-helpers-telit.c
similarity index 100%
rename from plugins/telit/mm-modem-helpers-telit.c
rename to src/plugins/telit/mm-modem-helpers-telit.c
diff --git a/plugins/telit/mm-modem-helpers-telit.h b/src/plugins/telit/mm-modem-helpers-telit.h
similarity index 100%
rename from plugins/telit/mm-modem-helpers-telit.h
rename to src/plugins/telit/mm-modem-helpers-telit.h
diff --git a/plugins/telit/mm-plugin-telit.c b/src/plugins/telit/mm-plugin-telit.c
similarity index 100%
rename from plugins/telit/mm-plugin-telit.c
rename to src/plugins/telit/mm-plugin-telit.c
diff --git a/plugins/telit/mm-plugin-telit.h b/src/plugins/telit/mm-plugin-telit.h
similarity index 100%
rename from plugins/telit/mm-plugin-telit.h
rename to src/plugins/telit/mm-plugin-telit.h
diff --git a/plugins/telit/mm-shared-telit.c b/src/plugins/telit/mm-shared-telit.c
similarity index 100%
rename from plugins/telit/mm-shared-telit.c
rename to src/plugins/telit/mm-shared-telit.c
diff --git a/plugins/telit/mm-shared-telit.h b/src/plugins/telit/mm-shared-telit.h
similarity index 100%
rename from plugins/telit/mm-shared-telit.h
rename to src/plugins/telit/mm-shared-telit.h
diff --git a/plugins/telit/mm-shared.c b/src/plugins/telit/mm-shared.c
similarity index 100%
rename from plugins/telit/mm-shared.c
rename to src/plugins/telit/mm-shared.c
diff --git a/plugins/telit/tests/test-mm-modem-helpers-telit.c b/src/plugins/telit/tests/test-mm-modem-helpers-telit.c
similarity index 100%
rename from plugins/telit/tests/test-mm-modem-helpers-telit.c
rename to src/plugins/telit/tests/test-mm-modem-helpers-telit.c
diff --git a/plugins/tests/gsm-port.conf b/src/plugins/tests/gsm-port.conf
similarity index 100%
rename from plugins/tests/gsm-port.conf
rename to src/plugins/tests/gsm-port.conf
diff --git a/plugins/tests/test-fixture.c b/src/plugins/tests/test-fixture.c
similarity index 100%
rename from plugins/tests/test-fixture.c
rename to src/plugins/tests/test-fixture.c
diff --git a/plugins/tests/test-fixture.h b/src/plugins/tests/test-fixture.h
similarity index 100%
rename from plugins/tests/test-fixture.h
rename to src/plugins/tests/test-fixture.h
diff --git a/plugins/tests/test-helpers.c b/src/plugins/tests/test-helpers.c
similarity index 100%
rename from plugins/tests/test-helpers.c
rename to src/plugins/tests/test-helpers.c
diff --git a/plugins/tests/test-helpers.h b/src/plugins/tests/test-helpers.h
similarity index 100%
rename from plugins/tests/test-helpers.h
rename to src/plugins/tests/test-helpers.h
diff --git a/plugins/tests/test-keyfiles.c b/src/plugins/tests/test-keyfiles.c
similarity index 100%
rename from plugins/tests/test-keyfiles.c
rename to src/plugins/tests/test-keyfiles.c
diff --git a/plugins/tests/test-port-context.c b/src/plugins/tests/test-port-context.c
similarity index 100%
rename from plugins/tests/test-port-context.c
rename to src/plugins/tests/test-port-context.c
diff --git a/plugins/tests/test-port-context.h b/src/plugins/tests/test-port-context.h
similarity index 100%
rename from plugins/tests/test-port-context.h
rename to src/plugins/tests/test-port-context.h
diff --git a/plugins/tests/test-udev-rules.c b/src/plugins/tests/test-udev-rules.c
similarity index 100%
rename from plugins/tests/test-udev-rules.c
rename to src/plugins/tests/test-udev-rules.c
diff --git a/plugins/thuraya/mm-broadband-modem-thuraya.c b/src/plugins/thuraya/mm-broadband-modem-thuraya.c
similarity index 100%
rename from plugins/thuraya/mm-broadband-modem-thuraya.c
rename to src/plugins/thuraya/mm-broadband-modem-thuraya.c
diff --git a/plugins/thuraya/mm-broadband-modem-thuraya.h b/src/plugins/thuraya/mm-broadband-modem-thuraya.h
similarity index 100%
rename from plugins/thuraya/mm-broadband-modem-thuraya.h
rename to src/plugins/thuraya/mm-broadband-modem-thuraya.h
diff --git a/plugins/thuraya/mm-modem-helpers-thuraya.c b/src/plugins/thuraya/mm-modem-helpers-thuraya.c
similarity index 100%
rename from plugins/thuraya/mm-modem-helpers-thuraya.c
rename to src/plugins/thuraya/mm-modem-helpers-thuraya.c
diff --git a/plugins/thuraya/mm-modem-helpers-thuraya.h b/src/plugins/thuraya/mm-modem-helpers-thuraya.h
similarity index 100%
rename from plugins/thuraya/mm-modem-helpers-thuraya.h
rename to src/plugins/thuraya/mm-modem-helpers-thuraya.h
diff --git a/plugins/thuraya/mm-plugin-thuraya.c b/src/plugins/thuraya/mm-plugin-thuraya.c
similarity index 100%
rename from plugins/thuraya/mm-plugin-thuraya.c
rename to src/plugins/thuraya/mm-plugin-thuraya.c
diff --git a/plugins/thuraya/mm-plugin-thuraya.h b/src/plugins/thuraya/mm-plugin-thuraya.h
similarity index 100%
rename from plugins/thuraya/mm-plugin-thuraya.h
rename to src/plugins/thuraya/mm-plugin-thuraya.h
diff --git a/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c b/src/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
similarity index 100%
rename from plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
rename to src/plugins/thuraya/tests/test-mm-modem-helpers-thuraya.c
diff --git a/plugins/tplink/77-mm-tplink-port-types.rules b/src/plugins/tplink/77-mm-tplink-port-types.rules
similarity index 100%
rename from plugins/tplink/77-mm-tplink-port-types.rules
rename to src/plugins/tplink/77-mm-tplink-port-types.rules
diff --git a/plugins/tplink/mm-plugin-tplink.c b/src/plugins/tplink/mm-plugin-tplink.c
similarity index 100%
rename from plugins/tplink/mm-plugin-tplink.c
rename to src/plugins/tplink/mm-plugin-tplink.c
diff --git a/plugins/tplink/mm-plugin-tplink.h b/src/plugins/tplink/mm-plugin-tplink.h
similarity index 100%
rename from plugins/tplink/mm-plugin-tplink.h
rename to src/plugins/tplink/mm-plugin-tplink.h
diff --git a/plugins/ublox/77-mm-ublox-port-types.rules b/src/plugins/ublox/77-mm-ublox-port-types.rules
similarity index 100%
rename from plugins/ublox/77-mm-ublox-port-types.rules
rename to src/plugins/ublox/77-mm-ublox-port-types.rules
diff --git a/plugins/ublox/README b/src/plugins/ublox/README
similarity index 100%
rename from plugins/ublox/README
rename to src/plugins/ublox/README
diff --git a/plugins/ublox/mm-broadband-bearer-ublox.c b/src/plugins/ublox/mm-broadband-bearer-ublox.c
similarity index 100%
rename from plugins/ublox/mm-broadband-bearer-ublox.c
rename to src/plugins/ublox/mm-broadband-bearer-ublox.c
diff --git a/plugins/ublox/mm-broadband-bearer-ublox.h b/src/plugins/ublox/mm-broadband-bearer-ublox.h
similarity index 100%
rename from plugins/ublox/mm-broadband-bearer-ublox.h
rename to src/plugins/ublox/mm-broadband-bearer-ublox.h
diff --git a/plugins/ublox/mm-broadband-modem-ublox.c b/src/plugins/ublox/mm-broadband-modem-ublox.c
similarity index 100%
rename from plugins/ublox/mm-broadband-modem-ublox.c
rename to src/plugins/ublox/mm-broadband-modem-ublox.c
diff --git a/plugins/ublox/mm-broadband-modem-ublox.h b/src/plugins/ublox/mm-broadband-modem-ublox.h
similarity index 100%
rename from plugins/ublox/mm-broadband-modem-ublox.h
rename to src/plugins/ublox/mm-broadband-modem-ublox.h
diff --git a/plugins/ublox/mm-modem-helpers-ublox.c b/src/plugins/ublox/mm-modem-helpers-ublox.c
similarity index 100%
rename from plugins/ublox/mm-modem-helpers-ublox.c
rename to src/plugins/ublox/mm-modem-helpers-ublox.c
diff --git a/plugins/ublox/mm-modem-helpers-ublox.h b/src/plugins/ublox/mm-modem-helpers-ublox.h
similarity index 100%
rename from plugins/ublox/mm-modem-helpers-ublox.h
rename to src/plugins/ublox/mm-modem-helpers-ublox.h
diff --git a/plugins/ublox/mm-plugin-ublox.c b/src/plugins/ublox/mm-plugin-ublox.c
similarity index 100%
rename from plugins/ublox/mm-plugin-ublox.c
rename to src/plugins/ublox/mm-plugin-ublox.c
diff --git a/plugins/ublox/mm-plugin-ublox.h b/src/plugins/ublox/mm-plugin-ublox.h
similarity index 100%
rename from plugins/ublox/mm-plugin-ublox.h
rename to src/plugins/ublox/mm-plugin-ublox.h
diff --git a/plugins/ublox/mm-sim-ublox.c b/src/plugins/ublox/mm-sim-ublox.c
similarity index 100%
rename from plugins/ublox/mm-sim-ublox.c
rename to src/plugins/ublox/mm-sim-ublox.c
diff --git a/plugins/ublox/mm-sim-ublox.h b/src/plugins/ublox/mm-sim-ublox.h
similarity index 100%
rename from plugins/ublox/mm-sim-ublox.h
rename to src/plugins/ublox/mm-sim-ublox.h
diff --git a/plugins/ublox/tests/test-modem-helpers-ublox.c b/src/plugins/ublox/tests/test-modem-helpers-ublox.c
similarity index 100%
rename from plugins/ublox/tests/test-modem-helpers-ublox.c
rename to src/plugins/ublox/tests/test-modem-helpers-ublox.c
diff --git a/plugins/via/mm-broadband-modem-via.c b/src/plugins/via/mm-broadband-modem-via.c
similarity index 100%
rename from plugins/via/mm-broadband-modem-via.c
rename to src/plugins/via/mm-broadband-modem-via.c
diff --git a/plugins/via/mm-broadband-modem-via.h b/src/plugins/via/mm-broadband-modem-via.h
similarity index 100%
rename from plugins/via/mm-broadband-modem-via.h
rename to src/plugins/via/mm-broadband-modem-via.h
diff --git a/plugins/via/mm-plugin-via.c b/src/plugins/via/mm-plugin-via.c
similarity index 100%
rename from plugins/via/mm-plugin-via.c
rename to src/plugins/via/mm-plugin-via.c
diff --git a/plugins/via/mm-plugin-via.h b/src/plugins/via/mm-plugin-via.h
similarity index 100%
rename from plugins/via/mm-plugin-via.h
rename to src/plugins/via/mm-plugin-via.h
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.c b/src/plugins/wavecom/mm-broadband-modem-wavecom.c
similarity index 100%
rename from plugins/wavecom/mm-broadband-modem-wavecom.c
rename to src/plugins/wavecom/mm-broadband-modem-wavecom.c
diff --git a/plugins/wavecom/mm-broadband-modem-wavecom.h b/src/plugins/wavecom/mm-broadband-modem-wavecom.h
similarity index 100%
rename from plugins/wavecom/mm-broadband-modem-wavecom.h
rename to src/plugins/wavecom/mm-broadband-modem-wavecom.h
diff --git a/plugins/wavecom/mm-plugin-wavecom.c b/src/plugins/wavecom/mm-plugin-wavecom.c
similarity index 100%
rename from plugins/wavecom/mm-plugin-wavecom.c
rename to src/plugins/wavecom/mm-plugin-wavecom.c
diff --git a/plugins/wavecom/mm-plugin-wavecom.h b/src/plugins/wavecom/mm-plugin-wavecom.h
similarity index 100%
rename from plugins/wavecom/mm-plugin-wavecom.h
rename to src/plugins/wavecom/mm-plugin-wavecom.h
diff --git a/plugins/x22x/77-mm-x22x-port-types.rules b/src/plugins/x22x/77-mm-x22x-port-types.rules
similarity index 100%
rename from plugins/x22x/77-mm-x22x-port-types.rules
rename to src/plugins/x22x/77-mm-x22x-port-types.rules
diff --git a/plugins/x22x/mm-broadband-modem-x22x.c b/src/plugins/x22x/mm-broadband-modem-x22x.c
similarity index 100%
rename from plugins/x22x/mm-broadband-modem-x22x.c
rename to src/plugins/x22x/mm-broadband-modem-x22x.c
diff --git a/plugins/x22x/mm-broadband-modem-x22x.h b/src/plugins/x22x/mm-broadband-modem-x22x.h
similarity index 100%
rename from plugins/x22x/mm-broadband-modem-x22x.h
rename to src/plugins/x22x/mm-broadband-modem-x22x.h
diff --git a/plugins/x22x/mm-plugin-x22x.c b/src/plugins/x22x/mm-plugin-x22x.c
similarity index 100%
rename from plugins/x22x/mm-plugin-x22x.c
rename to src/plugins/x22x/mm-plugin-x22x.c
diff --git a/plugins/x22x/mm-plugin-x22x.h b/src/plugins/x22x/mm-plugin-x22x.h
similarity index 100%
rename from plugins/x22x/mm-plugin-x22x.h
rename to src/plugins/x22x/mm-plugin-x22x.h
diff --git a/plugins/xmm/mm-broadband-modem-mbim-xmm.c b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
similarity index 100%
rename from plugins/xmm/mm-broadband-modem-mbim-xmm.c
rename to src/plugins/xmm/mm-broadband-modem-mbim-xmm.c
diff --git a/plugins/xmm/mm-broadband-modem-mbim-xmm.h b/src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
similarity index 100%
rename from plugins/xmm/mm-broadband-modem-mbim-xmm.h
rename to src/plugins/xmm/mm-broadband-modem-mbim-xmm.h
diff --git a/plugins/xmm/mm-broadband-modem-xmm.c b/src/plugins/xmm/mm-broadband-modem-xmm.c
similarity index 100%
rename from plugins/xmm/mm-broadband-modem-xmm.c
rename to src/plugins/xmm/mm-broadband-modem-xmm.c
diff --git a/plugins/xmm/mm-broadband-modem-xmm.h b/src/plugins/xmm/mm-broadband-modem-xmm.h
similarity index 100%
rename from plugins/xmm/mm-broadband-modem-xmm.h
rename to src/plugins/xmm/mm-broadband-modem-xmm.h
diff --git a/plugins/xmm/mm-modem-helpers-xmm.c b/src/plugins/xmm/mm-modem-helpers-xmm.c
similarity index 100%
rename from plugins/xmm/mm-modem-helpers-xmm.c
rename to src/plugins/xmm/mm-modem-helpers-xmm.c
diff --git a/plugins/xmm/mm-modem-helpers-xmm.h b/src/plugins/xmm/mm-modem-helpers-xmm.h
similarity index 100%
rename from plugins/xmm/mm-modem-helpers-xmm.h
rename to src/plugins/xmm/mm-modem-helpers-xmm.h
diff --git a/plugins/xmm/mm-shared-xmm.c b/src/plugins/xmm/mm-shared-xmm.c
similarity index 100%
rename from plugins/xmm/mm-shared-xmm.c
rename to src/plugins/xmm/mm-shared-xmm.c
diff --git a/plugins/xmm/mm-shared-xmm.h b/src/plugins/xmm/mm-shared-xmm.h
similarity index 100%
rename from plugins/xmm/mm-shared-xmm.h
rename to src/plugins/xmm/mm-shared-xmm.h
diff --git a/plugins/xmm/mm-shared.c b/src/plugins/xmm/mm-shared.c
similarity index 100%
rename from plugins/xmm/mm-shared.c
rename to src/plugins/xmm/mm-shared.c
diff --git a/plugins/xmm/tests/test-modem-helpers-xmm.c b/src/plugins/xmm/tests/test-modem-helpers-xmm.c
similarity index 100%
rename from plugins/xmm/tests/test-modem-helpers-xmm.c
rename to src/plugins/xmm/tests/test-modem-helpers-xmm.c
diff --git a/plugins/zte/77-mm-zte-port-types.rules b/src/plugins/zte/77-mm-zte-port-types.rules
similarity index 100%
rename from plugins/zte/77-mm-zte-port-types.rules
rename to src/plugins/zte/77-mm-zte-port-types.rules
diff --git a/plugins/zte/mm-broadband-modem-zte-icera.c b/src/plugins/zte/mm-broadband-modem-zte-icera.c
similarity index 100%
rename from plugins/zte/mm-broadband-modem-zte-icera.c
rename to src/plugins/zte/mm-broadband-modem-zte-icera.c
diff --git a/plugins/zte/mm-broadband-modem-zte-icera.h b/src/plugins/zte/mm-broadband-modem-zte-icera.h
similarity index 100%
rename from plugins/zte/mm-broadband-modem-zte-icera.h
rename to src/plugins/zte/mm-broadband-modem-zte-icera.h
diff --git a/plugins/zte/mm-broadband-modem-zte.c b/src/plugins/zte/mm-broadband-modem-zte.c
similarity index 100%
rename from plugins/zte/mm-broadband-modem-zte.c
rename to src/plugins/zte/mm-broadband-modem-zte.c
diff --git a/plugins/zte/mm-broadband-modem-zte.h b/src/plugins/zte/mm-broadband-modem-zte.h
similarity index 100%
rename from plugins/zte/mm-broadband-modem-zte.h
rename to src/plugins/zte/mm-broadband-modem-zte.h
diff --git a/plugins/zte/mm-common-zte.c b/src/plugins/zte/mm-common-zte.c
similarity index 100%
rename from plugins/zte/mm-common-zte.c
rename to src/plugins/zte/mm-common-zte.c
diff --git a/plugins/zte/mm-common-zte.h b/src/plugins/zte/mm-common-zte.h
similarity index 100%
rename from plugins/zte/mm-common-zte.h
rename to src/plugins/zte/mm-common-zte.h
diff --git a/plugins/zte/mm-plugin-zte.c b/src/plugins/zte/mm-plugin-zte.c
similarity index 100%
rename from plugins/zte/mm-plugin-zte.c
rename to src/plugins/zte/mm-plugin-zte.c
diff --git a/plugins/zte/mm-plugin-zte.h b/src/plugins/zte/mm-plugin-zte.h
similarity index 100%
rename from plugins/zte/mm-plugin-zte.h
rename to src/plugins/zte/mm-plugin-zte.h