diff --git a/.devcontainer/devcontainer.json b/.devcontainer.json similarity index 50% rename from .devcontainer/devcontainer.json rename to .devcontainer.json index 7ae440c3..c6a135e9 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer.json @@ -1,16 +1,20 @@ { - "name": "Open PineBuds Pro - VS Code Development Environment", + "name": "OpenPineBuds - Dev Environment", "build": { "dockerfile": "../Dockerfile", "context": ".." }, - "extensions": [ - "ms-vscode.cmake-tools", - "ms-vscode.cpptools" - ], + "customizations": { + "vscode": { + "extensions": [ + "ms-vscode.cmake-tools", + "ms-vscode.cpptools" + ] + } + }, "runArgs": [ "--privileged" ], "userEnvProbe": "loginInteractiveShell", "remoteUser": "root" -} \ No newline at end of file +} diff --git a/.gitignore b/.gitignore index f4a742f8..b47f821e 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,7 @@ !.gitattributes !.mailmap !.github -!.devcontainer +!.devcontainer.json # Backup files *~ @@ -102,3 +102,8 @@ Release/ # *.ini log.txt log.txt + +#CMake +/build/ +CMakeCache.txt +/CMakeFiles/ diff --git a/CMakeLists.txt b/CMakeLists.txt new file mode 100644 index 00000000..3379a2b5 --- /dev/null +++ b/CMakeLists.txt @@ -0,0 +1,12 @@ +cmake_minimum_required (VERSION 3.12) +set(CMAKE_TRY_COMPILE_TARGET_TYPE "STATIC_LIBRARY") +project (OpenPineBuds C CXX ASM) + +option (OPB_BLUE_CONN_LIGHT "Enable the blue connection light" OFF) # Use BLE to control this. + +set (CMAKE_EXPORT_COMPILE_COMMANDS ON) +set (CMAKE_CXX_STANDARD 14) +set (CMAKE_CXX_EXTENSIONS OFF) +set (CMAKE_CXX_STANDARD_REQUIRED ON) + +add_subdirectory (src) diff --git a/Dockerfile b/Dockerfile index 32b86843..87e65f81 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,53 +1,52 @@ -FROM debian:bullseye-slim AS base - -FROM base AS rust_build - -LABEL org.opencontainers.image.authors = "Ben V. Brown , Dom Rodriguez " - -WORKDIR /usr/src -ENV PATH="/root/.cargo/bin:$PATH" - -RUN apt-get update \ - && apt-get install -y \ - bc \ - build-essential \ - curl \ - git \ - libudev-dev \ - pkg-config \ - && curl https://sh.rustup.rs -sSf | bash -s -- -y \ - && git clone https://github.com/Ralim/bestool.git \ - && cd /usr/src/bestool/bestool/ \ - && cargo build --release - -FROM base as dev_env - -WORKDIR /usr/src - -RUN apt-get update \ - && apt-get install -y \ - bash \ - bc \ - bzip2 \ - curl \ - ffmpeg \ - clang-format \ - git \ - make \ - tar \ - xxd \ - && git config --global --add safe.directory /src \ - && mkdir -pv /src \ - && curl \ - https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-$(arch)-linux.tar.bz2 | tar -xj -C /src/ - -RUN apt-get update \ - && apt-get install -y \ - minicom \ - sudo - -ENV PATH="${PATH}:/src/gcc-arm-none-eabi-9-2019-q4-major/bin" -COPY --from=rust_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool -COPY . /usr/src - -ENTRYPOINT ["/bin/bash"] +FROM debian:bullseye-slim AS base + +FROM base AS rust_build + +LABEL org.opencontainers.image.authors = "Ben V. Brown , Dom Rodriguez " + +WORKDIR /usr/src +ENV PATH="/root/.cargo/bin:$PATH" + +RUN apt-get update \ + && apt-get install -y \ + bc \ + build-essential \ + curl \ + git \ + libudev-dev \ + pkg-config \ + && curl https://sh.rustup.rs -sSf | bash -s -- -y \ + && git clone https://github.com/Ralim/bestool.git \ + && cd /usr/src/bestool/bestool/ \ + && cargo build --release + +FROM base as dev_env + +WORKDIR /usr/src + +RUN apt-get update \ + && apt-get install -y \ + bash \ + bc \ + bzip2 \ + clang-format \ + cmake \ + curl \ + ffmpeg \ + git \ + make \ + minicom \ + sudo \ + tar \ + xxd \ + && git config --global --add safe.directory /usr/src \ + && mkdir -pv /usr/local/toolchains \ + && curl \ + https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu-rm/9-2019q4/gcc-arm-none-eabi-9-2019-q4-major-$(arch)-linux.tar.bz2 \ + | tar -xj -C /usr/local/toolchains + +ENV PATH="${PATH}:/usr/local/toolchains/gcc-arm-none-eabi-9-2019-q4-major/bin" +COPY --from=rust_build /usr/src/bestool/bestool/target/release/bestool /usr/local/bin/bestool +COPY . /usr/src + +ENTRYPOINT ["/bin/bash"] diff --git a/.clang-format b/src/.clang-format similarity index 100% rename from .clang-format rename to src/.clang-format diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt new file mode 100644 index 00000000..291d0a9e --- /dev/null +++ b/src/CMakeLists.txt @@ -0,0 +1,12 @@ +set(CHIP best2300p) +set(CHIP_BEST2300P 1) +set(CHIP_ID_LITERAL best2300p) + +add_compile_definitions(CHIP=${CHIP} CHIP_BEST2300P=${CHIP_BEST2300P} CHIP_ID_LITERAL=${CHIP_ID_LITERAL}) + +add_subdirectory(apps) +add_subdirectory(utils) +add_subdirectory(platform) +add_subdirectory(rtos) + +include_directories (include) diff --git a/Makefile b/src/Makefile similarity index 100% rename from Makefile rename to src/Makefile diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt new file mode 100644 index 00000000..35cfeee1 --- /dev/null +++ b/src/apps/CMakeLists.txt @@ -0,0 +1,9 @@ +add_subdirectory (anc) +add_subdirectory (apptester) +add_subdirectory (audioplayers) +add_subdirectory (battery) +add_subdirectory (cmd) +add_subdirectory (common) +add_subdirectory (key) +add_subdirectory (main) + diff --git a/apps/Makefile b/src/apps/Makefile similarity index 100% rename from apps/Makefile rename to src/apps/Makefile diff --git a/src/apps/anc/CMakeLists.txt b/src/apps/anc/CMakeLists.txt new file mode 100644 index 00000000..4495dff0 --- /dev/null +++ b/src/apps/anc/CMakeLists.txt @@ -0,0 +1,12 @@ +set (sources "./src/anc_wnr.c" + "./src/app_anc.c" + "./src/anc_assist.c" + "./src/peak_detector.c") + +set (headers "./inc/anc_wnr.h" + "./inc/app_anc.h" + "./inc/anc_assist.h" + "./inc/peak_detector.h") + +add_library (apps_anc STATIC ${sources} ${headers}) +target_link_libraries (apps_anc PUBLIC apps_common) diff --git a/apps/anc/Makefile b/src/apps/anc/Makefile similarity index 100% rename from apps/anc/Makefile rename to src/apps/anc/Makefile diff --git a/apps/anc/inc/anc_assist.h b/src/apps/anc/inc/anc_assist.h similarity index 100% rename from apps/anc/inc/anc_assist.h rename to src/apps/anc/inc/anc_assist.h diff --git a/apps/anc/inc/anc_wnr.h b/src/apps/anc/inc/anc_wnr.h similarity index 100% rename from apps/anc/inc/anc_wnr.h rename to src/apps/anc/inc/anc_wnr.h diff --git a/apps/anc/inc/app_anc.h b/src/apps/anc/inc/app_anc.h similarity index 100% rename from apps/anc/inc/app_anc.h rename to src/apps/anc/inc/app_anc.h diff --git a/apps/anc/inc/peak_detector.h b/src/apps/anc/inc/peak_detector.h similarity index 100% rename from apps/anc/inc/peak_detector.h rename to src/apps/anc/inc/peak_detector.h diff --git a/apps/anc/src/anc_assist.c b/src/apps/anc/src/anc_assist.c similarity index 100% rename from apps/anc/src/anc_assist.c rename to src/apps/anc/src/anc_assist.c diff --git a/apps/anc/src/anc_wnr.c b/src/apps/anc/src/anc_wnr.c similarity index 100% rename from apps/anc/src/anc_wnr.c rename to src/apps/anc/src/anc_wnr.c diff --git a/apps/anc/src/app_anc.c b/src/apps/anc/src/app_anc.c similarity index 100% rename from apps/anc/src/app_anc.c rename to src/apps/anc/src/app_anc.c diff --git a/apps/anc/src/peak_detector.c b/src/apps/anc/src/peak_detector.c similarity index 100% rename from apps/anc/src/peak_detector.c rename to src/apps/anc/src/peak_detector.c diff --git a/src/apps/apptester/CMakeLists.txt b/src/apps/apptester/CMakeLists.txt new file mode 100644 index 00000000..ed6f6604 --- /dev/null +++ b/src/apps/apptester/CMakeLists.txt @@ -0,0 +1,5 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_apptester STATIC ${sources} ${headers}) +target_link_libraries(apps_apptester apps_common) \ No newline at end of file diff --git a/apps/apptester/Makefile b/src/apps/apptester/Makefile similarity index 100% rename from apps/apptester/Makefile rename to src/apps/apptester/Makefile diff --git a/apps/apptester/app_audtest.cpp b/src/apps/apptester/app_audtest.cpp similarity index 100% rename from apps/apptester/app_audtest.cpp rename to src/apps/apptester/app_audtest.cpp diff --git a/apps/apptester/app_audtest.h b/src/apps/apptester/app_audtest.h similarity index 100% rename from apps/apptester/app_audtest.h rename to src/apps/apptester/app_audtest.h diff --git a/apps/apptester/app_audtest_pattern.h b/src/apps/apptester/app_audtest_pattern.h similarity index 100% rename from apps/apptester/app_audtest_pattern.h rename to src/apps/apptester/app_audtest_pattern.h diff --git a/apps/apptester/audiobuffer.c b/src/apps/apptester/audiobuffer.c similarity index 100% rename from apps/apptester/audiobuffer.c rename to src/apps/apptester/audiobuffer.c diff --git a/apps/apptester/audiobuffer.h b/src/apps/apptester/audiobuffer.h similarity index 100% rename from apps/apptester/audiobuffer.h rename to src/apps/apptester/audiobuffer.h diff --git a/src/apps/audioplayers/CMakeLists.txt b/src/apps/audioplayers/CMakeLists.txt new file mode 100644 index 00000000..73b64964 --- /dev/null +++ b/src/apps/audioplayers/CMakeLists.txt @@ -0,0 +1,8 @@ +add_subdirectory (a2dp_decoder) +add_subdirectory (rbplay) + +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_audioplayers STATIC ${sources} ${headers}) +target_link_libraries(apps_audioplayers util_list) \ No newline at end of file diff --git a/apps/audioplayers/Makefile b/src/apps/audioplayers/Makefile similarity index 100% rename from apps/audioplayers/Makefile rename to src/apps/audioplayers/Makefile diff --git a/src/apps/audioplayers/a2dp_decoder/CMakeLists.txt b/src/apps/audioplayers/a2dp_decoder/CMakeLists.txt new file mode 100644 index 00000000..f6eb3038 --- /dev/null +++ b/src/apps/audioplayers/a2dp_decoder/CMakeLists.txt @@ -0,0 +1,5 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_audioplayers_a2dpdecoder STATIC ${sources} ${headers}) +target_link_libraries(apps_audioplayers_a2dpdecoder util_list) diff --git a/apps/audioplayers/a2dp_decoder/Makefile b/src/apps/audioplayers/a2dp_decoder/Makefile similarity index 100% rename from apps/audioplayers/a2dp_decoder/Makefile rename to src/apps/audioplayers/a2dp_decoder/Makefile diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder.h b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder.h similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder.h rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder.h diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_aac_lc.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_aac_lc.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_aac_lc.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_aac_lc.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.c b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.c similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.c rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.c diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.h b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.h similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.h rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_cp.h diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_example.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_example.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_example.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_example.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_internal.h b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_internal.h similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_internal.h rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_internal.h diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_ldac.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_ldac.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_ldac.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_ldac.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_lhdc.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_lhdc.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_lhdc.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_lhdc.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_sbc.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_sbc.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_sbc.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_sbc.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_scalable.cpp b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_scalable.cpp similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_scalable.cpp rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_scalable.cpp diff --git a/apps/audioplayers/a2dp_decoder/a2dp_decoder_trace.h b/src/apps/audioplayers/a2dp_decoder/a2dp_decoder_trace.h similarity index 100% rename from apps/audioplayers/a2dp_decoder/a2dp_decoder_trace.h rename to src/apps/audioplayers/a2dp_decoder/a2dp_decoder_trace.h diff --git a/apps/audioplayers/a2dpplay.cpp b/src/apps/audioplayers/a2dpplay.cpp similarity index 100% rename from apps/audioplayers/a2dpplay.cpp rename to src/apps/audioplayers/a2dpplay.cpp diff --git a/apps/audioplayers/app_audio.cpp b/src/apps/audioplayers/app_audio.cpp similarity index 100% rename from apps/audioplayers/app_audio.cpp rename to src/apps/audioplayers/app_audio.cpp diff --git a/apps/audioplayers/app_audio.h b/src/apps/audioplayers/app_audio.h similarity index 100% rename from apps/audioplayers/app_audio.h rename to src/apps/audioplayers/app_audio.h diff --git a/apps/audioplayers/bt_sco_chain.c b/src/apps/audioplayers/bt_sco_chain.c similarity index 100% rename from apps/audioplayers/bt_sco_chain.c rename to src/apps/audioplayers/bt_sco_chain.c diff --git a/apps/audioplayers/bt_sco_chain.h b/src/apps/audioplayers/bt_sco_chain.h similarity index 100% rename from apps/audioplayers/bt_sco_chain.h rename to src/apps/audioplayers/bt_sco_chain.h diff --git a/apps/audioplayers/bt_sco_chain_cfg.h b/src/apps/audioplayers/bt_sco_chain_cfg.h similarity index 100% rename from apps/audioplayers/bt_sco_chain_cfg.h rename to src/apps/audioplayers/bt_sco_chain_cfg.h diff --git a/apps/audioplayers/bt_sco_chain_cfg_default.c b/src/apps/audioplayers/bt_sco_chain_cfg_default.c similarity index 100% rename from apps/audioplayers/bt_sco_chain_cfg_default.c rename to src/apps/audioplayers/bt_sco_chain_cfg_default.c diff --git a/apps/audioplayers/bt_sco_chain_cp.c b/src/apps/audioplayers/bt_sco_chain_cp.c similarity index 100% rename from apps/audioplayers/bt_sco_chain_cp.c rename to src/apps/audioplayers/bt_sco_chain_cp.c diff --git a/apps/audioplayers/bt_sco_chain_cp.h b/src/apps/audioplayers/bt_sco_chain_cp.h similarity index 100% rename from apps/audioplayers/bt_sco_chain_cp.h rename to src/apps/audioplayers/bt_sco_chain_cp.h diff --git a/apps/audioplayers/bt_sco_chain_thirdparty.c b/src/apps/audioplayers/bt_sco_chain_thirdparty.c similarity index 100% rename from apps/audioplayers/bt_sco_chain_thirdparty.c rename to src/apps/audioplayers/bt_sco_chain_thirdparty.c diff --git a/apps/audioplayers/bt_sco_chain_thirdparty_alango.c b/src/apps/audioplayers/bt_sco_chain_thirdparty_alango.c similarity index 100% rename from apps/audioplayers/bt_sco_chain_thirdparty_alango.c rename to src/apps/audioplayers/bt_sco_chain_thirdparty_alango.c diff --git a/apps/audioplayers/bt_sco_chain_tuning.c b/src/apps/audioplayers/bt_sco_chain_tuning.c similarity index 100% rename from apps/audioplayers/bt_sco_chain_tuning.c rename to src/apps/audioplayers/bt_sco_chain_tuning.c diff --git a/apps/audioplayers/bt_sco_chain_tuning.h b/src/apps/audioplayers/bt_sco_chain_tuning.h similarity index 100% rename from apps/audioplayers/bt_sco_chain_tuning.h rename to src/apps/audioplayers/bt_sco_chain_tuning.h diff --git a/apps/audioplayers/cvsdplay.cpp b/src/apps/audioplayers/cvsdplay.cpp similarity index 100% rename from apps/audioplayers/cvsdplay.cpp rename to src/apps/audioplayers/cvsdplay.cpp diff --git a/apps/audioplayers/digmici2splay.cpp b/src/apps/audioplayers/digmici2splay.cpp similarity index 100% rename from apps/audioplayers/digmici2splay.cpp rename to src/apps/audioplayers/digmici2splay.cpp diff --git a/apps/audioplayers/flacplay.cpp b/src/apps/audioplayers/flacplay.cpp similarity index 100% rename from apps/audioplayers/flacplay.cpp rename to src/apps/audioplayers/flacplay.cpp diff --git a/apps/audioplayers/fmradio.cpp b/src/apps/audioplayers/fmradio.cpp similarity index 100% rename from apps/audioplayers/fmradio.cpp rename to src/apps/audioplayers/fmradio.cpp diff --git a/apps/audioplayers/fmradio.h b/src/apps/audioplayers/fmradio.h similarity index 100% rename from apps/audioplayers/fmradio.h rename to src/apps/audioplayers/fmradio.h diff --git a/apps/audioplayers/msbcplay.cpp b/src/apps/audioplayers/msbcplay.cpp similarity index 100% rename from apps/audioplayers/msbcplay.cpp rename to src/apps/audioplayers/msbcplay.cpp diff --git a/apps/audioplayers/plc_utils.c b/src/apps/audioplayers/plc_utils.c similarity index 100% rename from apps/audioplayers/plc_utils.c rename to src/apps/audioplayers/plc_utils.c diff --git a/apps/audioplayers/plc_utils.h b/src/apps/audioplayers/plc_utils.h similarity index 100% rename from apps/audioplayers/plc_utils.h rename to src/apps/audioplayers/plc_utils.h diff --git a/src/apps/audioplayers/rbplay/CMakeLists.txt b/src/apps/audioplayers/rbplay/CMakeLists.txt new file mode 100644 index 00000000..830dbd1c --- /dev/null +++ b/src/apps/audioplayers/rbplay/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_audioplayers_rbplay STATIC ${sources} ${headers}) diff --git a/apps/audioplayers/rbplay/rb_ctl.cpp b/src/apps/audioplayers/rbplay/rb_ctl.cpp similarity index 100% rename from apps/audioplayers/rbplay/rb_ctl.cpp rename to src/apps/audioplayers/rbplay/rb_ctl.cpp diff --git a/apps/audioplayers/rbplay/rb_ctl.h b/src/apps/audioplayers/rbplay/rb_ctl.h similarity index 100% rename from apps/audioplayers/rbplay/rb_ctl.h rename to src/apps/audioplayers/rbplay/rb_ctl.h diff --git a/apps/audioplayers/rbplay/rbpcmbuf.cpp b/src/apps/audioplayers/rbplay/rbpcmbuf.cpp similarity index 100% rename from apps/audioplayers/rbplay/rbpcmbuf.cpp rename to src/apps/audioplayers/rbplay/rbpcmbuf.cpp diff --git a/apps/audioplayers/rbplay/rbpcmbuf.h b/src/apps/audioplayers/rbplay/rbpcmbuf.h similarity index 100% rename from apps/audioplayers/rbplay/rbpcmbuf.h rename to src/apps/audioplayers/rbplay/rbpcmbuf.h diff --git a/apps/audioplayers/rbplay/rbplay.cpp b/src/apps/audioplayers/rbplay/rbplay.cpp similarity index 100% rename from apps/audioplayers/rbplay/rbplay.cpp rename to src/apps/audioplayers/rbplay/rbplay.cpp diff --git a/apps/audioplayers/rbplay/rbplay.h b/src/apps/audioplayers/rbplay/rbplay.h similarity index 100% rename from apps/audioplayers/rbplay/rbplay.h rename to src/apps/audioplayers/rbplay/rbplay.h diff --git a/apps/audioplayers/rbplay/rbplaysd.cpp b/src/apps/audioplayers/rbplay/rbplaysd.cpp similarity index 100% rename from apps/audioplayers/rbplay/rbplaysd.cpp rename to src/apps/audioplayers/rbplay/rbplaysd.cpp diff --git a/apps/audioplayers/rbplay/rbplaysd.h b/src/apps/audioplayers/rbplay/rbplaysd.h similarity index 100% rename from apps/audioplayers/rbplay/rbplaysd.h rename to src/apps/audioplayers/rbplay/rbplaysd.h diff --git a/apps/audioplayers/rbplay/utils.h b/src/apps/audioplayers/rbplay/utils.h similarity index 100% rename from apps/audioplayers/rbplay/utils.h rename to src/apps/audioplayers/rbplay/utils.h diff --git a/apps/audioplayers/voice_test.c b/src/apps/audioplayers/voice_test.c similarity index 100% rename from apps/audioplayers/voice_test.c rename to src/apps/audioplayers/voice_test.c diff --git a/apps/audioplayers/voicebtpcmplay.cpp b/src/apps/audioplayers/voicebtpcmplay.cpp similarity index 100% rename from apps/audioplayers/voicebtpcmplay.cpp rename to src/apps/audioplayers/voicebtpcmplay.cpp diff --git a/apps/audioplayers/voicebtpcmplay_sco_dma_snapshot.cpp b/src/apps/audioplayers/voicebtpcmplay_sco_dma_snapshot.cpp similarity index 100% rename from apps/audioplayers/voicebtpcmplay_sco_dma_snapshot.cpp rename to src/apps/audioplayers/voicebtpcmplay_sco_dma_snapshot.cpp diff --git a/apps/audioplayers/wavplay.cpp b/src/apps/audioplayers/wavplay.cpp similarity index 100% rename from apps/audioplayers/wavplay.cpp rename to src/apps/audioplayers/wavplay.cpp diff --git a/src/apps/battery/CMakeLists.txt b/src/apps/battery/CMakeLists.txt new file mode 100644 index 00000000..4fd16282 --- /dev/null +++ b/src/apps/battery/CMakeLists.txt @@ -0,0 +1,5 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_battery STATIC ${sources} ${headers}) +target_link_libraries(apps_battery apps_main) \ No newline at end of file diff --git a/apps/battery/Makefile b/src/apps/battery/Makefile similarity index 100% rename from apps/battery/Makefile rename to src/apps/battery/Makefile diff --git a/apps/battery/app_battery.cpp b/src/apps/battery/app_battery.cpp similarity index 100% rename from apps/battery/app_battery.cpp rename to src/apps/battery/app_battery.cpp diff --git a/apps/battery/app_battery.h b/src/apps/battery/app_battery.h similarity index 100% rename from apps/battery/app_battery.h rename to src/apps/battery/app_battery.h diff --git a/src/apps/cmd/CMakeLists.txt b/src/apps/cmd/CMakeLists.txt new file mode 100644 index 00000000..1c6266b0 --- /dev/null +++ b/src/apps/cmd/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_cmd STATIC ${sources} ${headers}) diff --git a/apps/cmd/Makefile b/src/apps/cmd/Makefile similarity index 100% rename from apps/cmd/Makefile rename to src/apps/cmd/Makefile diff --git a/apps/cmd/app_cmd.cpp b/src/apps/cmd/app_cmd.cpp similarity index 100% rename from apps/cmd/app_cmd.cpp rename to src/apps/cmd/app_cmd.cpp diff --git a/apps/cmd/app_cmd.h b/src/apps/cmd/app_cmd.h similarity index 100% rename from apps/cmd/app_cmd.h rename to src/apps/cmd/app_cmd.h diff --git a/src/apps/common/CMakeLists.txt b/src/apps/common/CMakeLists.txt new file mode 100644 index 00000000..03ebd2c8 --- /dev/null +++ b/src/apps/common/CMakeLists.txt @@ -0,0 +1,12 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_common STATIC ${sources} ${headers}) +target_link_libraries(apps_common platform_hal platform_drivers_ana) +target_include_directories(apps_common PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(apps_common PRIVATE + ${CMAKE_SOURCE_DIR}/services/ibrt_ui/inc/ + ${CMAKE_SOURCE_DIR}/services/ibrt_core/inc/ + ${CMAKE_SOURCE_DIR}/services/bt_app/ + ${CMAKE_SOURCE_DIR}/services/app_ai/inc/ +) \ No newline at end of file diff --git a/apps/common/Makefile b/src/apps/common/Makefile similarity index 100% rename from apps/common/Makefile rename to src/apps/common/Makefile diff --git a/apps/common/app_spec_ostimer.cpp b/src/apps/common/app_spec_ostimer.cpp similarity index 100% rename from apps/common/app_spec_ostimer.cpp rename to src/apps/common/app_spec_ostimer.cpp diff --git a/apps/common/app_spec_ostimer.h b/src/apps/common/app_spec_ostimer.h similarity index 100% rename from apps/common/app_spec_ostimer.h rename to src/apps/common/app_spec_ostimer.h diff --git a/apps/common/app_thread.c b/src/apps/common/app_thread.c similarity index 100% rename from apps/common/app_thread.c rename to src/apps/common/app_thread.c diff --git a/apps/common/app_thread.h b/src/apps/common/app_thread.h similarity index 100% rename from apps/common/app_thread.h rename to src/apps/common/app_thread.h diff --git a/apps/common/app_utils.c b/src/apps/common/app_utils.c similarity index 100% rename from apps/common/app_utils.c rename to src/apps/common/app_utils.c diff --git a/apps/common/app_utils.h b/src/apps/common/app_utils.h similarity index 100% rename from apps/common/app_utils.h rename to src/apps/common/app_utils.h diff --git a/apps/common/randfrommic.c b/src/apps/common/randfrommic.c similarity index 100% rename from apps/common/randfrommic.c rename to src/apps/common/randfrommic.c diff --git a/apps/common/randfrommic.h b/src/apps/common/randfrommic.h similarity index 100% rename from apps/common/randfrommic.h rename to src/apps/common/randfrommic.h diff --git a/apps/factory/1k_2ch_44k_16bit.txt b/src/apps/factory/1k_2ch_44k_16bit.txt similarity index 100% rename from apps/factory/1k_2ch_44k_16bit.txt rename to src/apps/factory/1k_2ch_44k_16bit.txt diff --git a/apps/factory/1k_2ch_48k_16bit.txt b/src/apps/factory/1k_2ch_48k_16bit.txt similarity index 100% rename from apps/factory/1k_2ch_48k_16bit.txt rename to src/apps/factory/1k_2ch_48k_16bit.txt diff --git a/apps/factory/Makefile b/src/apps/factory/Makefile similarity index 100% rename from apps/factory/Makefile rename to src/apps/factory/Makefile diff --git a/apps/factory/app_factory.cpp b/src/apps/factory/app_factory.cpp similarity index 100% rename from apps/factory/app_factory.cpp rename to src/apps/factory/app_factory.cpp diff --git a/apps/factory/app_factory.h b/src/apps/factory/app_factory.h similarity index 100% rename from apps/factory/app_factory.h rename to src/apps/factory/app_factory.h diff --git a/apps/factory/app_factory_audio.cpp b/src/apps/factory/app_factory_audio.cpp similarity index 100% rename from apps/factory/app_factory_audio.cpp rename to src/apps/factory/app_factory_audio.cpp diff --git a/apps/factory/app_factory_audio.h b/src/apps/factory/app_factory_audio.h similarity index 100% rename from apps/factory/app_factory_audio.h rename to src/apps/factory/app_factory_audio.h diff --git a/apps/factory/app_factory_bt.cpp b/src/apps/factory/app_factory_bt.cpp similarity index 100% rename from apps/factory/app_factory_bt.cpp rename to src/apps/factory/app_factory_bt.cpp diff --git a/apps/factory/app_factory_bt.h b/src/apps/factory/app_factory_bt.h similarity index 100% rename from apps/factory/app_factory_bt.h rename to src/apps/factory/app_factory_bt.h diff --git a/apps/factory/app_factory_cdc_comm.c b/src/apps/factory/app_factory_cdc_comm.c similarity index 100% rename from apps/factory/app_factory_cdc_comm.c rename to src/apps/factory/app_factory_cdc_comm.c diff --git a/apps/factory/app_factory_cdc_comm.h b/src/apps/factory/app_factory_cdc_comm.h similarity index 100% rename from apps/factory/app_factory_cdc_comm.h rename to src/apps/factory/app_factory_cdc_comm.h diff --git a/apps/factory/sys_api_cdc_comm.c b/src/apps/factory/sys_api_cdc_comm.c similarity index 100% rename from apps/factory/sys_api_cdc_comm.c rename to src/apps/factory/sys_api_cdc_comm.c diff --git a/apps/factory/sys_api_cdc_comm.h b/src/apps/factory/sys_api_cdc_comm.h similarity index 100% rename from apps/factory/sys_api_cdc_comm.h rename to src/apps/factory/sys_api_cdc_comm.h diff --git a/src/apps/key/CMakeLists.txt b/src/apps/key/CMakeLists.txt new file mode 100644 index 00000000..a4717881 --- /dev/null +++ b/src/apps/key/CMakeLists.txt @@ -0,0 +1,5 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_key STATIC ${sources} ${headers}) +target_link_libraries(apps_key platform_hal) \ No newline at end of file diff --git a/apps/key/Makefile b/src/apps/key/Makefile similarity index 100% rename from apps/key/Makefile rename to src/apps/key/Makefile diff --git a/apps/key/app_key.cpp b/src/apps/key/app_key.cpp similarity index 100% rename from apps/key/app_key.cpp rename to src/apps/key/app_key.cpp diff --git a/apps/key/app_key.h b/src/apps/key/app_key.h similarity index 100% rename from apps/key/app_key.h rename to src/apps/key/app_key.h diff --git a/src/apps/main/CMakeLists.txt b/src/apps/main/CMakeLists.txt new file mode 100644 index 00000000..f4934d23 --- /dev/null +++ b/src/apps/main/CMakeLists.txt @@ -0,0 +1,5 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_main STATIC ${sources} ${headers}) +target_link_libraries(apps_main platform_hal) \ No newline at end of file diff --git a/apps/main/Makefile b/src/apps/main/Makefile similarity index 100% rename from apps/main/Makefile rename to src/apps/main/Makefile diff --git a/apps/main/app_status_ind.h b/src/apps/main/app_status_ind.h similarity index 100% rename from apps/main/app_status_ind.h rename to src/apps/main/app_status_ind.h diff --git a/apps/main/apps.cpp b/src/apps/main/apps.cpp similarity index 100% rename from apps/main/apps.cpp rename to src/apps/main/apps.cpp diff --git a/apps/main/apps.h b/src/apps/main/apps.h similarity index 100% rename from apps/main/apps.h rename to src/apps/main/apps.h diff --git a/apps/main/apps_tester.cpp b/src/apps/main/apps_tester.cpp similarity index 100% rename from apps/main/apps_tester.cpp rename to src/apps/main/apps_tester.cpp diff --git a/apps/main/common_apps_imports.h b/src/apps/main/common_apps_imports.h similarity index 100% rename from apps/main/common_apps_imports.h rename to src/apps/main/common_apps_imports.h diff --git a/apps/main/gfps.cpp b/src/apps/main/gfps.cpp similarity index 100% rename from apps/main/gfps.cpp rename to src/apps/main/gfps.cpp diff --git a/apps/main/ibrt.cpp b/src/apps/main/ibrt.cpp similarity index 100% rename from apps/main/ibrt.cpp rename to src/apps/main/ibrt.cpp diff --git a/apps/main/ibrt.h b/src/apps/main/ibrt.h similarity index 100% rename from apps/main/ibrt.h rename to src/apps/main/ibrt.h diff --git a/apps/main/key_handler.cpp b/src/apps/main/key_handler.cpp similarity index 100% rename from apps/main/key_handler.cpp rename to src/apps/main/key_handler.cpp diff --git a/apps/main/key_handler.h b/src/apps/main/key_handler.h similarity index 100% rename from apps/main/key_handler.h rename to src/apps/main/key_handler.h diff --git a/apps/main/led_control.cpp b/src/apps/main/led_control.cpp similarity index 100% rename from apps/main/led_control.cpp rename to src/apps/main/led_control.cpp diff --git a/apps/main/led_control.h b/src/apps/main/led_control.h similarity index 100% rename from apps/main/led_control.h rename to src/apps/main/led_control.h diff --git a/apps/main/lhdc.cpp b/src/apps/main/lhdc.cpp similarity index 100% rename from apps/main/lhdc.cpp rename to src/apps/main/lhdc.cpp diff --git a/apps/main/rb_codec.cpp b/src/apps/main/rb_codec.cpp similarity index 100% rename from apps/main/rb_codec.cpp rename to src/apps/main/rb_codec.cpp diff --git a/apps/main/rb_codec.h b/src/apps/main/rb_codec.h similarity index 100% rename from apps/main/rb_codec.h rename to src/apps/main/rb_codec.h diff --git a/src/apps/mic/CMakeLists.txt b/src/apps/mic/CMakeLists.txt new file mode 100644 index 00000000..69e3e5f0 --- /dev/null +++ b/src/apps/mic/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_mic STATIC ${sources} ${headers}) diff --git a/apps/mic/Makefile b/src/apps/mic/Makefile similarity index 100% rename from apps/mic/Makefile rename to src/apps/mic/Makefile diff --git a/apps/mic/app_mic.cpp b/src/apps/mic/app_mic.cpp similarity index 100% rename from apps/mic/app_mic.cpp rename to src/apps/mic/app_mic.cpp diff --git a/apps/mic/app_mic.h b/src/apps/mic/app_mic.h similarity index 100% rename from apps/mic/app_mic.h rename to src/apps/mic/app_mic.h diff --git a/src/apps/mic_alg/CMakeLists.txt b/src/apps/mic_alg/CMakeLists.txt new file mode 100644 index 00000000..ddeaf871 --- /dev/null +++ b/src/apps/mic_alg/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_mic_alg STATIC ${sources} ${headers}) diff --git a/apps/mic_alg/Makefile b/src/apps/mic_alg/Makefile similarity index 100% rename from apps/mic_alg/Makefile rename to src/apps/mic_alg/Makefile diff --git a/apps/mic_alg/app_mic_alg.cpp b/src/apps/mic_alg/app_mic_alg.cpp similarity index 100% rename from apps/mic_alg/app_mic_alg.cpp rename to src/apps/mic_alg/app_mic_alg.cpp diff --git a/apps/mic_alg/app_mic_alg.h b/src/apps/mic_alg/app_mic_alg.h similarity index 100% rename from apps/mic_alg/app_mic_alg.h rename to src/apps/mic_alg/app_mic_alg.h diff --git a/src/apps/pwl/CMakeLists.txt b/src/apps/pwl/CMakeLists.txt new file mode 100644 index 00000000..2963bf57 --- /dev/null +++ b/src/apps/pwl/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.cpp") + +add_library (apps_pwl STATIC ${sources} ${headers}) diff --git a/apps/pwl/Makefile b/src/apps/pwl/Makefile similarity index 100% rename from apps/pwl/Makefile rename to src/apps/pwl/Makefile diff --git a/apps/pwl/app_pwl.cpp b/src/apps/pwl/app_pwl.cpp similarity index 100% rename from apps/pwl/app_pwl.cpp rename to src/apps/pwl/app_pwl.cpp diff --git a/apps/pwl/app_pwl.h b/src/apps/pwl/app_pwl.h similarity index 100% rename from apps/pwl/app_pwl.h rename to src/apps/pwl/app_pwl.h diff --git a/src/apps/voice_detector/CMakeLists.txt b/src/apps/voice_detector/CMakeLists.txt new file mode 100644 index 00000000..09e9c120 --- /dev/null +++ b/src/apps/voice_detector/CMakeLists.txt @@ -0,0 +1,4 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (apps_voice_detector STATIC ${sources} ${headers}) diff --git a/apps/voice_detector/Makefile b/src/apps/voice_detector/Makefile similarity index 100% rename from apps/voice_detector/Makefile rename to src/apps/voice_detector/Makefile diff --git a/apps/voice_detector/app_voice_detector.cpp b/src/apps/voice_detector/app_voice_detector.cpp similarity index 100% rename from apps/voice_detector/app_voice_detector.cpp rename to src/apps/voice_detector/app_voice_detector.cpp diff --git a/apps/voice_detector/app_voice_detector.h b/src/apps/voice_detector/app_voice_detector.h similarity index 100% rename from apps/voice_detector/app_voice_detector.h rename to src/apps/voice_detector/app_voice_detector.h diff --git a/apps/voice_detector/vad_sensor.h b/src/apps/voice_detector/vad_sensor.h similarity index 100% rename from apps/voice_detector/vad_sensor.h rename to src/apps/voice_detector/vad_sensor.h diff --git a/apps/voice_detector/voice_detector.c b/src/apps/voice_detector/voice_detector.c similarity index 100% rename from apps/voice_detector/voice_detector.c rename to src/apps/voice_detector/voice_detector.c diff --git a/apps/voice_detector/voice_detector.h b/src/apps/voice_detector/voice_detector.h similarity index 100% rename from apps/voice_detector/voice_detector.h rename to src/apps/voice_detector/voice_detector.h diff --git a/build.sh b/src/build.sh similarity index 100% rename from build.sh rename to src/build.sh diff --git a/clear.sh b/src/clear.sh similarity index 100% rename from clear.sh rename to src/clear.sh diff --git a/config/Makefile b/src/config/Makefile similarity index 100% rename from config/Makefile rename to src/config/Makefile diff --git a/config/_default_cfg_src_/app_status_ind.c b/src/config/_default_cfg_src_/app_status_ind.c similarity index 100% rename from config/_default_cfg_src_/app_status_ind.c rename to src/config/_default_cfg_src_/app_status_ind.c diff --git a/config/_default_cfg_src_/res/cn/SOUND_ANSWER.opus b/src/config/_default_cfg_src_/res/cn/SOUND_ANSWER.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_ANSWER.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_ANSWER.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_CHARGE_FINISH.opus b/src/config/_default_cfg_src_/res/cn/SOUND_CHARGE_FINISH.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_CHARGE_FINISH.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_CHARGE_FINISH.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_CHARGE_PLEASE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_CHARGE_PLEASE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_CHARGE_PLEASE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_CHARGE_PLEASE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_CONNECTED.opus b/src/config/_default_cfg_src_/res/cn/SOUND_CONNECTED.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_CONNECTED.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_CONNECTED.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_DIS_CONNECT.opus b/src/config/_default_cfg_src_/res/cn/SOUND_DIS_CONNECT.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_DIS_CONNECT.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_DIS_CONNECT.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_EIGHT.opus b/src/config/_default_cfg_src_/res/cn/SOUND_EIGHT.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_EIGHT.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_EIGHT.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_FINDME.opus b/src/config/_default_cfg_src_/res/cn/SOUND_FINDME.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_FINDME.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_FINDME.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_FIVE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_FIVE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_FIVE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_FIVE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_FOUR.opus b/src/config/_default_cfg_src_/res/cn/SOUND_FOUR.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_FOUR.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_FOUR.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_HUNG_UP.opus b/src/config/_default_cfg_src_/res/cn/SOUND_HUNG_UP.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_HUNG_UP.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_HUNG_UP.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_INCOMING_CALL.opus b/src/config/_default_cfg_src_/res/cn/SOUND_INCOMING_CALL.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_INCOMING_CALL.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_INCOMING_CALL.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_LANGUAGE_SWITCH.opus b/src/config/_default_cfg_src_/res/cn/SOUND_LANGUAGE_SWITCH.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_LANGUAGE_SWITCH.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_LANGUAGE_SWITCH.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_MUTE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_MUTE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_MUTE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_MUTE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_NINE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_NINE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_NINE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_NINE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_ONE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_ONE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_ONE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_ONE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_OVER.opus b/src/config/_default_cfg_src_/res/cn/SOUND_OVER.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_OVER.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_OVER.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_PAIRING.opus b/src/config/_default_cfg_src_/res/cn/SOUND_PAIRING.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_PAIRING.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_PAIRING.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_PAIRING_FAIL.opus b/src/config/_default_cfg_src_/res/cn/SOUND_PAIRING_FAIL.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_PAIRING_FAIL.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_PAIRING_FAIL.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_PAIRING_SUCCESS.opus b/src/config/_default_cfg_src_/res/cn/SOUND_PAIRING_SUCCESS.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_PAIRING_SUCCESS.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_PAIRING_SUCCESS.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_PAIR_ENABLE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_PAIR_ENABLE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_PAIR_ENABLE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_PAIR_ENABLE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_POWER_OFF.opus b/src/config/_default_cfg_src_/res/cn/SOUND_POWER_OFF.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_POWER_OFF.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_POWER_OFF.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_POWER_ON.opus b/src/config/_default_cfg_src_/res/cn/SOUND_POWER_ON.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_POWER_ON.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_POWER_ON.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_REFUSE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_REFUSE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_REFUSE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_REFUSE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_SEVEN.opus b/src/config/_default_cfg_src_/res/cn/SOUND_SEVEN.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_SEVEN.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_SEVEN.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_SIX.opus b/src/config/_default_cfg_src_/res/cn/SOUND_SIX.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_SIX.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_SIX.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_THREE.opus b/src/config/_default_cfg_src_/res/cn/SOUND_THREE.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_THREE.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_THREE.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_TWO.opus b/src/config/_default_cfg_src_/res/cn/SOUND_TWO.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_TWO.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_TWO.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_WARNING.opus b/src/config/_default_cfg_src_/res/cn/SOUND_WARNING.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_WARNING.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_WARNING.opus diff --git a/config/_default_cfg_src_/res/cn/SOUND_ZERO.opus b/src/config/_default_cfg_src_/res/cn/SOUND_ZERO.opus similarity index 100% rename from config/_default_cfg_src_/res/cn/SOUND_ZERO.opus rename to src/config/_default_cfg_src_/res/cn/SOUND_ZERO.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_ALEXA_START.opus b/src/config/_default_cfg_src_/res/en/SOUND_ALEXA_START.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_ALEXA_START.opus rename to src/config/_default_cfg_src_/res/en/SOUND_ALEXA_START.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_ALEXA_STOP.opus b/src/config/_default_cfg_src_/res/en/SOUND_ALEXA_STOP.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_ALEXA_STOP.opus rename to src/config/_default_cfg_src_/res/en/SOUND_ALEXA_STOP.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_ANSWER.opus b/src/config/_default_cfg_src_/res/en/SOUND_ANSWER.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_ANSWER.opus rename to src/config/_default_cfg_src_/res/en/SOUND_ANSWER.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_CHARGE_FINISH.opus b/src/config/_default_cfg_src_/res/en/SOUND_CHARGE_FINISH.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_CHARGE_FINISH.opus rename to src/config/_default_cfg_src_/res/en/SOUND_CHARGE_FINISH.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_CHARGE_PLEASE.opus b/src/config/_default_cfg_src_/res/en/SOUND_CHARGE_PLEASE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_CHARGE_PLEASE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_CHARGE_PLEASE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_CONNECTED.opus b/src/config/_default_cfg_src_/res/en/SOUND_CONNECTED.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_CONNECTED.opus rename to src/config/_default_cfg_src_/res/en/SOUND_CONNECTED.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_DIS_CONNECT.opus b/src/config/_default_cfg_src_/res/en/SOUND_DIS_CONNECT.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_DIS_CONNECT.opus rename to src/config/_default_cfg_src_/res/en/SOUND_DIS_CONNECT.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_EIGHT.opus b/src/config/_default_cfg_src_/res/en/SOUND_EIGHT.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_EIGHT.opus rename to src/config/_default_cfg_src_/res/en/SOUND_EIGHT.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_FINDME.opus b/src/config/_default_cfg_src_/res/en/SOUND_FINDME.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_FINDME.opus rename to src/config/_default_cfg_src_/res/en/SOUND_FINDME.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_FIVE.opus b/src/config/_default_cfg_src_/res/en/SOUND_FIVE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_FIVE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_FIVE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_FOUR.opus b/src/config/_default_cfg_src_/res/en/SOUND_FOUR.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_FOUR.opus rename to src/config/_default_cfg_src_/res/en/SOUND_FOUR.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_CLOSE.opus b/src/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_CLOSE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_CLOSE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_CLOSE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_OPEN.opus b/src/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_OPEN.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_OPEN.opus rename to src/config/_default_cfg_src_/res/en/SOUND_GSOUND_MIC_OPEN.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_GSOUND_NC.opus b/src/config/_default_cfg_src_/res/en/SOUND_GSOUND_NC.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_GSOUND_NC.opus rename to src/config/_default_cfg_src_/res/en/SOUND_GSOUND_NC.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_HUNG_UP.opus b/src/config/_default_cfg_src_/res/en/SOUND_HUNG_UP.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_HUNG_UP.opus rename to src/config/_default_cfg_src_/res/en/SOUND_HUNG_UP.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_INCOMING_CALL.opus b/src/config/_default_cfg_src_/res/en/SOUND_INCOMING_CALL.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_INCOMING_CALL.opus rename to src/config/_default_cfg_src_/res/en/SOUND_INCOMING_CALL.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_LANGUAGE_SWITCH.opus b/src/config/_default_cfg_src_/res/en/SOUND_LANGUAGE_SWITCH.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_LANGUAGE_SWITCH.opus rename to src/config/_default_cfg_src_/res/en/SOUND_LANGUAGE_SWITCH.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_MUTE.opus b/src/config/_default_cfg_src_/res/en/SOUND_MUTE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_MUTE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_MUTE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_NINE.opus b/src/config/_default_cfg_src_/res/en/SOUND_NINE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_NINE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_NINE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_ONE.opus b/src/config/_default_cfg_src_/res/en/SOUND_ONE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_ONE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_ONE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_OVER.opus b/src/config/_default_cfg_src_/res/en/SOUND_OVER.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_OVER.opus rename to src/config/_default_cfg_src_/res/en/SOUND_OVER.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_PAIRING.opus b/src/config/_default_cfg_src_/res/en/SOUND_PAIRING.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_PAIRING.opus rename to src/config/_default_cfg_src_/res/en/SOUND_PAIRING.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_PAIRING_FAIL.opus b/src/config/_default_cfg_src_/res/en/SOUND_PAIRING_FAIL.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_PAIRING_FAIL.opus rename to src/config/_default_cfg_src_/res/en/SOUND_PAIRING_FAIL.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_PAIRING_SUCCESS.opus b/src/config/_default_cfg_src_/res/en/SOUND_PAIRING_SUCCESS.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_PAIRING_SUCCESS.opus rename to src/config/_default_cfg_src_/res/en/SOUND_PAIRING_SUCCESS.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_PAIR_ENABLE.opus b/src/config/_default_cfg_src_/res/en/SOUND_PAIR_ENABLE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_PAIR_ENABLE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_PAIR_ENABLE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_POWER_OFF.opus b/src/config/_default_cfg_src_/res/en/SOUND_POWER_OFF.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_POWER_OFF.opus rename to src/config/_default_cfg_src_/res/en/SOUND_POWER_OFF.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_POWER_ON.opus b/src/config/_default_cfg_src_/res/en/SOUND_POWER_ON.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_POWER_ON.opus rename to src/config/_default_cfg_src_/res/en/SOUND_POWER_ON.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_REFUSE.opus b/src/config/_default_cfg_src_/res/en/SOUND_REFUSE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_REFUSE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_REFUSE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_SEVEN.opus b/src/config/_default_cfg_src_/res/en/SOUND_SEVEN.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_SEVEN.opus rename to src/config/_default_cfg_src_/res/en/SOUND_SEVEN.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_SIX.opus b/src/config/_default_cfg_src_/res/en/SOUND_SIX.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_SIX.opus rename to src/config/_default_cfg_src_/res/en/SOUND_SIX.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_THREE.opus b/src/config/_default_cfg_src_/res/en/SOUND_THREE.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_THREE.opus rename to src/config/_default_cfg_src_/res/en/SOUND_THREE.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_TWO.opus b/src/config/_default_cfg_src_/res/en/SOUND_TWO.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_TWO.opus rename to src/config/_default_cfg_src_/res/en/SOUND_TWO.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_WARNING.opus b/src/config/_default_cfg_src_/res/en/SOUND_WARNING.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_WARNING.opus rename to src/config/_default_cfg_src_/res/en/SOUND_WARNING.opus diff --git a/config/_default_cfg_src_/res/en/SOUND_ZERO.opus b/src/config/_default_cfg_src_/res/en/SOUND_ZERO.opus similarity index 100% rename from config/_default_cfg_src_/res/en/SOUND_ZERO.opus rename to src/config/_default_cfg_src_/res/en/SOUND_ZERO.opus diff --git a/config/_default_cfg_src_/res/en/dudu.opus b/src/config/_default_cfg_src_/res/en/dudu.opus similarity index 100% rename from config/_default_cfg_src_/res/en/dudu.opus rename to src/config/_default_cfg_src_/res/en/dudu.opus diff --git a/config/_default_cfg_src_/res/gs_hw/en_all.txt b/src/config/_default_cfg_src_/res/gs_hw/en_all.txt similarity index 100% rename from config/_default_cfg_src_/res/gs_hw/en_all.txt rename to src/config/_default_cfg_src_/res/gs_hw/en_all.txt diff --git a/config/_default_cfg_src_/res/ring/SOUND_RING_16000.txt b/src/config/_default_cfg_src_/res/ring/SOUND_RING_16000.txt similarity index 100% rename from config/_default_cfg_src_/res/ring/SOUND_RING_16000.txt rename to src/config/_default_cfg_src_/res/ring/SOUND_RING_16000.txt diff --git a/config/_default_cfg_src_/res/ring/SOUND_RING_44100.txt b/src/config/_default_cfg_src_/res/ring/SOUND_RING_44100.txt similarity index 100% rename from config/_default_cfg_src_/res/ring/SOUND_RING_44100.txt rename to src/config/_default_cfg_src_/res/ring/SOUND_RING_44100.txt diff --git a/config/_default_cfg_src_/res/ring/SOUND_RING_48000.txt b/src/config/_default_cfg_src_/res/ring/SOUND_RING_48000.txt similarity index 100% rename from config/_default_cfg_src_/res/ring/SOUND_RING_48000.txt rename to src/config/_default_cfg_src_/res/ring/SOUND_RING_48000.txt diff --git a/config/_default_cfg_src_/res/ring/SOUND_RING_8000.txt b/src/config/_default_cfg_src_/res/ring/SOUND_RING_8000.txt similarity index 100% rename from config/_default_cfg_src_/res/ring/SOUND_RING_8000.txt rename to src/config/_default_cfg_src_/res/ring/SOUND_RING_8000.txt diff --git a/config/_default_cfg_src_/slave_code.S b/src/config/_default_cfg_src_/slave_code.S similarity index 100% rename from config/_default_cfg_src_/slave_code.S rename to src/config/_default_cfg_src_/slave_code.S diff --git a/config/_default_cfg_src_/tgt_hardware.c b/src/config/_default_cfg_src_/tgt_hardware.c similarity index 100% rename from config/_default_cfg_src_/tgt_hardware.c rename to src/config/_default_cfg_src_/tgt_hardware.c diff --git a/config/_default_cfg_src_/tgt_hardware.h b/src/config/_default_cfg_src_/tgt_hardware.h similarity index 100% rename from config/_default_cfg_src_/tgt_hardware.h rename to src/config/_default_cfg_src_/tgt_hardware.h diff --git a/config/bak_open/target.mk b/src/config/bak_open/target.mk similarity index 100% rename from config/bak_open/target.mk rename to src/config/bak_open/target.mk diff --git a/config/bak_open/tgt_hardware.c b/src/config/bak_open/tgt_hardware.c similarity index 100% rename from config/bak_open/tgt_hardware.c rename to src/config/bak_open/tgt_hardware.c diff --git a/config/bak_open/tgt_hardware.h b/src/config/bak_open/tgt_hardware.h similarity index 100% rename from config/bak_open/tgt_hardware.h rename to src/config/bak_open/tgt_hardware.h diff --git a/config/best2300p_ibrt/target.mk b/src/config/best2300p_ibrt/target.mk similarity index 100% rename from config/best2300p_ibrt/target.mk rename to src/config/best2300p_ibrt/target.mk diff --git a/config/best2300p_ibrt/tgt_hardware.c b/src/config/best2300p_ibrt/tgt_hardware.c similarity index 100% rename from config/best2300p_ibrt/tgt_hardware.c rename to src/config/best2300p_ibrt/tgt_hardware.c diff --git a/config/best2300p_ibrt/tgt_hardware.h b/src/config/best2300p_ibrt/tgt_hardware.h similarity index 100% rename from config/best2300p_ibrt/tgt_hardware.h rename to src/config/best2300p_ibrt/tgt_hardware.h diff --git a/config/best2300p_ibrt_anc/target.mk b/src/config/best2300p_ibrt_anc/target.mk similarity index 100% rename from config/best2300p_ibrt_anc/target.mk rename to src/config/best2300p_ibrt_anc/target.mk diff --git a/config/best2300p_ibrt_anc/tgt_hardware.c b/src/config/best2300p_ibrt_anc/tgt_hardware.c similarity index 100% rename from config/best2300p_ibrt_anc/tgt_hardware.c rename to src/config/best2300p_ibrt_anc/tgt_hardware.c diff --git a/config/best2300p_ibrt_anc/tgt_hardware.h b/src/config/best2300p_ibrt_anc/tgt_hardware.h similarity index 100% rename from config/best2300p_ibrt_anc/tgt_hardware.h rename to src/config/best2300p_ibrt_anc/tgt_hardware.h diff --git a/config/common.mk b/src/config/common.mk similarity index 100% rename from config/common.mk rename to src/config/common.mk diff --git a/config/mic_alg/target.mk b/src/config/mic_alg/target.mk similarity index 100% rename from config/mic_alg/target.mk rename to src/config/mic_alg/target.mk diff --git a/config/mic_alg/tgt_hardware.c b/src/config/mic_alg/tgt_hardware.c similarity index 100% rename from config/mic_alg/tgt_hardware.c rename to src/config/mic_alg/tgt_hardware.c diff --git a/config/mic_alg/tgt_hardware.h b/src/config/mic_alg/tgt_hardware.h similarity index 100% rename from config/mic_alg/tgt_hardware.h rename to src/config/mic_alg/tgt_hardware.h diff --git a/config/open_source/target.mk b/src/config/open_source/target.mk similarity index 100% rename from config/open_source/target.mk rename to src/config/open_source/target.mk diff --git a/config/open_source/tgt_hardware.c b/src/config/open_source/tgt_hardware.c similarity index 100% rename from config/open_source/tgt_hardware.c rename to src/config/open_source/tgt_hardware.c diff --git a/config/open_source/tgt_hardware.h b/src/config/open_source/tgt_hardware.h similarity index 100% rename from config/open_source/tgt_hardware.h rename to src/config/open_source/tgt_hardware.h diff --git a/convert.sh b/src/convert.sh similarity index 100% rename from convert.sh rename to src/convert.sh diff --git a/include/rtos/freertos/FreeRTOS.h b/src/include/rtos/freertos/FreeRTOS.h similarity index 100% rename from include/rtos/freertos/FreeRTOS.h rename to src/include/rtos/freertos/FreeRTOS.h diff --git a/include/rtos/freertos/FreeRTOSConfig.h b/src/include/rtos/freertos/FreeRTOSConfig.h similarity index 100% rename from include/rtos/freertos/FreeRTOSConfig.h rename to src/include/rtos/freertos/FreeRTOSConfig.h diff --git a/include/rtos/freertos/StackMacros.h b/src/include/rtos/freertos/StackMacros.h similarity index 100% rename from include/rtos/freertos/StackMacros.h rename to src/include/rtos/freertos/StackMacros.h diff --git a/include/rtos/freertos/cmsis_os.h b/src/include/rtos/freertos/cmsis_os.h similarity index 100% rename from include/rtos/freertos/cmsis_os.h rename to src/include/rtos/freertos/cmsis_os.h diff --git a/include/rtos/freertos/cmsis_os2.h b/src/include/rtos/freertos/cmsis_os2.h similarity index 100% rename from include/rtos/freertos/cmsis_os2.h rename to src/include/rtos/freertos/cmsis_os2.h diff --git a/include/rtos/freertos/croutine.h b/src/include/rtos/freertos/croutine.h similarity index 100% rename from include/rtos/freertos/croutine.h rename to src/include/rtos/freertos/croutine.h diff --git a/include/rtos/freertos/deprecated_definitions.h b/src/include/rtos/freertos/deprecated_definitions.h similarity index 100% rename from include/rtos/freertos/deprecated_definitions.h rename to src/include/rtos/freertos/deprecated_definitions.h diff --git a/include/rtos/freertos/event_groups.h b/src/include/rtos/freertos/event_groups.h similarity index 100% rename from include/rtos/freertos/event_groups.h rename to src/include/rtos/freertos/event_groups.h diff --git a/include/rtos/freertos/freertos_evr.h b/src/include/rtos/freertos/freertos_evr.h similarity index 100% rename from include/rtos/freertos/freertos_evr.h rename to src/include/rtos/freertos/freertos_evr.h diff --git a/include/rtos/freertos/freertos_list.h b/src/include/rtos/freertos/freertos_list.h similarity index 100% rename from include/rtos/freertos/freertos_list.h rename to src/include/rtos/freertos/freertos_list.h diff --git a/include/rtos/freertos/message_buffer.h b/src/include/rtos/freertos/message_buffer.h similarity index 100% rename from include/rtos/freertos/message_buffer.h rename to src/include/rtos/freertos/message_buffer.h diff --git a/include/rtos/freertos/mpu_prototypes.h b/src/include/rtos/freertos/mpu_prototypes.h similarity index 100% rename from include/rtos/freertos/mpu_prototypes.h rename to src/include/rtos/freertos/mpu_prototypes.h diff --git a/include/rtos/freertos/mpu_wrappers.h b/src/include/rtos/freertos/mpu_wrappers.h similarity index 100% rename from include/rtos/freertos/mpu_wrappers.h rename to src/include/rtos/freertos/mpu_wrappers.h diff --git a/include/rtos/freertos/portable.h b/src/include/rtos/freertos/portable.h similarity index 100% rename from include/rtos/freertos/portable.h rename to src/include/rtos/freertos/portable.h diff --git a/include/rtos/freertos/portmacro.h b/src/include/rtos/freertos/portmacro.h similarity index 100% rename from include/rtos/freertos/portmacro.h rename to src/include/rtos/freertos/portmacro.h diff --git a/include/rtos/freertos/projdefs.h b/src/include/rtos/freertos/projdefs.h similarity index 100% rename from include/rtos/freertos/projdefs.h rename to src/include/rtos/freertos/projdefs.h diff --git a/include/rtos/freertos/queue.h b/src/include/rtos/freertos/queue.h similarity index 100% rename from include/rtos/freertos/queue.h rename to src/include/rtos/freertos/queue.h diff --git a/include/rtos/freertos/semphr.h b/src/include/rtos/freertos/semphr.h similarity index 100% rename from include/rtos/freertos/semphr.h rename to src/include/rtos/freertos/semphr.h diff --git a/include/rtos/freertos/stack_macros.h b/src/include/rtos/freertos/stack_macros.h similarity index 100% rename from include/rtos/freertos/stack_macros.h rename to src/include/rtos/freertos/stack_macros.h diff --git a/include/rtos/freertos/stdint.readme b/src/include/rtos/freertos/stdint.readme similarity index 100% rename from include/rtos/freertos/stdint.readme rename to src/include/rtos/freertos/stdint.readme diff --git a/include/rtos/freertos/stream_buffer.h b/src/include/rtos/freertos/stream_buffer.h similarity index 100% rename from include/rtos/freertos/stream_buffer.h rename to src/include/rtos/freertos/stream_buffer.h diff --git a/include/rtos/freertos/task.h b/src/include/rtos/freertos/task.h similarity index 100% rename from include/rtos/freertos/task.h rename to src/include/rtos/freertos/task.h diff --git a/include/rtos/freertos/timers.h b/src/include/rtos/freertos/timers.h similarity index 100% rename from include/rtos/freertos/timers.h rename to src/include/rtos/freertos/timers.h diff --git a/include/rtos/rtx/cmsis_os.h b/src/include/rtos/rtx/cmsis_os.h similarity index 100% rename from include/rtos/rtx/cmsis_os.h rename to src/include/rtos/rtx/cmsis_os.h diff --git a/include/rtos/rtx/os_tcb.h b/src/include/rtos/rtx/os_tcb.h similarity index 100% rename from include/rtos/rtx/os_tcb.h rename to src/include/rtos/rtx/os_tcb.h diff --git a/include/rtos/rtx5/cmsis_os.h b/src/include/rtos/rtx5/cmsis_os.h similarity index 100% rename from include/rtos/rtx5/cmsis_os.h rename to src/include/rtos/rtx5/cmsis_os.h diff --git a/include/rtos/rtx5/cmsis_os2.h b/src/include/rtos/rtx5/cmsis_os2.h similarity index 100% rename from include/rtos/rtx5/cmsis_os2.h rename to src/include/rtos/rtx5/cmsis_os2.h diff --git a/include/rtos/rtx5/os_tick.h b/src/include/rtos/rtx5/os_tick.h similarity index 100% rename from include/rtos/rtx5/os_tick.h rename to src/include/rtos/rtx5/os_tick.h diff --git a/include/rtos/rtx5/rtx_evr.h b/src/include/rtos/rtx5/rtx_evr.h similarity index 100% rename from include/rtos/rtx5/rtx_evr.h rename to src/include/rtos/rtx5/rtx_evr.h diff --git a/include/rtos/rtx5/rtx_os.h b/src/include/rtos/rtx5/rtx_os.h similarity index 100% rename from include/rtos/rtx5/rtx_os.h rename to src/include/rtos/rtx5/rtx_os.h diff --git a/notes.txt b/src/notes.txt similarity index 100% rename from notes.txt rename to src/notes.txt diff --git a/src/platform/CMakeLists.txt b/src/platform/CMakeLists.txt new file mode 100644 index 00000000..099f3ee9 --- /dev/null +++ b/src/platform/CMakeLists.txt @@ -0,0 +1,4 @@ +add_subdirectory(cmsis) +add_subdirectory(drivers) +add_subdirectory(hal) +#add_subdirectory(main) \ No newline at end of file diff --git a/platform/Makefile b/src/platform/Makefile similarity index 100% rename from platform/Makefile rename to src/platform/Makefile diff --git a/src/platform/cmsis/CMakeLists.txt b/src/platform/cmsis/CMakeLists.txt new file mode 100644 index 00000000..66537676 --- /dev/null +++ b/src/platform/cmsis/CMakeLists.txt @@ -0,0 +1,16 @@ +file (GLOB headers "inc/*.h" "inc/ca/*.h" "*.h") +file (GLOB sources "ca/*.c" "ca/*.S" "*.c*") + +add_compile_definitions(USAGE_FAULT=1 BUS_FAULT=1 MEM_FAULT=1) + +if(DSP_LIB) + add_subdirectory(DSP_Lib) +endif(DSP_LIB) + +add_library (platform_cmsis STATIC ${sources} ${headers}) +set_property(TARGET platform_cmsis APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") +target_link_libraries(platform_cmsis platform_drivers_ana platform_drivers_codec platform_drivers_norflash) +target_include_directories(platform_cmsis PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/inc/ca/ + ${CMAKE_CURRENT_SOURCE_DIR}/inc/ +) diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/BasicMathFunctions.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/BasicMathFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/BasicMathFunctions.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/BasicMathFunctions.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/Makefile b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_abs_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_add_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_dot_prod_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_mult_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_negate_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_offset_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_scale_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_shift_q7.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_f32.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_f32.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_f32.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q15.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q15.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q15.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q31.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q31.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q31.c diff --git a/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q7.c b/src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q7.c rename to src/platform/cmsis/DSP_Lib/BasicMathFunctions/arm_sub_q7.c diff --git a/platform/cmsis/DSP_Lib/CommonTables/CommonTables.c b/src/platform/cmsis/DSP_Lib/CommonTables/CommonTables.c similarity index 100% rename from platform/cmsis/DSP_Lib/CommonTables/CommonTables.c rename to src/platform/cmsis/DSP_Lib/CommonTables/CommonTables.c diff --git a/platform/cmsis/DSP_Lib/CommonTables/Makefile b/src/platform/cmsis/DSP_Lib/CommonTables/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/CommonTables/Makefile rename to src/platform/cmsis/DSP_Lib/CommonTables/Makefile diff --git a/platform/cmsis/DSP_Lib/CommonTables/arm_common_tables.c b/src/platform/cmsis/DSP_Lib/CommonTables/arm_common_tables.c similarity index 100% rename from platform/cmsis/DSP_Lib/CommonTables/arm_common_tables.c rename to src/platform/cmsis/DSP_Lib/CommonTables/arm_common_tables.c diff --git a/platform/cmsis/DSP_Lib/CommonTables/arm_const_structs.c b/src/platform/cmsis/DSP_Lib/CommonTables/arm_const_structs.c similarity index 100% rename from platform/cmsis/DSP_Lib/CommonTables/arm_const_structs.c rename to src/platform/cmsis/DSP_Lib/CommonTables/arm_const_structs.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/ComplexMathFunctions.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/ComplexMathFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/ComplexMathFunctions.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/ComplexMathFunctions.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/Makefile b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_conj_q31.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_dot_prod_q31.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_q31.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mag_squared_q31.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_cmplx_q31.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_f32.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_f32.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_f32.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q15.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q15.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q15.c diff --git a/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q31.c b/src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q31.c rename to src/platform/cmsis/DSP_Lib/ComplexMathFunctions/arm_cmplx_mult_real_q31.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/ControllerFunctions.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/ControllerFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/ControllerFunctions.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/ControllerFunctions.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/Makefile b/src/platform/cmsis/DSP_Lib/ControllerFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_f32.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_f32.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_f32.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q15.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q15.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q15.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q31.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q31.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_init_q31.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_f32.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_f32.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_f32.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q15.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q15.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q15.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q31.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q31.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_pid_reset_q31.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_f32.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_f32.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_f32.c diff --git a/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_q31.c b/src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_q31.c rename to src/platform/cmsis/DSP_Lib/ControllerFunctions/arm_sin_cos_q31.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/FastMathFunctions.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/FastMathFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/FastMathFunctions.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/FastMathFunctions.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/Makefile b/src/platform/cmsis/DSP_Lib/FastMathFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_f32.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_f32.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_f32.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q15.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q15.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q15.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q31.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q31.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_cos_q31.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_f32.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_f32.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_f32.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q15.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q15.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q15.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q31.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q31.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sin_q31.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q15.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q15.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q15.c diff --git a/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q31.c b/src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q31.c rename to src/platform/cmsis/DSP_Lib/FastMathFunctions/arm_sqrt_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/FilteringFunctions.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/FilteringFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/FilteringFunctions.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/FilteringFunctions.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/Makefile b/src/platform/cmsis/DSP_Lib/FilteringFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_32x64_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df1_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f64.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f64.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f64.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_f64.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_df2T_init_f64.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_biquad_cascade_stereo_df2T_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_opt_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_opt_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_partial_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_conv_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_opt_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_correlate_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_decimate_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_init_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_interpolate_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_lattice_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_init_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q7.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q7.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_fir_sparse_q7.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_iir_lattice_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_f32.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_f32.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_f32.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_init_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_norm_q31.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q15.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q15.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q15.c diff --git a/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q31.c b/src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q31.c rename to src/platform/cmsis/DSP_Lib/FilteringFunctions/arm_lms_q31.c diff --git a/platform/cmsis/DSP_Lib/Makefile b/src/platform/cmsis/DSP_Lib/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/Makefile rename to src/platform/cmsis/DSP_Lib/Makefile diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/Makefile b/src/platform/cmsis/DSP_Lib/MatrixFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/MatrixFunctions.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/MatrixFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/MatrixFunctions.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/MatrixFunctions.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_add_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_cmplx_mult_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_init_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f64.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f64.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f64.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_inverse_f64.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_fast_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_mult_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_scale_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_sub_q31.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_f32.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_f32.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_f32.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q15.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q15.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q15.c diff --git a/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q31.c b/src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q31.c rename to src/platform/cmsis/DSP_Lib/MatrixFunctions/arm_mat_trans_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/Makefile b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/StatisticsFunctions.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/StatisticsFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/StatisticsFunctions.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/StatisticsFunctions.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q7.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q7.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_max_q7.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q7.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q7.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_mean_q7.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q7.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q7.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_min_q7.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q7.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q7.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_power_q7.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_rms_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_std_q31.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_f32.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_f32.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_f32.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q15.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q15.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q15.c diff --git a/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q31.c b/src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q31.c rename to src/platform/cmsis/DSP_Lib/StatisticsFunctions/arm_var_q31.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/Makefile b/src/platform/cmsis/DSP_Lib/SupportFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/SupportFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/SupportFunctions.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/SupportFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/SupportFunctions.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/SupportFunctions.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_f32.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_f32.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_f32.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q15.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q15.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q15.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q31.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q31.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q31.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q7.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q7.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_copy_q7.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_f32.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_f32.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_f32.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q15.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q15.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q15.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q31.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q31.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q31.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q7.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q7.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_fill_q7.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q15.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q15.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q15.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q31.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q31.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q31.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q7.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q7.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_float_to_q7.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_float.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_float.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_float.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_float.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q31.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q31.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q31.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q7.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q7.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q15_to_q7.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_float.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_float.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_float.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_float.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q15.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q15.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q15.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q7.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q7.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q7.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q31_to_q7.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_float.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_float.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_float.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_float.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q15.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q15.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q15.c diff --git a/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q31.c b/src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q31.c rename to src/platform/cmsis/DSP_Lib/SupportFunctions/arm_q7_to_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/Makefile b/src/platform/cmsis/DSP_Lib/TransformFunctions/Makefile similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/Makefile rename to src/platform/cmsis/DSP_Lib/TransformFunctions/Makefile diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/TransformFunctions.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/TransformFunctions.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/TransformFunctions.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/TransformFunctions.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.S b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.S similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.S rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.S diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_bitreversal2.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_init_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix2_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_init_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix4_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix8_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix8_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix8_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_cfft_radix8_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_init_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_dct4_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_init_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_init_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_fast_init_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_f32.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_f32.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_f32.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_f32.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_init_q31.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q15.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q15.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q15.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q15.c diff --git a/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q31.c b/src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q31.c similarity index 100% rename from platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q31.c rename to src/platform/cmsis/DSP_Lib/TransformFunctions/arm_rfft_q31.c diff --git a/platform/cmsis/LICENSE.txt b/src/platform/cmsis/LICENSE.txt similarity index 100% rename from platform/cmsis/LICENSE.txt rename to src/platform/cmsis/LICENSE.txt diff --git a/platform/cmsis/Makefile b/src/platform/cmsis/Makefile similarity index 100% rename from platform/cmsis/Makefile rename to src/platform/cmsis/Makefile diff --git a/platform/cmsis/ca/Makefile b/src/platform/cmsis/ca/Makefile similarity index 100% rename from platform/cmsis/ca/Makefile rename to src/platform/cmsis/ca/Makefile diff --git a/platform/cmsis/ca/cmsis_gic.c b/src/platform/cmsis/ca/cmsis_gic.c similarity index 100% rename from platform/cmsis/ca/cmsis_gic.c rename to src/platform/cmsis/ca/cmsis_gic.c diff --git a/platform/cmsis/ca/default_irq_ca.S b/src/platform/cmsis/ca/default_irq_ca.S similarity index 100% rename from platform/cmsis/ca/default_irq_ca.S rename to src/platform/cmsis/ca/default_irq_ca.S diff --git a/platform/cmsis/ca/irq_ctrl_gic.c b/src/platform/cmsis/ca/irq_ctrl_gic.c similarity index 100% rename from platform/cmsis/ca/irq_ctrl_gic.c rename to src/platform/cmsis/ca/irq_ctrl_gic.c diff --git a/platform/cmsis/ca/mmu_ARMCA.c b/src/platform/cmsis/ca/mmu_ARMCA.c similarity index 100% rename from platform/cmsis/ca/mmu_ARMCA.c rename to src/platform/cmsis/ca/mmu_ARMCA.c diff --git a/platform/cmsis/ca/startup_ARMCA.c b/src/platform/cmsis/ca/startup_ARMCA.c similarity index 100% rename from platform/cmsis/ca/startup_ARMCA.c rename to src/platform/cmsis/ca/startup_ARMCA.c diff --git a/platform/cmsis/ca/system_ARMCA.c b/src/platform/cmsis/ca/system_ARMCA.c similarity index 100% rename from platform/cmsis/ca/system_ARMCA.c rename to src/platform/cmsis/ca/system_ARMCA.c diff --git a/platform/cmsis/cmsis_nvic.c b/src/platform/cmsis/cmsis_nvic.c similarity index 100% rename from platform/cmsis/cmsis_nvic.c rename to src/platform/cmsis/cmsis_nvic.c diff --git a/platform/cmsis/inc/arm_common_tables.h b/src/platform/cmsis/inc/arm_common_tables.h similarity index 100% rename from platform/cmsis/inc/arm_common_tables.h rename to src/platform/cmsis/inc/arm_common_tables.h diff --git a/platform/cmsis/inc/arm_const_structs.h b/src/platform/cmsis/inc/arm_const_structs.h similarity index 100% rename from platform/cmsis/inc/arm_const_structs.h rename to src/platform/cmsis/inc/arm_const_structs.h diff --git a/platform/cmsis/inc/arm_math.h b/src/platform/cmsis/inc/arm_math.h similarity index 100% rename from platform/cmsis/inc/arm_math.h rename to src/platform/cmsis/inc/arm_math.h diff --git a/platform/cmsis/inc/best1000.h b/src/platform/cmsis/inc/best1000.h similarity index 100% rename from platform/cmsis/inc/best1000.h rename to src/platform/cmsis/inc/best1000.h diff --git a/platform/cmsis/inc/best1400.h b/src/platform/cmsis/inc/best1400.h similarity index 100% rename from platform/cmsis/inc/best1400.h rename to src/platform/cmsis/inc/best1400.h diff --git a/platform/cmsis/inc/best2000.h b/src/platform/cmsis/inc/best2000.h similarity index 100% rename from platform/cmsis/inc/best2000.h rename to src/platform/cmsis/inc/best2000.h diff --git a/platform/cmsis/inc/best2001.h b/src/platform/cmsis/inc/best2001.h similarity index 100% rename from platform/cmsis/inc/best2001.h rename to src/platform/cmsis/inc/best2001.h diff --git a/platform/cmsis/inc/best2300.h b/src/platform/cmsis/inc/best2300.h similarity index 100% rename from platform/cmsis/inc/best2300.h rename to src/platform/cmsis/inc/best2300.h diff --git a/platform/cmsis/inc/best2300a.h b/src/platform/cmsis/inc/best2300a.h similarity index 100% rename from platform/cmsis/inc/best2300a.h rename to src/platform/cmsis/inc/best2300a.h diff --git a/platform/cmsis/inc/best2300p.h b/src/platform/cmsis/inc/best2300p.h similarity index 100% rename from platform/cmsis/inc/best2300p.h rename to src/platform/cmsis/inc/best2300p.h diff --git a/platform/cmsis/inc/best3001.h b/src/platform/cmsis/inc/best3001.h similarity index 100% rename from platform/cmsis/inc/best3001.h rename to src/platform/cmsis/inc/best3001.h diff --git a/platform/cmsis/inc/best3003.h b/src/platform/cmsis/inc/best3003.h similarity index 100% rename from platform/cmsis/inc/best3003.h rename to src/platform/cmsis/inc/best3003.h diff --git a/platform/cmsis/inc/ca/best2001_dsp.h b/src/platform/cmsis/inc/ca/best2001_dsp.h similarity index 100% rename from platform/cmsis/inc/ca/best2001_dsp.h rename to src/platform/cmsis/inc/ca/best2001_dsp.h diff --git a/platform/cmsis/inc/ca/cmsis_armcc_ca.h b/src/platform/cmsis/inc/ca/cmsis_armcc_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_armcc_ca.h rename to src/platform/cmsis/inc/ca/cmsis_armcc_ca.h diff --git a/platform/cmsis/inc/ca/cmsis_armclang_ca.h b/src/platform/cmsis/inc/ca/cmsis_armclang_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_armclang_ca.h rename to src/platform/cmsis/inc/ca/cmsis_armclang_ca.h diff --git a/platform/cmsis/inc/ca/cmsis_compiler_ca.h b/src/platform/cmsis/inc/ca/cmsis_compiler_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_compiler_ca.h rename to src/platform/cmsis/inc/ca/cmsis_compiler_ca.h diff --git a/platform/cmsis/inc/ca/cmsis_cp15_ca.h b/src/platform/cmsis/inc/ca/cmsis_cp15_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_cp15_ca.h rename to src/platform/cmsis/inc/ca/cmsis_cp15_ca.h diff --git a/platform/cmsis/inc/ca/cmsis_gcc_ca.h b/src/platform/cmsis/inc/ca/cmsis_gcc_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_gcc_ca.h rename to src/platform/cmsis/inc/ca/cmsis_gcc_ca.h diff --git a/platform/cmsis/inc/ca/cmsis_iccarm_ca.h b/src/platform/cmsis/inc/ca/cmsis_iccarm_ca.h similarity index 100% rename from platform/cmsis/inc/ca/cmsis_iccarm_ca.h rename to src/platform/cmsis/inc/ca/cmsis_iccarm_ca.h diff --git a/platform/cmsis/inc/ca/core_ca.h b/src/platform/cmsis/inc/ca/core_ca.h similarity index 100% rename from platform/cmsis/inc/ca/core_ca.h rename to src/platform/cmsis/inc/ca/core_ca.h diff --git a/platform/cmsis/inc/ca/irq_ctrl.h b/src/platform/cmsis/inc/ca/irq_ctrl.h similarity index 100% rename from platform/cmsis/inc/ca/irq_ctrl.h rename to src/platform/cmsis/inc/ca/irq_ctrl.h diff --git a/platform/cmsis/inc/ca/mem_ARMCA.h b/src/platform/cmsis/inc/ca/mem_ARMCA.h similarity index 100% rename from platform/cmsis/inc/ca/mem_ARMCA.h rename to src/platform/cmsis/inc/ca/mem_ARMCA.h diff --git a/platform/cmsis/inc/ca/system_ARMCA.h b/src/platform/cmsis/inc/ca/system_ARMCA.h similarity index 100% rename from platform/cmsis/inc/ca/system_ARMCA.h rename to src/platform/cmsis/inc/ca/system_ARMCA.h diff --git a/platform/cmsis/inc/cmsis.h b/src/platform/cmsis/inc/cmsis.h similarity index 100% rename from platform/cmsis/inc/cmsis.h rename to src/platform/cmsis/inc/cmsis.h diff --git a/platform/cmsis/inc/cmsis_armcc.h b/src/platform/cmsis/inc/cmsis_armcc.h similarity index 100% rename from platform/cmsis/inc/cmsis_armcc.h rename to src/platform/cmsis/inc/cmsis_armcc.h diff --git a/platform/cmsis/inc/cmsis_armclang.h b/src/platform/cmsis/inc/cmsis_armclang.h similarity index 100% rename from platform/cmsis/inc/cmsis_armclang.h rename to src/platform/cmsis/inc/cmsis_armclang.h diff --git a/platform/cmsis/inc/cmsis_armclang_ltm.h b/src/platform/cmsis/inc/cmsis_armclang_ltm.h similarity index 100% rename from platform/cmsis/inc/cmsis_armclang_ltm.h rename to src/platform/cmsis/inc/cmsis_armclang_ltm.h diff --git a/platform/cmsis/inc/cmsis_compiler.h b/src/platform/cmsis/inc/cmsis_compiler.h similarity index 100% rename from platform/cmsis/inc/cmsis_compiler.h rename to src/platform/cmsis/inc/cmsis_compiler.h diff --git a/platform/cmsis/inc/cmsis_gcc.h b/src/platform/cmsis/inc/cmsis_gcc.h similarity index 100% rename from platform/cmsis/inc/cmsis_gcc.h rename to src/platform/cmsis/inc/cmsis_gcc.h diff --git a/platform/cmsis/inc/cmsis_iccarm.h b/src/platform/cmsis/inc/cmsis_iccarm.h similarity index 100% rename from platform/cmsis/inc/cmsis_iccarm.h rename to src/platform/cmsis/inc/cmsis_iccarm.h diff --git a/platform/cmsis/inc/cmsis_nvic.h b/src/platform/cmsis/inc/cmsis_nvic.h similarity index 100% rename from platform/cmsis/inc/cmsis_nvic.h rename to src/platform/cmsis/inc/cmsis_nvic.h diff --git a/platform/cmsis/inc/cmsis_version.h b/src/platform/cmsis/inc/cmsis_version.h similarity index 100% rename from platform/cmsis/inc/cmsis_version.h rename to src/platform/cmsis/inc/cmsis_version.h diff --git a/platform/cmsis/inc/core_armv81mml.h b/src/platform/cmsis/inc/core_armv81mml.h similarity index 100% rename from platform/cmsis/inc/core_armv81mml.h rename to src/platform/cmsis/inc/core_armv81mml.h diff --git a/platform/cmsis/inc/core_armv8mbl.h b/src/platform/cmsis/inc/core_armv8mbl.h similarity index 100% rename from platform/cmsis/inc/core_armv8mbl.h rename to src/platform/cmsis/inc/core_armv8mbl.h diff --git a/platform/cmsis/inc/core_armv8mml.h b/src/platform/cmsis/inc/core_armv8mml.h similarity index 100% rename from platform/cmsis/inc/core_armv8mml.h rename to src/platform/cmsis/inc/core_armv8mml.h diff --git a/platform/cmsis/inc/core_cm0.h b/src/platform/cmsis/inc/core_cm0.h similarity index 100% rename from platform/cmsis/inc/core_cm0.h rename to src/platform/cmsis/inc/core_cm0.h diff --git a/platform/cmsis/inc/core_cm0plus.h b/src/platform/cmsis/inc/core_cm0plus.h similarity index 100% rename from platform/cmsis/inc/core_cm0plus.h rename to src/platform/cmsis/inc/core_cm0plus.h diff --git a/platform/cmsis/inc/core_cm1.h b/src/platform/cmsis/inc/core_cm1.h similarity index 100% rename from platform/cmsis/inc/core_cm1.h rename to src/platform/cmsis/inc/core_cm1.h diff --git a/platform/cmsis/inc/core_cm23.h b/src/platform/cmsis/inc/core_cm23.h similarity index 100% rename from platform/cmsis/inc/core_cm23.h rename to src/platform/cmsis/inc/core_cm23.h diff --git a/platform/cmsis/inc/core_cm3.h b/src/platform/cmsis/inc/core_cm3.h similarity index 100% rename from platform/cmsis/inc/core_cm3.h rename to src/platform/cmsis/inc/core_cm3.h diff --git a/platform/cmsis/inc/core_cm33.h b/src/platform/cmsis/inc/core_cm33.h similarity index 100% rename from platform/cmsis/inc/core_cm33.h rename to src/platform/cmsis/inc/core_cm33.h diff --git a/platform/cmsis/inc/core_cm35p.h b/src/platform/cmsis/inc/core_cm35p.h similarity index 100% rename from platform/cmsis/inc/core_cm35p.h rename to src/platform/cmsis/inc/core_cm35p.h diff --git a/platform/cmsis/inc/core_cm4.h b/src/platform/cmsis/inc/core_cm4.h similarity index 100% rename from platform/cmsis/inc/core_cm4.h rename to src/platform/cmsis/inc/core_cm4.h diff --git a/platform/cmsis/inc/core_cm7.h b/src/platform/cmsis/inc/core_cm7.h similarity index 100% rename from platform/cmsis/inc/core_cm7.h rename to src/platform/cmsis/inc/core_cm7.h diff --git a/platform/cmsis/inc/core_sc000.h b/src/platform/cmsis/inc/core_sc000.h similarity index 100% rename from platform/cmsis/inc/core_sc000.h rename to src/platform/cmsis/inc/core_sc000.h diff --git a/platform/cmsis/inc/core_sc300.h b/src/platform/cmsis/inc/core_sc300.h similarity index 100% rename from platform/cmsis/inc/core_sc300.h rename to src/platform/cmsis/inc/core_sc300.h diff --git a/platform/cmsis/inc/link_sym_armclang.h b/src/platform/cmsis/inc/link_sym_armclang.h similarity index 100% rename from platform/cmsis/inc/link_sym_armclang.h rename to src/platform/cmsis/inc/link_sym_armclang.h diff --git a/platform/cmsis/inc/main_entry.h b/src/platform/cmsis/inc/main_entry.h similarity index 100% rename from platform/cmsis/inc/main_entry.h rename to src/platform/cmsis/inc/main_entry.h diff --git a/platform/cmsis/inc/mpu.h b/src/platform/cmsis/inc/mpu.h similarity index 100% rename from platform/cmsis/inc/mpu.h rename to src/platform/cmsis/inc/mpu.h diff --git a/platform/cmsis/inc/mpu_armv7.h b/src/platform/cmsis/inc/mpu_armv7.h similarity index 100% rename from platform/cmsis/inc/mpu_armv7.h rename to src/platform/cmsis/inc/mpu_armv7.h diff --git a/platform/cmsis/inc/mpu_armv8.h b/src/platform/cmsis/inc/mpu_armv8.h similarity index 100% rename from platform/cmsis/inc/mpu_armv8.h rename to src/platform/cmsis/inc/mpu_armv8.h diff --git a/platform/cmsis/inc/patch.h b/src/platform/cmsis/inc/patch.h similarity index 100% rename from platform/cmsis/inc/patch.h rename to src/platform/cmsis/inc/patch.h diff --git a/platform/cmsis/inc/system_ARMCM.h b/src/platform/cmsis/inc/system_ARMCM.h similarity index 100% rename from platform/cmsis/inc/system_ARMCM.h rename to src/platform/cmsis/inc/system_ARMCM.h diff --git a/platform/cmsis/inc/system_cp.h b/src/platform/cmsis/inc/system_cp.h similarity index 100% rename from platform/cmsis/inc/system_cp.h rename to src/platform/cmsis/inc/system_cp.h diff --git a/platform/cmsis/inc/tz_context.h b/src/platform/cmsis/inc/tz_context.h similarity index 100% rename from platform/cmsis/inc/tz_context.h rename to src/platform/cmsis/inc/tz_context.h diff --git a/platform/cmsis/mpu_armv7m.c b/src/platform/cmsis/mpu_armv7m.c similarity index 100% rename from platform/cmsis/mpu_armv7m.c rename to src/platform/cmsis/mpu_armv7m.c diff --git a/platform/cmsis/mpu_armv8m.c b/src/platform/cmsis/mpu_armv8m.c similarity index 100% rename from platform/cmsis/mpu_armv8m.c rename to src/platform/cmsis/mpu_armv8m.c diff --git a/platform/cmsis/patch.c b/src/platform/cmsis/patch.c similarity index 100% rename from platform/cmsis/patch.c rename to src/platform/cmsis/patch.c diff --git a/platform/cmsis/patch_armv7m.c b/src/platform/cmsis/patch_armv7m.c similarity index 100% rename from platform/cmsis/patch_armv7m.c rename to src/platform/cmsis/patch_armv7m.c diff --git a/platform/cmsis/reg_patch.h b/src/platform/cmsis/reg_patch.h similarity index 100% rename from platform/cmsis/reg_patch.h rename to src/platform/cmsis/reg_patch.h diff --git a/platform/cmsis/reg_patch_armv7m.h b/src/platform/cmsis/reg_patch_armv7m.h similarity index 100% rename from platform/cmsis/reg_patch_armv7m.h rename to src/platform/cmsis/reg_patch_armv7m.h diff --git a/platform/cmsis/retarget_armclang.cpp b/src/platform/cmsis/retarget_armclang.cpp similarity index 100% rename from platform/cmsis/retarget_armclang.cpp rename to src/platform/cmsis/retarget_armclang.cpp diff --git a/platform/cmsis/retarget_armclang_asm.S b/src/platform/cmsis/retarget_armclang_asm.S similarity index 100% rename from platform/cmsis/retarget_armclang_asm.S rename to src/platform/cmsis/retarget_armclang_asm.S diff --git a/platform/cmsis/retarget_gcc.cpp b/src/platform/cmsis/retarget_gcc.cpp similarity index 100% rename from platform/cmsis/retarget_gcc.cpp rename to src/platform/cmsis/retarget_gcc.cpp diff --git a/platform/cmsis/stack_protector.c b/src/platform/cmsis/stack_protector.c similarity index 100% rename from platform/cmsis/stack_protector.c rename to src/platform/cmsis/stack_protector.c diff --git a/platform/cmsis/system_ARMCM.c b/src/platform/cmsis/system_ARMCM.c similarity index 100% rename from platform/cmsis/system_ARMCM.c rename to src/platform/cmsis/system_ARMCM.c diff --git a/platform/cmsis/system_cp.c b/src/platform/cmsis/system_cp.c similarity index 100% rename from platform/cmsis/system_cp.c rename to src/platform/cmsis/system_cp.c diff --git a/platform/cmsis/system_utils.c b/src/platform/cmsis/system_utils.c similarity index 100% rename from platform/cmsis/system_utils.c rename to src/platform/cmsis/system_utils.c diff --git a/src/platform/drivers/CMakeLists.txt b/src/platform/drivers/CMakeLists.txt new file mode 100644 index 00000000..26610547 --- /dev/null +++ b/src/platform/drivers/CMakeLists.txt @@ -0,0 +1,5 @@ +add_subdirectory(ana) +add_subdirectory(bt) +add_subdirectory(btpcm) +add_subdirectory(codec) +add_subdirectory(norflash) \ No newline at end of file diff --git a/platform/drivers/Makefile b/src/platform/drivers/Makefile similarity index 100% rename from platform/drivers/Makefile rename to src/platform/drivers/Makefile diff --git a/src/platform/drivers/ana/CMakeLists.txt b/src/platform/drivers/ana/CMakeLists.txt new file mode 100644 index 00000000..13f7538f --- /dev/null +++ b/src/platform/drivers/ana/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h" "${CHIP}/*.h") +file (GLOB sources "*.c*" "${CHIP}/*.c") + +add_library (platform_drivers_ana STATIC ${sources} ${headers}) +target_link_libraries(platform_drivers_ana platform_hal) +target_include_directories(platform_drivers_ana PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${CHIP}) diff --git a/platform/drivers/ana/Makefile b/src/platform/drivers/ana/Makefile similarity index 100% rename from platform/drivers/ana/Makefile rename to src/platform/drivers/ana/Makefile diff --git a/platform/drivers/ana/analog.h b/src/platform/drivers/ana/analog.h similarity index 100% rename from platform/drivers/ana/analog.h rename to src/platform/drivers/ana/analog.h diff --git a/platform/drivers/ana/best2300p/Makefile b/src/platform/drivers/ana/best2300p/Makefile similarity index 100% rename from platform/drivers/ana/best2300p/Makefile rename to src/platform/drivers/ana/best2300p/Makefile diff --git a/platform/drivers/ana/best2300p/analog_best2300p.c b/src/platform/drivers/ana/best2300p/analog_best2300p.c similarity index 100% rename from platform/drivers/ana/best2300p/analog_best2300p.c rename to src/platform/drivers/ana/best2300p/analog_best2300p.c diff --git a/platform/drivers/ana/best2300p/analog_best2300p.h b/src/platform/drivers/ana/best2300p/analog_best2300p.h similarity index 100% rename from platform/drivers/ana/best2300p/analog_best2300p.h rename to src/platform/drivers/ana/best2300p/analog_best2300p.h diff --git a/platform/drivers/ana/best2300p/pmu_best2300p.c b/src/platform/drivers/ana/best2300p/pmu_best2300p.c similarity index 100% rename from platform/drivers/ana/best2300p/pmu_best2300p.c rename to src/platform/drivers/ana/best2300p/pmu_best2300p.c diff --git a/platform/drivers/ana/best2300p/pmu_best2300p.h b/src/platform/drivers/ana/best2300p/pmu_best2300p.h similarity index 100% rename from platform/drivers/ana/best2300p/pmu_best2300p.h rename to src/platform/drivers/ana/best2300p/pmu_best2300p.h diff --git a/platform/drivers/ana/best2300p/reg_usbphy_best2300p.h b/src/platform/drivers/ana/best2300p/reg_usbphy_best2300p.h similarity index 100% rename from platform/drivers/ana/best2300p/reg_usbphy_best2300p.h rename to src/platform/drivers/ana/best2300p/reg_usbphy_best2300p.h diff --git a/platform/drivers/ana/best2300p/usbphy_best2300p.c b/src/platform/drivers/ana/best2300p/usbphy_best2300p.c similarity index 100% rename from platform/drivers/ana/best2300p/usbphy_best2300p.c rename to src/platform/drivers/ana/best2300p/usbphy_best2300p.c diff --git a/platform/drivers/ana/best2300p/usbphy_best2300p.h b/src/platform/drivers/ana/best2300p/usbphy_best2300p.h similarity index 100% rename from platform/drivers/ana/best2300p/usbphy_best2300p.h rename to src/platform/drivers/ana/best2300p/usbphy_best2300p.h diff --git a/platform/drivers/ana/pmu.h b/src/platform/drivers/ana/pmu.h similarity index 100% rename from platform/drivers/ana/pmu.h rename to src/platform/drivers/ana/pmu.h diff --git a/platform/drivers/ana/psramuhsphy.h b/src/platform/drivers/ana/psramuhsphy.h similarity index 100% rename from platform/drivers/ana/psramuhsphy.h rename to src/platform/drivers/ana/psramuhsphy.h diff --git a/platform/drivers/ana/usbphy.h b/src/platform/drivers/ana/usbphy.h similarity index 100% rename from platform/drivers/ana/usbphy.h rename to src/platform/drivers/ana/usbphy.h diff --git a/src/platform/drivers/bt/CMakeLists.txt b/src/platform/drivers/bt/CMakeLists.txt new file mode 100644 index 00000000..76a72b46 --- /dev/null +++ b/src/platform/drivers/bt/CMakeLists.txt @@ -0,0 +1,9 @@ +file (GLOB headers "*.h" "${CHIP}/*.h") +file (GLOB sources "*.c*" "${CHIP}/*.c") + +add_library (platform_drivers_bt STATIC ${sources} ${headers}) +target_link_libraries(platform_drivers_bt apps_common platform_drivers_ana utils_cqueue util_heap) +target_include_directories(platform_drivers_bt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${CHIP}) +target_include_directories(platform_drivers_bt PRIVATE + ${CMAKE_SOURCE_DIR}/services/nvrecord +) \ No newline at end of file diff --git a/platform/drivers/bt/Makefile b/src/platform/drivers/bt/Makefile similarity index 100% rename from platform/drivers/bt/Makefile rename to src/platform/drivers/bt/Makefile diff --git a/platform/drivers/bt/besbt_string.h b/src/platform/drivers/bt/besbt_string.h similarity index 100% rename from platform/drivers/bt/besbt_string.h rename to src/platform/drivers/bt/besbt_string.h diff --git a/platform/drivers/bt/best2300p/Makefile b/src/platform/drivers/bt/best2300p/Makefile similarity index 100% rename from platform/drivers/bt/best2300p/Makefile rename to src/platform/drivers/bt/best2300p/Makefile diff --git a/platform/drivers/bt/best2300p/bt_drv.cpp b/src/platform/drivers/bt/best2300p/bt_drv.cpp similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv.cpp rename to src/platform/drivers/bt/best2300p/bt_drv.cpp diff --git a/platform/drivers/bt/best2300p/bt_drv_2300p_internal.h b/src/platform/drivers/bt/best2300p/bt_drv_2300p_internal.h similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_2300p_internal.h rename to src/platform/drivers/bt/best2300p/bt_drv_2300p_internal.h diff --git a/platform/drivers/bt/best2300p/bt_drv_calibration.cpp b/src/platform/drivers/bt/best2300p/bt_drv_calibration.cpp similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_calibration.cpp rename to src/platform/drivers/bt/best2300p/bt_drv_calibration.cpp diff --git a/platform/drivers/bt/best2300p/bt_drv_config.c b/src/platform/drivers/bt/best2300p/bt_drv_config.c similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_config.c rename to src/platform/drivers/bt/best2300p/bt_drv_config.c diff --git a/platform/drivers/bt/best2300p/bt_drv_patch.c b/src/platform/drivers/bt/best2300p/bt_drv_patch.c similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_patch.c rename to src/platform/drivers/bt/best2300p/bt_drv_patch.c diff --git a/platform/drivers/bt/best2300p/bt_drv_reg_op.cpp b/src/platform/drivers/bt/best2300p/bt_drv_reg_op.cpp similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_reg_op.cpp rename to src/platform/drivers/bt/best2300p/bt_drv_reg_op.cpp diff --git a/platform/drivers/bt/best2300p/bt_drv_rfconfig.c b/src/platform/drivers/bt/best2300p/bt_drv_rfconfig.c similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_rfconfig.c rename to src/platform/drivers/bt/best2300p/bt_drv_rfconfig.c diff --git a/platform/drivers/bt/best2300p/bt_drv_uart_bridge_intsys.c b/src/platform/drivers/bt/best2300p/bt_drv_uart_bridge_intsys.c similarity index 100% rename from platform/drivers/bt/best2300p/bt_drv_uart_bridge_intsys.c rename to src/platform/drivers/bt/best2300p/bt_drv_uart_bridge_intsys.c diff --git a/platform/drivers/bt/best2300p/iqcorrect.c b/src/platform/drivers/bt/best2300p/iqcorrect.c similarity index 100% rename from platform/drivers/bt/best2300p/iqcorrect.c rename to src/platform/drivers/bt/best2300p/iqcorrect.c diff --git a/platform/drivers/bt/best2300p/iqcorrect.h b/src/platform/drivers/bt/best2300p/iqcorrect.h similarity index 100% rename from platform/drivers/bt/best2300p/iqcorrect.h rename to src/platform/drivers/bt/best2300p/iqcorrect.h diff --git a/platform/drivers/bt/bt_drv.h b/src/platform/drivers/bt/bt_drv.h similarity index 100% rename from platform/drivers/bt/bt_drv.h rename to src/platform/drivers/bt/bt_drv.h diff --git a/platform/drivers/bt/bt_drv_common.c b/src/platform/drivers/bt/bt_drv_common.c similarity index 100% rename from platform/drivers/bt/bt_drv_common.c rename to src/platform/drivers/bt/bt_drv_common.c diff --git a/platform/drivers/bt/bt_drv_interface.h b/src/platform/drivers/bt/bt_drv_interface.h similarity index 100% rename from platform/drivers/bt/bt_drv_interface.h rename to src/platform/drivers/bt/bt_drv_interface.h diff --git a/platform/drivers/bt/bt_drv_internal.h b/src/platform/drivers/bt/bt_drv_internal.h similarity index 100% rename from platform/drivers/bt/bt_drv_internal.h rename to src/platform/drivers/bt/bt_drv_internal.h diff --git a/platform/drivers/bt/bt_drv_reg_op.h b/src/platform/drivers/bt/bt_drv_reg_op.h similarity index 100% rename from platform/drivers/bt/bt_drv_reg_op.h rename to src/platform/drivers/bt/bt_drv_reg_op.h diff --git a/src/platform/drivers/btpcm/CMakeLists.txt b/src/platform/drivers/btpcm/CMakeLists.txt new file mode 100644 index 00000000..68812729 --- /dev/null +++ b/src/platform/drivers/btpcm/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (platform_drivers_btpcm STATIC ${sources} ${headers}) +target_include_directories(platform_drivers_btpcm PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(platform_drivers_btpcm rtos) \ No newline at end of file diff --git a/platform/drivers/btpcm/Makefile b/src/platform/drivers/btpcm/Makefile similarity index 100% rename from platform/drivers/btpcm/Makefile rename to src/platform/drivers/btpcm/Makefile diff --git a/platform/drivers/btpcm/btpcm.c b/src/platform/drivers/btpcm/btpcm.c similarity index 100% rename from platform/drivers/btpcm/btpcm.c rename to src/platform/drivers/btpcm/btpcm.c diff --git a/platform/drivers/btpcm/btpcm.h b/src/platform/drivers/btpcm/btpcm.h similarity index 100% rename from platform/drivers/btpcm/btpcm.h rename to src/platform/drivers/btpcm/btpcm.h diff --git a/src/platform/drivers/codec/CMakeLists.txt b/src/platform/drivers/codec/CMakeLists.txt new file mode 100644 index 00000000..20adf3ed --- /dev/null +++ b/src/platform/drivers/codec/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h" "${CHIP}/*.h") +file (GLOB sources "*.c*" "${CHIP}/*.c") + +add_library (platform_drivers_codec STATIC ${sources} ${headers}) +target_link_libraries(platform_drivers_codec platform_drivers_ana) +target_include_directories(platform_drivers_codec PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/${CHIP}) diff --git a/platform/drivers/codec/Makefile b/src/platform/drivers/codec/Makefile similarity index 100% rename from platform/drivers/codec/Makefile rename to src/platform/drivers/codec/Makefile diff --git a/platform/drivers/codec/best2300p/Makefile b/src/platform/drivers/codec/best2300p/Makefile similarity index 100% rename from platform/drivers/codec/best2300p/Makefile rename to src/platform/drivers/codec/best2300p/Makefile diff --git a/platform/drivers/codec/best2300p/codec_best2300p.c b/src/platform/drivers/codec/best2300p/codec_best2300p.c similarity index 100% rename from platform/drivers/codec/best2300p/codec_best2300p.c rename to src/platform/drivers/codec/best2300p/codec_best2300p.c diff --git a/platform/drivers/codec/best2300p/codec_best2300p.h b/src/platform/drivers/codec/best2300p/codec_best2300p.h similarity index 100% rename from platform/drivers/codec/best2300p/codec_best2300p.h rename to src/platform/drivers/codec/best2300p/codec_best2300p.h diff --git a/platform/drivers/codec/codec_int.h b/src/platform/drivers/codec/codec_int.h similarity index 100% rename from platform/drivers/codec/codec_int.h rename to src/platform/drivers/codec/codec_int.h diff --git a/platform/drivers/codec/codec_tlv32aic32.c b/src/platform/drivers/codec/codec_tlv32aic32.c similarity index 100% rename from platform/drivers/codec/codec_tlv32aic32.c rename to src/platform/drivers/codec/codec_tlv32aic32.c diff --git a/platform/drivers/codec/codec_tlv32aic32.h b/src/platform/drivers/codec/codec_tlv32aic32.h similarity index 100% rename from platform/drivers/codec/codec_tlv32aic32.h rename to src/platform/drivers/codec/codec_tlv32aic32.h diff --git a/src/platform/drivers/norflash/CMakeLists.txt b/src/platform/drivers/norflash/CMakeLists.txt new file mode 100644 index 00000000..888f4500 --- /dev/null +++ b/src/platform/drivers/norflash/CMakeLists.txt @@ -0,0 +1,10 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (platform_drivers_norflash STATIC ${sources} ${headers}) +target_link_libraries(platform_drivers_norflash util_boot_struct) +target_include_directories(platform_drivers_norflash PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(platform_drivers_norflash PRIVATE + ${CMAKE_SOURCE_DIR}/services/nvrecord + ${CMAKE_SOURCE_DIR}/tests/programmer/inc +) \ No newline at end of file diff --git a/platform/drivers/norflash/Makefile b/src/platform/drivers/norflash/Makefile similarity index 100% rename from platform/drivers/norflash/Makefile rename to src/platform/drivers/norflash/Makefile diff --git a/platform/drivers/norflash/norflash_drv.c b/src/platform/drivers/norflash/norflash_drv.c similarity index 100% rename from platform/drivers/norflash/norflash_drv.c rename to src/platform/drivers/norflash/norflash_drv.c diff --git a/platform/drivers/norflash/norflash_drv.h b/src/platform/drivers/norflash/norflash_drv.h similarity index 100% rename from platform/drivers/norflash/norflash_drv.h rename to src/platform/drivers/norflash/norflash_drv.h diff --git a/platform/drivers/norflash/norflash_en25s80b.c b/src/platform/drivers/norflash/norflash_en25s80b.c similarity index 100% rename from platform/drivers/norflash/norflash_en25s80b.c rename to src/platform/drivers/norflash/norflash_en25s80b.c diff --git a/platform/drivers/norflash/norflash_en25s80b.h b/src/platform/drivers/norflash/norflash_en25s80b.h similarity index 100% rename from platform/drivers/norflash/norflash_en25s80b.h rename to src/platform/drivers/norflash/norflash_en25s80b.h diff --git a/platform/drivers/norflash/norflash_gd25lq32c.c b/src/platform/drivers/norflash/norflash_gd25lq32c.c similarity index 100% rename from platform/drivers/norflash/norflash_gd25lq32c.c rename to src/platform/drivers/norflash/norflash_gd25lq32c.c diff --git a/platform/drivers/norflash/norflash_gd25lq32c.h b/src/platform/drivers/norflash/norflash_gd25lq32c.h similarity index 100% rename from platform/drivers/norflash/norflash_gd25lq32c.h rename to src/platform/drivers/norflash/norflash_gd25lq32c.h diff --git a/platform/drivers/norflash/norflash_gd25q32c.c b/src/platform/drivers/norflash/norflash_gd25q32c.c similarity index 100% rename from platform/drivers/norflash/norflash_gd25q32c.c rename to src/platform/drivers/norflash/norflash_gd25q32c.c diff --git a/platform/drivers/norflash/norflash_gd25q32c.h b/src/platform/drivers/norflash/norflash_gd25q32c.h similarity index 100% rename from platform/drivers/norflash/norflash_gd25q32c.h rename to src/platform/drivers/norflash/norflash_gd25q32c.h diff --git a/platform/drivers/sbcacc/Makefile b/src/platform/drivers/sbcacc/Makefile similarity index 100% rename from platform/drivers/sbcacc/Makefile rename to src/platform/drivers/sbcacc/Makefile diff --git a/src/platform/hal/CMakeLists.txt b/src/platform/hal/CMakeLists.txt new file mode 100644 index 00000000..b765b1d6 --- /dev/null +++ b/src/platform/hal/CMakeLists.txt @@ -0,0 +1,10 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (platform_hal STATIC ${sources} ${headers}) +target_link_libraries(platform_hal platform_drivers_ana platform_cmsis util_crash_catcher platform_drivers_norflash util_boot_struct) +target_include_directories(platform_hal PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(platform_hal PRIVATE + ${CMAKE_SOURCE_DIR}/platform/drivers/spi_norflash/ + ${CMAKE_SOURCE_DIR}/tests/programmer/inc/ +) diff --git a/platform/hal/Makefile b/src/platform/hal/Makefile similarity index 100% rename from platform/hal/Makefile rename to src/platform/hal/Makefile diff --git a/platform/hal/best2300p/Makefile b/src/platform/hal/best2300p/Makefile similarity index 100% rename from platform/hal/best2300p/Makefile rename to src/platform/hal/best2300p/Makefile diff --git a/platform/hal/best2300p/hal_analogif_best2300p.c b/src/platform/hal/best2300p/hal_analogif_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_analogif_best2300p.c rename to src/platform/hal/best2300p/hal_analogif_best2300p.c diff --git a/platform/hal/best2300p/hal_cmu_best2300p.c b/src/platform/hal/best2300p/hal_cmu_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_cmu_best2300p.c rename to src/platform/hal/best2300p/hal_cmu_best2300p.c diff --git a/platform/hal/best2300p/hal_cmu_best2300p.h b/src/platform/hal/best2300p/hal_cmu_best2300p.h similarity index 100% rename from platform/hal/best2300p/hal_cmu_best2300p.h rename to src/platform/hal/best2300p/hal_cmu_best2300p.h diff --git a/platform/hal/best2300p/hal_codec_best2300p.c b/src/platform/hal/best2300p/hal_codec_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_codec_best2300p.c rename to src/platform/hal/best2300p/hal_codec_best2300p.c diff --git a/platform/hal/best2300p/hal_dmacfg_best2300p.h b/src/platform/hal/best2300p/hal_dmacfg_best2300p.h similarity index 100% rename from platform/hal/best2300p/hal_dmacfg_best2300p.h rename to src/platform/hal/best2300p/hal_dmacfg_best2300p.h diff --git a/platform/hal/best2300p/hal_iomux_best2300p.c b/src/platform/hal/best2300p/hal_iomux_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_iomux_best2300p.c rename to src/platform/hal/best2300p/hal_iomux_best2300p.c diff --git a/platform/hal/best2300p/hal_iomux_best2300p.h b/src/platform/hal/best2300p/hal_iomux_best2300p.h similarity index 100% rename from platform/hal/best2300p/hal_iomux_best2300p.h rename to src/platform/hal/best2300p/hal_iomux_best2300p.h diff --git a/platform/hal/best2300p/hal_psc_best2300p.c b/src/platform/hal/best2300p/hal_psc_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_psc_best2300p.c rename to src/platform/hal/best2300p/hal_psc_best2300p.c diff --git a/platform/hal/best2300p/hal_sensor_eng_best2300p.c b/src/platform/hal/best2300p/hal_sensor_eng_best2300p.c similarity index 100% rename from platform/hal/best2300p/hal_sensor_eng_best2300p.c rename to src/platform/hal/best2300p/hal_sensor_eng_best2300p.c diff --git a/platform/hal/best2300p/plat_addr_map_best2300p.h b/src/platform/hal/best2300p/plat_addr_map_best2300p.h similarity index 100% rename from platform/hal/best2300p/plat_addr_map_best2300p.h rename to src/platform/hal/best2300p/plat_addr_map_best2300p.h diff --git a/platform/hal/best2300p/reg_aoncmu_best2300p.h b/src/platform/hal/best2300p/reg_aoncmu_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_aoncmu_best2300p.h rename to src/platform/hal/best2300p/reg_aoncmu_best2300p.h diff --git a/platform/hal/best2300p/reg_btcmu_best2300p.h b/src/platform/hal/best2300p/reg_btcmu_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_btcmu_best2300p.h rename to src/platform/hal/best2300p/reg_btcmu_best2300p.h diff --git a/platform/hal/best2300p/reg_cmu_best2300p.h b/src/platform/hal/best2300p/reg_cmu_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_cmu_best2300p.h rename to src/platform/hal/best2300p/reg_cmu_best2300p.h diff --git a/platform/hal/best2300p/reg_codec_best2300p.h b/src/platform/hal/best2300p/reg_codec_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_codec_best2300p.h rename to src/platform/hal/best2300p/reg_codec_best2300p.h diff --git a/platform/hal/best2300p/reg_iomux_best2300p.h b/src/platform/hal/best2300p/reg_iomux_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_iomux_best2300p.h rename to src/platform/hal/best2300p/reg_iomux_best2300p.h diff --git a/platform/hal/best2300p/reg_psc_best2300p.h b/src/platform/hal/best2300p/reg_psc_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_psc_best2300p.h rename to src/platform/hal/best2300p/reg_psc_best2300p.h diff --git a/platform/hal/best2300p/reg_sensor_eng_best2300p.h b/src/platform/hal/best2300p/reg_sensor_eng_best2300p.h similarity index 100% rename from platform/hal/best2300p/reg_sensor_eng_best2300p.h rename to src/platform/hal/best2300p/reg_sensor_eng_best2300p.h diff --git a/platform/hal/hal_analogif.h b/src/platform/hal/hal_analogif.h similarity index 100% rename from platform/hal/hal_analogif.h rename to src/platform/hal/hal_analogif.h diff --git a/platform/hal/hal_aud.h b/src/platform/hal/hal_aud.h similarity index 100% rename from platform/hal/hal_aud.h rename to src/platform/hal/hal_aud.h diff --git a/platform/hal/hal_bootmode.c b/src/platform/hal/hal_bootmode.c similarity index 100% rename from platform/hal/hal_bootmode.c rename to src/platform/hal/hal_bootmode.c diff --git a/platform/hal/hal_bootmode.h b/src/platform/hal/hal_bootmode.h similarity index 100% rename from platform/hal/hal_bootmode.h rename to src/platform/hal/hal_bootmode.h diff --git a/platform/hal/hal_btdump.c b/src/platform/hal/hal_btdump.c similarity index 100% rename from platform/hal/hal_btdump.c rename to src/platform/hal/hal_btdump.c diff --git a/platform/hal/hal_btdump.h b/src/platform/hal/hal_btdump.h similarity index 100% rename from platform/hal/hal_btdump.h rename to src/platform/hal/hal_btdump.h diff --git a/platform/hal/hal_btpcm.c b/src/platform/hal/hal_btpcm.c similarity index 100% rename from platform/hal/hal_btpcm.c rename to src/platform/hal/hal_btpcm.c diff --git a/platform/hal/hal_btpcm.h b/src/platform/hal/hal_btpcm.h similarity index 100% rename from platform/hal/hal_btpcm.h rename to src/platform/hal/hal_btpcm.h diff --git a/platform/hal/hal_btpcmip.h b/src/platform/hal/hal_btpcmip.h similarity index 100% rename from platform/hal/hal_btpcmip.h rename to src/platform/hal/hal_btpcmip.h diff --git a/platform/hal/hal_cache.c b/src/platform/hal/hal_cache.c similarity index 100% rename from platform/hal/hal_cache.c rename to src/platform/hal/hal_cache.c diff --git a/platform/hal/hal_cache.h b/src/platform/hal/hal_cache.h similarity index 100% rename from platform/hal/hal_cache.h rename to src/platform/hal/hal_cache.h diff --git a/platform/hal/hal_chipid.c b/src/platform/hal/hal_chipid.c similarity index 100% rename from platform/hal/hal_chipid.c rename to src/platform/hal/hal_chipid.c diff --git a/platform/hal/hal_chipid.h b/src/platform/hal/hal_chipid.h similarity index 100% rename from platform/hal/hal_chipid.h rename to src/platform/hal/hal_chipid.h diff --git a/platform/hal/hal_cmd.c b/src/platform/hal/hal_cmd.c similarity index 100% rename from platform/hal/hal_cmd.c rename to src/platform/hal/hal_cmd.c diff --git a/platform/hal/hal_cmd.h b/src/platform/hal/hal_cmd.h similarity index 100% rename from platform/hal/hal_cmd.h rename to src/platform/hal/hal_cmd.h diff --git a/platform/hal/hal_cmu.h b/src/platform/hal/hal_cmu.h similarity index 100% rename from platform/hal/hal_cmu.h rename to src/platform/hal/hal_cmu.h diff --git a/platform/hal/hal_cmu_common.c b/src/platform/hal/hal_cmu_common.c similarity index 100% rename from platform/hal/hal_cmu_common.c rename to src/platform/hal/hal_cmu_common.c diff --git a/platform/hal/hal_codec.h b/src/platform/hal/hal_codec.h similarity index 100% rename from platform/hal/hal_codec.h rename to src/platform/hal/hal_codec.h diff --git a/platform/hal/hal_codec_common.c b/src/platform/hal/hal_codec_common.c similarity index 100% rename from platform/hal/hal_codec_common.c rename to src/platform/hal/hal_codec_common.c diff --git a/platform/hal/hal_dma.c b/src/platform/hal/hal_dma.c similarity index 100% rename from platform/hal/hal_dma.c rename to src/platform/hal/hal_dma.c diff --git a/platform/hal/hal_dma.h b/src/platform/hal/hal_dma.h similarity index 100% rename from platform/hal/hal_dma.h rename to src/platform/hal/hal_dma.h diff --git a/platform/hal/hal_gpadc.c b/src/platform/hal/hal_gpadc.c similarity index 100% rename from platform/hal/hal_gpadc.c rename to src/platform/hal/hal_gpadc.c diff --git a/platform/hal/hal_gpadc.h b/src/platform/hal/hal_gpadc.h similarity index 100% rename from platform/hal/hal_gpadc.h rename to src/platform/hal/hal_gpadc.h diff --git a/platform/hal/hal_gpio.c b/src/platform/hal/hal_gpio.c similarity index 100% rename from platform/hal/hal_gpio.c rename to src/platform/hal/hal_gpio.c diff --git a/platform/hal/hal_gpio.h b/src/platform/hal/hal_gpio.h similarity index 100% rename from platform/hal/hal_gpio.h rename to src/platform/hal/hal_gpio.h diff --git a/platform/hal/hal_hwfft.h b/src/platform/hal/hal_hwfft.h similarity index 100% rename from platform/hal/hal_hwfft.h rename to src/platform/hal/hal_hwfft.h diff --git a/platform/hal/hal_i2c.c b/src/platform/hal/hal_i2c.c similarity index 100% rename from platform/hal/hal_i2c.c rename to src/platform/hal/hal_i2c.c diff --git a/platform/hal/hal_i2c.h b/src/platform/hal/hal_i2c.h similarity index 100% rename from platform/hal/hal_i2c.h rename to src/platform/hal/hal_i2c.h diff --git a/platform/hal/hal_i2cip.h b/src/platform/hal/hal_i2cip.h similarity index 100% rename from platform/hal/hal_i2cip.h rename to src/platform/hal/hal_i2cip.h diff --git a/platform/hal/hal_i2s.c b/src/platform/hal/hal_i2s.c similarity index 100% rename from platform/hal/hal_i2s.c rename to src/platform/hal/hal_i2s.c diff --git a/platform/hal/hal_i2s.h b/src/platform/hal/hal_i2s.h similarity index 100% rename from platform/hal/hal_i2s.h rename to src/platform/hal/hal_i2s.h diff --git a/platform/hal/hal_i2s_tdm.c b/src/platform/hal/hal_i2s_tdm.c similarity index 100% rename from platform/hal/hal_i2s_tdm.c rename to src/platform/hal/hal_i2s_tdm.c diff --git a/platform/hal/hal_i2s_tdm.h b/src/platform/hal/hal_i2s_tdm.h similarity index 100% rename from platform/hal/hal_i2s_tdm.h rename to src/platform/hal/hal_i2s_tdm.h diff --git a/platform/hal/hal_i2sip.h b/src/platform/hal/hal_i2sip.h similarity index 100% rename from platform/hal/hal_i2sip.h rename to src/platform/hal/hal_i2sip.h diff --git a/platform/hal/hal_intersys.c b/src/platform/hal/hal_intersys.c similarity index 100% rename from platform/hal/hal_intersys.c rename to src/platform/hal/hal_intersys.c diff --git a/platform/hal/hal_intersys.h b/src/platform/hal/hal_intersys.h similarity index 100% rename from platform/hal/hal_intersys.h rename to src/platform/hal/hal_intersys.h diff --git a/platform/hal/hal_iomux.h b/src/platform/hal/hal_iomux.h similarity index 100% rename from platform/hal/hal_iomux.h rename to src/platform/hal/hal_iomux.h diff --git a/platform/hal/hal_key.c b/src/platform/hal/hal_key.c similarity index 100% rename from platform/hal/hal_key.c rename to src/platform/hal/hal_key.c diff --git a/platform/hal/hal_key.h b/src/platform/hal/hal_key.h similarity index 100% rename from platform/hal/hal_key.h rename to src/platform/hal/hal_key.h diff --git a/platform/hal/hal_location.h b/src/platform/hal/hal_location.h similarity index 100% rename from platform/hal/hal_location.h rename to src/platform/hal/hal_location.h diff --git a/platform/hal/hal_mcu2cp.c b/src/platform/hal/hal_mcu2cp.c similarity index 100% rename from platform/hal/hal_mcu2cp.c rename to src/platform/hal/hal_mcu2cp.c diff --git a/platform/hal/hal_mcu2cp.h b/src/platform/hal/hal_mcu2cp.h similarity index 100% rename from platform/hal/hal_mcu2cp.h rename to src/platform/hal/hal_mcu2cp.h diff --git a/platform/hal/hal_memsc.c b/src/platform/hal/hal_memsc.c similarity index 100% rename from platform/hal/hal_memsc.c rename to src/platform/hal/hal_memsc.c diff --git a/platform/hal/hal_memsc.h b/src/platform/hal/hal_memsc.h similarity index 100% rename from platform/hal/hal_memsc.h rename to src/platform/hal/hal_memsc.h diff --git a/platform/hal/hal_norflash.c b/src/platform/hal/hal_norflash.c similarity index 100% rename from platform/hal/hal_norflash.c rename to src/platform/hal/hal_norflash.c diff --git a/platform/hal/hal_norflash.h b/src/platform/hal/hal_norflash.h similarity index 100% rename from platform/hal/hal_norflash.h rename to src/platform/hal/hal_norflash.h diff --git a/platform/hal/hal_norflaship.h b/src/platform/hal/hal_norflaship.h similarity index 100% rename from platform/hal/hal_norflaship.h rename to src/platform/hal/hal_norflaship.h diff --git a/platform/hal/hal_norflaship_v1.c b/src/platform/hal/hal_norflaship_v1.c similarity index 100% rename from platform/hal/hal_norflaship_v1.c rename to src/platform/hal/hal_norflaship_v1.c diff --git a/platform/hal/hal_norflaship_v2.c b/src/platform/hal/hal_norflaship_v2.c similarity index 100% rename from platform/hal/hal_norflaship_v2.c rename to src/platform/hal/hal_norflaship_v2.c diff --git a/platform/hal/hal_overlay.c b/src/platform/hal/hal_overlay.c similarity index 100% rename from platform/hal/hal_overlay.c rename to src/platform/hal/hal_overlay.c diff --git a/platform/hal/hal_overlay.h b/src/platform/hal/hal_overlay.h similarity index 100% rename from platform/hal/hal_overlay.h rename to src/platform/hal/hal_overlay.h diff --git a/platform/hal/hal_phyif.c b/src/platform/hal/hal_phyif.c similarity index 100% rename from platform/hal/hal_phyif.c rename to src/platform/hal/hal_phyif.c diff --git a/platform/hal/hal_phyif.h b/src/platform/hal/hal_phyif.h similarity index 100% rename from platform/hal/hal_phyif.h rename to src/platform/hal/hal_phyif.h diff --git a/platform/hal/hal_psc.h b/src/platform/hal/hal_psc.h similarity index 100% rename from platform/hal/hal_psc.h rename to src/platform/hal/hal_psc.h diff --git a/platform/hal/hal_psram.h b/src/platform/hal/hal_psram.h similarity index 100% rename from platform/hal/hal_psram.h rename to src/platform/hal/hal_psram.h diff --git a/platform/hal/hal_psram_v1.c b/src/platform/hal/hal_psram_v1.c similarity index 100% rename from platform/hal/hal_psram_v1.c rename to src/platform/hal/hal_psram_v1.c diff --git a/platform/hal/hal_psram_v2.c b/src/platform/hal/hal_psram_v2.c similarity index 100% rename from platform/hal/hal_psram_v2.c rename to src/platform/hal/hal_psram_v2.c diff --git a/platform/hal/hal_psramip_v1.h b/src/platform/hal/hal_psramip_v1.h similarity index 100% rename from platform/hal/hal_psramip_v1.h rename to src/platform/hal/hal_psramip_v1.h diff --git a/platform/hal/hal_psramuhs.c b/src/platform/hal/hal_psramuhs.c similarity index 100% rename from platform/hal/hal_psramuhs.c rename to src/platform/hal/hal_psramuhs.c diff --git a/platform/hal/hal_psramuhs.h b/src/platform/hal/hal_psramuhs.h similarity index 100% rename from platform/hal/hal_psramuhs.h rename to src/platform/hal/hal_psramuhs.h diff --git a/platform/hal/hal_pwm.c b/src/platform/hal/hal_pwm.c similarity index 100% rename from platform/hal/hal_pwm.c rename to src/platform/hal/hal_pwm.c diff --git a/platform/hal/hal_pwm.h b/src/platform/hal/hal_pwm.h similarity index 100% rename from platform/hal/hal_pwm.h rename to src/platform/hal/hal_pwm.h diff --git a/platform/hal/hal_rtc.c b/src/platform/hal/hal_rtc.c similarity index 100% rename from platform/hal/hal_rtc.c rename to src/platform/hal/hal_rtc.c diff --git a/platform/hal/hal_rtc.h b/src/platform/hal/hal_rtc.h similarity index 100% rename from platform/hal/hal_rtc.h rename to src/platform/hal/hal_rtc.h diff --git a/platform/hal/hal_sec_eng.c b/src/platform/hal/hal_sec_eng.c similarity index 100% rename from platform/hal/hal_sec_eng.c rename to src/platform/hal/hal_sec_eng.c diff --git a/platform/hal/hal_sec_eng.h b/src/platform/hal/hal_sec_eng.h similarity index 100% rename from platform/hal/hal_sec_eng.h rename to src/platform/hal/hal_sec_eng.h diff --git a/platform/hal/hal_sensor_eng.h b/src/platform/hal/hal_sensor_eng.h similarity index 100% rename from platform/hal/hal_sensor_eng.h rename to src/platform/hal/hal_sensor_eng.h diff --git a/platform/hal/hal_slave_i2c.c b/src/platform/hal/hal_slave_i2c.c similarity index 100% rename from platform/hal/hal_slave_i2c.c rename to src/platform/hal/hal_slave_i2c.c diff --git a/platform/hal/hal_slave_i2c.h b/src/platform/hal/hal_slave_i2c.h similarity index 100% rename from platform/hal/hal_slave_i2c.h rename to src/platform/hal/hal_slave_i2c.h diff --git a/platform/hal/hal_sleep.c b/src/platform/hal/hal_sleep.c similarity index 100% rename from platform/hal/hal_sleep.c rename to src/platform/hal/hal_sleep.c diff --git a/platform/hal/hal_sleep.h b/src/platform/hal/hal_sleep.h similarity index 100% rename from platform/hal/hal_sleep.h rename to src/platform/hal/hal_sleep.h diff --git a/platform/hal/hal_sleep_core_pd.S b/src/platform/hal/hal_sleep_core_pd.S similarity index 100% rename from platform/hal/hal_sleep_core_pd.S rename to src/platform/hal/hal_sleep_core_pd.S diff --git a/platform/hal/hal_sleep_core_pd.h b/src/platform/hal/hal_sleep_core_pd.h similarity index 100% rename from platform/hal/hal_sleep_core_pd.h rename to src/platform/hal/hal_sleep_core_pd.h diff --git a/platform/hal/hal_sleep_mcu_pd.S b/src/platform/hal/hal_sleep_mcu_pd.S similarity index 100% rename from platform/hal/hal_sleep_mcu_pd.S rename to src/platform/hal/hal_sleep_mcu_pd.S diff --git a/platform/hal/hal_sleep_mcu_pd.h b/src/platform/hal/hal_sleep_mcu_pd.h similarity index 100% rename from platform/hal/hal_sleep_mcu_pd.h rename to src/platform/hal/hal_sleep_mcu_pd.h diff --git a/platform/hal/hal_spdif.c b/src/platform/hal/hal_spdif.c similarity index 100% rename from platform/hal/hal_spdif.c rename to src/platform/hal/hal_spdif.c diff --git a/platform/hal/hal_spdif.h b/src/platform/hal/hal_spdif.h similarity index 100% rename from platform/hal/hal_spdif.h rename to src/platform/hal/hal_spdif.h diff --git a/platform/hal/hal_spdifip.h b/src/platform/hal/hal_spdifip.h similarity index 100% rename from platform/hal/hal_spdifip.h rename to src/platform/hal/hal_spdifip.h diff --git a/platform/hal/hal_spi.c b/src/platform/hal/hal_spi.c similarity index 100% rename from platform/hal/hal_spi.c rename to src/platform/hal/hal_spi.c diff --git a/platform/hal/hal_spi.h b/src/platform/hal/hal_spi.h similarity index 100% rename from platform/hal/hal_spi.h rename to src/platform/hal/hal_spi.h diff --git a/platform/hal/hal_sysfreq.c b/src/platform/hal/hal_sysfreq.c similarity index 100% rename from platform/hal/hal_sysfreq.c rename to src/platform/hal/hal_sysfreq.c diff --git a/platform/hal/hal_sysfreq.h b/src/platform/hal/hal_sysfreq.h similarity index 100% rename from platform/hal/hal_sysfreq.h rename to src/platform/hal/hal_sysfreq.h diff --git a/platform/hal/hal_tdm.c b/src/platform/hal/hal_tdm.c similarity index 100% rename from platform/hal/hal_tdm.c rename to src/platform/hal/hal_tdm.c diff --git a/platform/hal/hal_tdm.h b/src/platform/hal/hal_tdm.h similarity index 100% rename from platform/hal/hal_tdm.h rename to src/platform/hal/hal_tdm.h diff --git a/platform/hal/hal_timer.c b/src/platform/hal/hal_timer.c similarity index 100% rename from platform/hal/hal_timer.c rename to src/platform/hal/hal_timer.c diff --git a/platform/hal/hal_timer.h b/src/platform/hal/hal_timer.h similarity index 100% rename from platform/hal/hal_timer.h rename to src/platform/hal/hal_timer.h diff --git a/platform/hal/hal_timer_raw.h b/src/platform/hal/hal_timer_raw.h similarity index 100% rename from platform/hal/hal_timer_raw.h rename to src/platform/hal/hal_timer_raw.h diff --git a/platform/hal/hal_trace.c b/src/platform/hal/hal_trace.c similarity index 100% rename from platform/hal/hal_trace.c rename to src/platform/hal/hal_trace.c diff --git a/platform/hal/hal_trace.h b/src/platform/hal/hal_trace.h similarity index 100% rename from platform/hal/hal_trace.h rename to src/platform/hal/hal_trace.h diff --git a/platform/hal/hal_trace_mod.c b/src/platform/hal/hal_trace_mod.c similarity index 100% rename from platform/hal/hal_trace_mod.c rename to src/platform/hal/hal_trace_mod.c diff --git a/platform/hal/hal_trace_mod.h b/src/platform/hal/hal_trace_mod.h similarity index 100% rename from platform/hal/hal_trace_mod.h rename to src/platform/hal/hal_trace_mod.h diff --git a/platform/hal/hal_transq.c b/src/platform/hal/hal_transq.c similarity index 100% rename from platform/hal/hal_transq.c rename to src/platform/hal/hal_transq.c diff --git a/platform/hal/hal_transq.h b/src/platform/hal/hal_transq.h similarity index 100% rename from platform/hal/hal_transq.h rename to src/platform/hal/hal_transq.h diff --git a/platform/hal/hal_uart.c b/src/platform/hal/hal_uart.c similarity index 100% rename from platform/hal/hal_uart.c rename to src/platform/hal/hal_uart.c diff --git a/platform/hal/hal_uart.h b/src/platform/hal/hal_uart.h similarity index 100% rename from platform/hal/hal_uart.h rename to src/platform/hal/hal_uart.h diff --git a/platform/hal/hal_wdt.c b/src/platform/hal/hal_wdt.c similarity index 100% rename from platform/hal/hal_wdt.c rename to src/platform/hal/hal_wdt.c diff --git a/platform/hal/hal_wdt.h b/src/platform/hal/hal_wdt.h similarity index 100% rename from platform/hal/hal_wdt.h rename to src/platform/hal/hal_wdt.h diff --git a/platform/hal/plat_addr_map.h b/src/platform/hal/plat_addr_map.h similarity index 100% rename from platform/hal/plat_addr_map.h rename to src/platform/hal/plat_addr_map.h diff --git a/platform/hal/plat_types.h b/src/platform/hal/plat_types.h similarity index 100% rename from platform/hal/plat_types.h rename to src/platform/hal/plat_types.h diff --git a/platform/hal/reg_btpcmip.h b/src/platform/hal/reg_btpcmip.h similarity index 100% rename from platform/hal/reg_btpcmip.h rename to src/platform/hal/reg_btpcmip.h diff --git a/platform/hal/reg_dma.h b/src/platform/hal/reg_dma.h similarity index 100% rename from platform/hal/reg_dma.h rename to src/platform/hal/reg_dma.h diff --git a/platform/hal/reg_gpio.h b/src/platform/hal/reg_gpio.h similarity index 100% rename from platform/hal/reg_gpio.h rename to src/platform/hal/reg_gpio.h diff --git a/platform/hal/reg_i2cip.h b/src/platform/hal/reg_i2cip.h similarity index 100% rename from platform/hal/reg_i2cip.h rename to src/platform/hal/reg_i2cip.h diff --git a/platform/hal/reg_i2sip.h b/src/platform/hal/reg_i2sip.h similarity index 100% rename from platform/hal/reg_i2sip.h rename to src/platform/hal/reg_i2sip.h diff --git a/platform/hal/reg_norflaship_v1.h b/src/platform/hal/reg_norflaship_v1.h similarity index 100% rename from platform/hal/reg_norflaship_v1.h rename to src/platform/hal/reg_norflaship_v1.h diff --git a/platform/hal/reg_norflaship_v2.h b/src/platform/hal/reg_norflaship_v2.h similarity index 100% rename from platform/hal/reg_norflaship_v2.h rename to src/platform/hal/reg_norflaship_v2.h diff --git a/platform/hal/reg_psram_mc_v2.h b/src/platform/hal/reg_psram_mc_v2.h similarity index 100% rename from platform/hal/reg_psram_mc_v2.h rename to src/platform/hal/reg_psram_mc_v2.h diff --git a/platform/hal/reg_psram_phy_v2.h b/src/platform/hal/reg_psram_phy_v2.h similarity index 100% rename from platform/hal/reg_psram_phy_v2.h rename to src/platform/hal/reg_psram_phy_v2.h diff --git a/platform/hal/reg_psramip_v1.h b/src/platform/hal/reg_psramip_v1.h similarity index 100% rename from platform/hal/reg_psramip_v1.h rename to src/platform/hal/reg_psramip_v1.h diff --git a/platform/hal/reg_psramuhs_mc.h b/src/platform/hal/reg_psramuhs_mc.h similarity index 100% rename from platform/hal/reg_psramuhs_mc.h rename to src/platform/hal/reg_psramuhs_mc.h diff --git a/platform/hal/reg_pwm.h b/src/platform/hal/reg_pwm.h similarity index 100% rename from platform/hal/reg_pwm.h rename to src/platform/hal/reg_pwm.h diff --git a/platform/hal/reg_rtc.h b/src/platform/hal/reg_rtc.h similarity index 100% rename from platform/hal/reg_rtc.h rename to src/platform/hal/reg_rtc.h diff --git a/platform/hal/reg_sec_eng.h b/src/platform/hal/reg_sec_eng.h similarity index 100% rename from platform/hal/reg_sec_eng.h rename to src/platform/hal/reg_sec_eng.h diff --git a/platform/hal/reg_slave_i2c.h b/src/platform/hal/reg_slave_i2c.h similarity index 100% rename from platform/hal/reg_slave_i2c.h rename to src/platform/hal/reg_slave_i2c.h diff --git a/platform/hal/reg_spdifip.h b/src/platform/hal/reg_spdifip.h similarity index 100% rename from platform/hal/reg_spdifip.h rename to src/platform/hal/reg_spdifip.h diff --git a/platform/hal/reg_spi.h b/src/platform/hal/reg_spi.h similarity index 100% rename from platform/hal/reg_spi.h rename to src/platform/hal/reg_spi.h diff --git a/platform/hal/reg_tdm.h b/src/platform/hal/reg_tdm.h similarity index 100% rename from platform/hal/reg_tdm.h rename to src/platform/hal/reg_tdm.h diff --git a/platform/hal/reg_timer.h b/src/platform/hal/reg_timer.h similarity index 100% rename from platform/hal/reg_timer.h rename to src/platform/hal/reg_timer.h diff --git a/platform/hal/reg_transq.h b/src/platform/hal/reg_transq.h similarity index 100% rename from platform/hal/reg_transq.h rename to src/platform/hal/reg_transq.h diff --git a/platform/hal/reg_uart.h b/src/platform/hal/reg_uart.h similarity index 100% rename from platform/hal/reg_uart.h rename to src/platform/hal/reg_uart.h diff --git a/platform/hal/reg_usb.h b/src/platform/hal/reg_usb.h similarity index 100% rename from platform/hal/reg_usb.h rename to src/platform/hal/reg_usb.h diff --git a/platform/main/Makefile b/src/platform/main/Makefile similarity index 100% rename from platform/main/Makefile rename to src/platform/main/Makefile diff --git a/platform/main/main.cpp b/src/platform/main/main.cpp similarity index 100% rename from platform/main/main.cpp rename to src/platform/main/main.cpp diff --git a/platform/main/noapp_main.cpp b/src/platform/main/noapp_main.cpp similarity index 100% rename from platform/main/noapp_main.cpp rename to src/platform/main/noapp_main.cpp diff --git a/platform/main/nostd_main.c b/src/platform/main/nostd_main.c similarity index 100% rename from platform/main/nostd_main.c rename to src/platform/main/nostd_main.c diff --git a/platform/main/startup_main.S b/src/platform/main/startup_main.S similarity index 100% rename from platform/main/startup_main.S rename to src/platform/main/startup_main.S diff --git a/src/rtos/CMakeLists.txt b/src/rtos/CMakeLists.txt new file mode 100644 index 00000000..0c42eb32 --- /dev/null +++ b/src/rtos/CMakeLists.txt @@ -0,0 +1,26 @@ + +set(KERNEL "rtx") + +if(KERNEL STREQUAL "rtx5") #RTX5 + file (GLOB headers "rtx5/*.h" "rtx_config/*.h") + file (GLOB sources "rtx5/*.c*" "rtx_config/*.c*") +else() #RTX + file (GLOB headers "rtx/TARGET_CORTEX_M/*.h") + file (GLOB sources "rtx/TARGET_CORTEX_M/*.c*" "rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/*.S") +endif() + +add_library (rtos STATIC ${sources} ${headers}) +target_link_libraries(rtos platform_cmsis platform_hal util_hwtimer_list) + +if(KERNEL STREQUAL "rtx5") #RTX5 + target_include_directories(rtos PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/rtx5/ + ${CMAKE_CURRENT_SOURCE_DIR}/rtx5/rtx_config/ + ) +else() #RTX + set_property(TARGET rtos APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") + target_include_directories(rtos PUBLIC + ${CMAKE_CURRENT_SOURCE_DIR}/rtx/TARGET_CORTEX_M/ + ) +endif() + diff --git a/rtos/Makefile b/src/rtos/Makefile similarity index 100% rename from rtos/Makefile rename to src/rtos/Makefile diff --git a/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S b/src/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S similarity index 100% rename from rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S rename to src/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/HAL_CM0.S diff --git a/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_ARM7/ARM7/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_ARM7/HAL_CM.c b/src/rtos/rtx/TARGET_ARM7/HAL_CM.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/HAL_CM.c rename to src/rtos/rtx/TARGET_ARM7/HAL_CM.c diff --git a/rtos/rtx/TARGET_ARM7/RTX_CM_lib.h b/src/rtos/rtx/TARGET_ARM7/RTX_CM_lib.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/RTX_CM_lib.h rename to src/rtos/rtx/TARGET_ARM7/RTX_CM_lib.h diff --git a/rtos/rtx/TARGET_ARM7/RTX_Conf.h b/src/rtos/rtx/TARGET_ARM7/RTX_Conf.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/RTX_Conf.h rename to src/rtos/rtx/TARGET_ARM7/RTX_Conf.h diff --git a/rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c b/src/rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c rename to src/rtos/rtx/TARGET_ARM7/RTX_Conf_CM.c diff --git a/rtos/rtx/TARGET_ARM7/cmsis_os.h b/src/rtos/rtx/TARGET_ARM7/cmsis_os.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/cmsis_os.h rename to src/rtos/rtx/TARGET_ARM7/cmsis_os.h diff --git a/rtos/rtx/TARGET_ARM7/os_tcb.h b/src/rtos/rtx/TARGET_ARM7/os_tcb.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/os_tcb.h rename to src/rtos/rtx/TARGET_ARM7/os_tcb.h diff --git a/rtos/rtx/TARGET_ARM7/rt_CMSIS.c b/src/rtos/rtx/TARGET_ARM7/rt_CMSIS.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_CMSIS.c rename to src/rtos/rtx/TARGET_ARM7/rt_CMSIS.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Event.c b/src/rtos/rtx/TARGET_ARM7/rt_Event.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Event.c rename to src/rtos/rtx/TARGET_ARM7/rt_Event.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Event.h b/src/rtos/rtx/TARGET_ARM7/rt_Event.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Event.h rename to src/rtos/rtx/TARGET_ARM7/rt_Event.h diff --git a/rtos/rtx/TARGET_ARM7/rt_HAL_CM.h b/src/rtos/rtx/TARGET_ARM7/rt_HAL_CM.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_HAL_CM.h rename to src/rtos/rtx/TARGET_ARM7/rt_HAL_CM.h diff --git a/rtos/rtx/TARGET_ARM7/rt_List.c b/src/rtos/rtx/TARGET_ARM7/rt_List.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_List.c rename to src/rtos/rtx/TARGET_ARM7/rt_List.c diff --git a/rtos/rtx/TARGET_ARM7/rt_List.h b/src/rtos/rtx/TARGET_ARM7/rt_List.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_List.h rename to src/rtos/rtx/TARGET_ARM7/rt_List.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Mailbox.c b/src/rtos/rtx/TARGET_ARM7/rt_Mailbox.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Mailbox.c rename to src/rtos/rtx/TARGET_ARM7/rt_Mailbox.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Mailbox.h b/src/rtos/rtx/TARGET_ARM7/rt_Mailbox.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Mailbox.h rename to src/rtos/rtx/TARGET_ARM7/rt_Mailbox.h diff --git a/rtos/rtx/TARGET_ARM7/rt_MemBox.c b/src/rtos/rtx/TARGET_ARM7/rt_MemBox.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_MemBox.c rename to src/rtos/rtx/TARGET_ARM7/rt_MemBox.c diff --git a/rtos/rtx/TARGET_ARM7/rt_MemBox.h b/src/rtos/rtx/TARGET_ARM7/rt_MemBox.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_MemBox.h rename to src/rtos/rtx/TARGET_ARM7/rt_MemBox.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Mutex.c b/src/rtos/rtx/TARGET_ARM7/rt_Mutex.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Mutex.c rename to src/rtos/rtx/TARGET_ARM7/rt_Mutex.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Mutex.h b/src/rtos/rtx/TARGET_ARM7/rt_Mutex.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Mutex.h rename to src/rtos/rtx/TARGET_ARM7/rt_Mutex.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Robin.c b/src/rtos/rtx/TARGET_ARM7/rt_Robin.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Robin.c rename to src/rtos/rtx/TARGET_ARM7/rt_Robin.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Robin.h b/src/rtos/rtx/TARGET_ARM7/rt_Robin.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Robin.h rename to src/rtos/rtx/TARGET_ARM7/rt_Robin.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Semaphore.c b/src/rtos/rtx/TARGET_ARM7/rt_Semaphore.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Semaphore.c rename to src/rtos/rtx/TARGET_ARM7/rt_Semaphore.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Semaphore.h b/src/rtos/rtx/TARGET_ARM7/rt_Semaphore.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Semaphore.h rename to src/rtos/rtx/TARGET_ARM7/rt_Semaphore.h diff --git a/rtos/rtx/TARGET_ARM7/rt_System.c b/src/rtos/rtx/TARGET_ARM7/rt_System.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_System.c rename to src/rtos/rtx/TARGET_ARM7/rt_System.c diff --git a/rtos/rtx/TARGET_ARM7/rt_System.h b/src/rtos/rtx/TARGET_ARM7/rt_System.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_System.h rename to src/rtos/rtx/TARGET_ARM7/rt_System.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Task.c b/src/rtos/rtx/TARGET_ARM7/rt_Task.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Task.c rename to src/rtos/rtx/TARGET_ARM7/rt_Task.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Task.h b/src/rtos/rtx/TARGET_ARM7/rt_Task.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Task.h rename to src/rtos/rtx/TARGET_ARM7/rt_Task.h diff --git a/rtos/rtx/TARGET_ARM7/rt_Time.c b/src/rtos/rtx/TARGET_ARM7/rt_Time.c similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Time.c rename to src/rtos/rtx/TARGET_ARM7/rt_Time.c diff --git a/rtos/rtx/TARGET_ARM7/rt_Time.h b/src/rtos/rtx/TARGET_ARM7/rt_Time.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_Time.h rename to src/rtos/rtx/TARGET_ARM7/rt_Time.h diff --git a/rtos/rtx/TARGET_ARM7/rt_TypeDef.h b/src/rtos/rtx/TARGET_ARM7/rt_TypeDef.h similarity index 100% rename from rtos/rtx/TARGET_ARM7/rt_TypeDef.h rename to src/rtos/rtx/TARGET_ARM7/rt_TypeDef.h diff --git a/rtos/rtx/TARGET_CORTEX_A/HAL_CA.c b/src/rtos/rtx/TARGET_CORTEX_A/HAL_CA.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/HAL_CA.c rename to src/rtos/rtx/TARGET_CORTEX_A/HAL_CA.c diff --git a/rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h b/src/rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h rename to src/rtos/rtx/TARGET_CORTEX_A/RTX_CM_lib.h diff --git a/rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c b/src/rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c rename to src/rtos/rtx/TARGET_CORTEX_A/RTX_Conf_CA.c diff --git a/rtos/rtx/TARGET_CORTEX_A/RTX_Config.h b/src/rtos/rtx/TARGET_CORTEX_A/RTX_Config.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/RTX_Config.h rename to src/rtos/rtx/TARGET_CORTEX_A/RTX_Config.h diff --git a/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c b/src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c rename to src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/HAL_CA9.c diff --git a/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_ARM/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S b/src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S rename to src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/HAL_CA9.S diff --git a/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_A/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_A/cmsis_os.h b/src/rtos/rtx/TARGET_CORTEX_A/cmsis_os.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/cmsis_os.h rename to src/rtos/rtx/TARGET_CORTEX_A/cmsis_os.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_CMSIS.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Event.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Event.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Event.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Event.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Event.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Event.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Event.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Event.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CA.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_HAL_CM.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_List.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_List.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_List.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_List.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_List.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_List.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_List.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_List.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Mailbox.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_MemBox.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Memory.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Memory.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Memory.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Memory.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Memory.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Memory.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Memory.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Memory.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Mutex.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Robin.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Robin.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Robin.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Robin.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Robin.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Robin.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Robin.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Robin.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Semaphore.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_System.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_System.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_System.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_System.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_System.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_System.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_System.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_System.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Task.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Task.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Task.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Task.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Task.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Task.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Task.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Task.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Time.c b/src/rtos/rtx/TARGET_CORTEX_A/rt_Time.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Time.c rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Time.c diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Time.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Time.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Time.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Time.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_Timer.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_Timer.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_Timer.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_Timer.h diff --git a/rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h b/src/rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h rename to src/rtos/rtx/TARGET_CORTEX_A/rt_TypeDef.h diff --git a/rtos/rtx/TARGET_CORTEX_M/HAL_CM.c b/src/rtos/rtx/TARGET_CORTEX_M/HAL_CM.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/HAL_CM.c rename to src/rtos/rtx/TARGET_CORTEX_M/HAL_CM.c diff --git a/rtos/rtx/TARGET_CORTEX_M/Makefile b/src/rtos/rtx/TARGET_CORTEX_M/Makefile similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/Makefile rename to src/rtos/rtx/TARGET_CORTEX_M/Makefile diff --git a/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h b/src/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h rename to src/rtos/rtx/TARGET_CORTEX_M/RTX_CM_lib.h diff --git a/rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h b/src/rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h rename to src/rtos/rtx/TARGET_CORTEX_M/RTX_Conf.h diff --git a/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c b/src/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c rename to src/rtos/rtx/TARGET_CORTEX_M/RTX_Conf_CM.c diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/HAL_CM0.c diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_ARM/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/HAL_CM0.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/HAL_CM0.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0/TOOLCHAIN_IAR/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/HAL_CM0.c diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_ARM/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/HAL_CM0.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/HAL_CM0.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M0P/TOOLCHAIN_IAR/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/HAL_CM3.c diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_ARM/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/HAL_CM3.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/HAL_CM3.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M3/TOOLCHAIN_IAR/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/HAL_CM4.c b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/HAL_CM4.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/HAL_CM4.c rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/HAL_CM4.c diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_ARM/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/HAL_CM4.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/HAL_CM4.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/HAL_CM4.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/HAL_CM4.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_GCC/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/HAL_CM4.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/HAL_CM4.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/HAL_CM4.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/HAL_CM4.S diff --git a/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/SVC_Table.S b/src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/SVC_Table.S similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/SVC_Table.S rename to src/rtos/rtx/TARGET_CORTEX_M/TARGET_M4/TOOLCHAIN_IAR/SVC_Table.S diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_CMSIS.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Event.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Event.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Event.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Event.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Event.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Event.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Event.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Event.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_HAL_CM.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_List.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_List.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_List.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_List.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_List.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_List.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_List.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_List.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Mailbox.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_MemBox.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Mutex.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Robin.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Robin.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Robin.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Robin.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Robin.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Robin.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Robin.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Robin.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Semaphore.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_System.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_System.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_System.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_System.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_System.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_System.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_System.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_System.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Task.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Task.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Task.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Task.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Task.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Task.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Task.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Task.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Time.c b/src/rtos/rtx/TARGET_CORTEX_M/rt_Time.c similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Time.c rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Time.c diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_Time.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_Time.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_Time.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_Time.h diff --git a/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h b/src/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h similarity index 100% rename from rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h rename to src/rtos/rtx/TARGET_CORTEX_M/rt_TypeDef.h diff --git a/rtos/rtx5/ARM/irq_armv8mbl.s b/src/rtos/rtx5/ARM/irq_armv8mbl.s similarity index 100% rename from rtos/rtx5/ARM/irq_armv8mbl.s rename to src/rtos/rtx5/ARM/irq_armv8mbl.s diff --git a/rtos/rtx5/ARM/irq_armv8mbl_ns.s b/src/rtos/rtx5/ARM/irq_armv8mbl_ns.s similarity index 100% rename from rtos/rtx5/ARM/irq_armv8mbl_ns.s rename to src/rtos/rtx5/ARM/irq_armv8mbl_ns.s diff --git a/rtos/rtx5/ARM/irq_armv8mml.s b/src/rtos/rtx5/ARM/irq_armv8mml.s similarity index 100% rename from rtos/rtx5/ARM/irq_armv8mml.s rename to src/rtos/rtx5/ARM/irq_armv8mml.s diff --git a/rtos/rtx5/ARM/irq_armv8mml_ns.s b/src/rtos/rtx5/ARM/irq_armv8mml_ns.s similarity index 100% rename from rtos/rtx5/ARM/irq_armv8mml_ns.s rename to src/rtos/rtx5/ARM/irq_armv8mml_ns.s diff --git a/rtos/rtx5/ARM/irq_ca.s b/src/rtos/rtx5/ARM/irq_ca.s similarity index 100% rename from rtos/rtx5/ARM/irq_ca.s rename to src/rtos/rtx5/ARM/irq_ca.s diff --git a/rtos/rtx5/ARM/irq_cm0.s b/src/rtos/rtx5/ARM/irq_cm0.s similarity index 100% rename from rtos/rtx5/ARM/irq_cm0.s rename to src/rtos/rtx5/ARM/irq_cm0.s diff --git a/rtos/rtx5/ARM/irq_cm3.s b/src/rtos/rtx5/ARM/irq_cm3.s similarity index 100% rename from rtos/rtx5/ARM/irq_cm3.s rename to src/rtos/rtx5/ARM/irq_cm3.s diff --git a/rtos/rtx5/ARM/irq_cm4f.s b/src/rtos/rtx5/ARM/irq_cm4f.s similarity index 100% rename from rtos/rtx5/ARM/irq_cm4f.s rename to src/rtos/rtx5/ARM/irq_cm4f.s diff --git a/rtos/rtx5/GCC/Makefile b/src/rtos/rtx5/GCC/Makefile similarity index 100% rename from rtos/rtx5/GCC/Makefile rename to src/rtos/rtx5/GCC/Makefile diff --git a/rtos/rtx5/GCC/irq_armv8mbl.S b/src/rtos/rtx5/GCC/irq_armv8mbl.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mbl.S rename to src/rtos/rtx5/GCC/irq_armv8mbl.S diff --git a/rtos/rtx5/GCC/irq_armv8mbl_ns.S b/src/rtos/rtx5/GCC/irq_armv8mbl_ns.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mbl_ns.S rename to src/rtos/rtx5/GCC/irq_armv8mbl_ns.S diff --git a/rtos/rtx5/GCC/irq_armv8mml.S b/src/rtos/rtx5/GCC/irq_armv8mml.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mml.S rename to src/rtos/rtx5/GCC/irq_armv8mml.S diff --git a/rtos/rtx5/GCC/irq_armv8mml_fp.S b/src/rtos/rtx5/GCC/irq_armv8mml_fp.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mml_fp.S rename to src/rtos/rtx5/GCC/irq_armv8mml_fp.S diff --git a/rtos/rtx5/GCC/irq_armv8mml_fp_ns.S b/src/rtos/rtx5/GCC/irq_armv8mml_fp_ns.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mml_fp_ns.S rename to src/rtos/rtx5/GCC/irq_armv8mml_fp_ns.S diff --git a/rtos/rtx5/GCC/irq_armv8mml_ns.S b/src/rtos/rtx5/GCC/irq_armv8mml_ns.S similarity index 100% rename from rtos/rtx5/GCC/irq_armv8mml_ns.S rename to src/rtos/rtx5/GCC/irq_armv8mml_ns.S diff --git a/rtos/rtx5/GCC/irq_ca.S b/src/rtos/rtx5/GCC/irq_ca.S similarity index 100% rename from rtos/rtx5/GCC/irq_ca.S rename to src/rtos/rtx5/GCC/irq_ca.S diff --git a/rtos/rtx5/GCC/irq_cm0.S b/src/rtos/rtx5/GCC/irq_cm0.S similarity index 100% rename from rtos/rtx5/GCC/irq_cm0.S rename to src/rtos/rtx5/GCC/irq_cm0.S diff --git a/rtos/rtx5/GCC/irq_cm3.S b/src/rtos/rtx5/GCC/irq_cm3.S similarity index 100% rename from rtos/rtx5/GCC/irq_cm3.S rename to src/rtos/rtx5/GCC/irq_cm3.S diff --git a/rtos/rtx5/GCC/irq_cm4f.S b/src/rtos/rtx5/GCC/irq_cm4f.S similarity index 100% rename from rtos/rtx5/GCC/irq_cm4f.S rename to src/rtos/rtx5/GCC/irq_cm4f.S diff --git a/rtos/rtx5/IAR/irq_armv8mbl.s b/src/rtos/rtx5/IAR/irq_armv8mbl.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mbl.s rename to src/rtos/rtx5/IAR/irq_armv8mbl.s diff --git a/rtos/rtx5/IAR/irq_armv8mbl_common.s b/src/rtos/rtx5/IAR/irq_armv8mbl_common.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mbl_common.s rename to src/rtos/rtx5/IAR/irq_armv8mbl_common.s diff --git a/rtos/rtx5/IAR/irq_armv8mbl_ns.s b/src/rtos/rtx5/IAR/irq_armv8mbl_ns.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mbl_ns.s rename to src/rtos/rtx5/IAR/irq_armv8mbl_ns.s diff --git a/rtos/rtx5/IAR/irq_armv8mml.s b/src/rtos/rtx5/IAR/irq_armv8mml.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mml.s rename to src/rtos/rtx5/IAR/irq_armv8mml.s diff --git a/rtos/rtx5/IAR/irq_armv8mml_common.s b/src/rtos/rtx5/IAR/irq_armv8mml_common.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mml_common.s rename to src/rtos/rtx5/IAR/irq_armv8mml_common.s diff --git a/rtos/rtx5/IAR/irq_armv8mml_ns.s b/src/rtos/rtx5/IAR/irq_armv8mml_ns.s similarity index 100% rename from rtos/rtx5/IAR/irq_armv8mml_ns.s rename to src/rtos/rtx5/IAR/irq_armv8mml_ns.s diff --git a/rtos/rtx5/IAR/irq_ca.s b/src/rtos/rtx5/IAR/irq_ca.s similarity index 100% rename from rtos/rtx5/IAR/irq_ca.s rename to src/rtos/rtx5/IAR/irq_ca.s diff --git a/rtos/rtx5/IAR/irq_cm0.s b/src/rtos/rtx5/IAR/irq_cm0.s similarity index 100% rename from rtos/rtx5/IAR/irq_cm0.s rename to src/rtos/rtx5/IAR/irq_cm0.s diff --git a/rtos/rtx5/IAR/irq_cm3.s b/src/rtos/rtx5/IAR/irq_cm3.s similarity index 100% rename from rtos/rtx5/IAR/irq_cm3.s rename to src/rtos/rtx5/IAR/irq_cm3.s diff --git a/rtos/rtx5/IAR/irq_cm4f.s b/src/rtos/rtx5/IAR/irq_cm4f.s similarity index 100% rename from rtos/rtx5/IAR/irq_cm4f.s rename to src/rtos/rtx5/IAR/irq_cm4f.s diff --git a/rtos/rtx5/Makefile b/src/rtos/rtx5/Makefile similarity index 100% rename from rtos/rtx5/Makefile rename to src/rtos/rtx5/Makefile diff --git a/rtos/rtx5/RTE_Components.h b/src/rtos/rtx5/RTE_Components.h similarity index 100% rename from rtos/rtx5/RTE_Components.h rename to src/rtos/rtx5/RTE_Components.h diff --git a/rtos/rtx5/cmsis_os1.c b/src/rtos/rtx5/cmsis_os1.c similarity index 100% rename from rtos/rtx5/cmsis_os1.c rename to src/rtos/rtx5/cmsis_os1.c diff --git a/rtos/rtx5/os_systick.c b/src/rtos/rtx5/os_systick.c similarity index 100% rename from rtos/rtx5/os_systick.c rename to src/rtos/rtx5/os_systick.c diff --git a/rtos/rtx5/rtx_config/Makefile b/src/rtos/rtx5/rtx_config/Makefile similarity index 100% rename from rtos/rtx5/rtx_config/Makefile rename to src/rtos/rtx5/rtx_config/Makefile diff --git a/rtos/rtx5/rtx_config/rtx_config.c b/src/rtos/rtx5/rtx_config/rtx_config.c similarity index 100% rename from rtos/rtx5/rtx_config/rtx_config.c rename to src/rtos/rtx5/rtx_config/rtx_config.c diff --git a/rtos/rtx5/rtx_config/rtx_config.h b/src/rtos/rtx5/rtx_config/rtx_config.h similarity index 100% rename from rtos/rtx5/rtx_config/rtx_config.h rename to src/rtos/rtx5/rtx_config/rtx_config.h diff --git a/rtos/rtx5/rtx_core_c.h b/src/rtos/rtx5/rtx_core_c.h similarity index 100% rename from rtos/rtx5/rtx_core_c.h rename to src/rtos/rtx5/rtx_core_c.h diff --git a/rtos/rtx5/rtx_core_ca.h b/src/rtos/rtx5/rtx_core_ca.h similarity index 100% rename from rtos/rtx5/rtx_core_ca.h rename to src/rtos/rtx5/rtx_core_ca.h diff --git a/rtos/rtx5/rtx_core_cm.h b/src/rtos/rtx5/rtx_core_cm.h similarity index 100% rename from rtos/rtx5/rtx_core_cm.h rename to src/rtos/rtx5/rtx_core_cm.h diff --git a/rtos/rtx5/rtx_delay.c b/src/rtos/rtx5/rtx_delay.c similarity index 100% rename from rtos/rtx5/rtx_delay.c rename to src/rtos/rtx5/rtx_delay.c diff --git a/rtos/rtx5/rtx_evflags.c b/src/rtos/rtx5/rtx_evflags.c similarity index 100% rename from rtos/rtx5/rtx_evflags.c rename to src/rtos/rtx5/rtx_evflags.c diff --git a/rtos/rtx5/rtx_evr.c b/src/rtos/rtx5/rtx_evr.c similarity index 100% rename from rtos/rtx5/rtx_evr.c rename to src/rtos/rtx5/rtx_evr.c diff --git a/rtos/rtx5/rtx_kernel.c b/src/rtos/rtx5/rtx_kernel.c similarity index 100% rename from rtos/rtx5/rtx_kernel.c rename to src/rtos/rtx5/rtx_kernel.c diff --git a/rtos/rtx5/rtx_lib.c b/src/rtos/rtx5/rtx_lib.c similarity index 100% rename from rtos/rtx5/rtx_lib.c rename to src/rtos/rtx5/rtx_lib.c diff --git a/rtos/rtx5/rtx_lib.h b/src/rtos/rtx5/rtx_lib.h similarity index 100% rename from rtos/rtx5/rtx_lib.h rename to src/rtos/rtx5/rtx_lib.h diff --git a/rtos/rtx5/rtx_memory.c b/src/rtos/rtx5/rtx_memory.c similarity index 100% rename from rtos/rtx5/rtx_memory.c rename to src/rtos/rtx5/rtx_memory.c diff --git a/rtos/rtx5/rtx_mempool.c b/src/rtos/rtx5/rtx_mempool.c similarity index 100% rename from rtos/rtx5/rtx_mempool.c rename to src/rtos/rtx5/rtx_mempool.c diff --git a/rtos/rtx5/rtx_msgqueue.c b/src/rtos/rtx5/rtx_msgqueue.c similarity index 100% rename from rtos/rtx5/rtx_msgqueue.c rename to src/rtos/rtx5/rtx_msgqueue.c diff --git a/rtos/rtx5/rtx_mutex.c b/src/rtos/rtx5/rtx_mutex.c similarity index 100% rename from rtos/rtx5/rtx_mutex.c rename to src/rtos/rtx5/rtx_mutex.c diff --git a/rtos/rtx5/rtx_semaphore.c b/src/rtos/rtx5/rtx_semaphore.c similarity index 100% rename from rtos/rtx5/rtx_semaphore.c rename to src/rtos/rtx5/rtx_semaphore.c diff --git a/rtos/rtx5/rtx_system.c b/src/rtos/rtx5/rtx_system.c similarity index 100% rename from rtos/rtx5/rtx_system.c rename to src/rtos/rtx5/rtx_system.c diff --git a/rtos/rtx5/rtx_thread.c b/src/rtos/rtx5/rtx_thread.c similarity index 100% rename from rtos/rtx5/rtx_thread.c rename to src/rtos/rtx5/rtx_thread.c diff --git a/rtos/rtx5/rtx_thread_dump.c b/src/rtos/rtx5/rtx_thread_dump.c similarity index 100% rename from rtos/rtx5/rtx_thread_dump.c rename to src/rtos/rtx5/rtx_thread_dump.c diff --git a/rtos/rtx5/rtx_timer.c b/src/rtos/rtx5/rtx_timer.c similarity index 100% rename from rtos/rtx5/rtx_timer.c rename to src/rtos/rtx5/rtx_timer.c diff --git a/scripts/build.mk b/src/scripts/build.mk similarity index 100% rename from scripts/build.mk rename to src/scripts/build.mk diff --git a/scripts/clean.mk b/src/scripts/clean.mk similarity index 100% rename from scripts/clean.mk rename to src/scripts/clean.mk diff --git a/scripts/extrawarn.mk b/src/scripts/extrawarn.mk similarity index 100% rename from scripts/extrawarn.mk rename to src/scripts/extrawarn.mk diff --git a/scripts/include.mk b/src/scripts/include.mk similarity index 100% rename from scripts/include.mk rename to src/scripts/include.mk diff --git a/scripts/lib.mk b/src/scripts/lib.mk similarity index 100% rename from scripts/lib.mk rename to src/scripts/lib.mk diff --git a/scripts/link/armca.lds.S b/src/scripts/link/armca.lds.S similarity index 100% rename from scripts/link/armca.lds.S rename to src/scripts/link/armca.lds.S diff --git a/scripts/link/best1000.lds.S b/src/scripts/link/best1000.lds.S similarity index 100% rename from scripts/link/best1000.lds.S rename to src/scripts/link/best1000.lds.S diff --git a/scripts/link/best1000_fpga_rom.lds.S b/src/scripts/link/best1000_fpga_rom.lds.S similarity index 100% rename from scripts/link/best1000_fpga_rom.lds.S rename to src/scripts/link/best1000_fpga_rom.lds.S diff --git a/scripts/link/best1000_intsram.lds.S b/src/scripts/link/best1000_intsram.lds.S similarity index 100% rename from scripts/link/best1000_intsram.lds.S rename to src/scripts/link/best1000_intsram.lds.S diff --git a/scripts/link/best1000_intsram.lds_scat.S b/src/scripts/link/best1000_intsram.lds_scat.S similarity index 100% rename from scripts/link/best1000_intsram.lds_scat.S rename to src/scripts/link/best1000_intsram.lds_scat.S diff --git a/scripts/link/best1000_msbc_aac.lds.S b/src/scripts/link/best1000_msbc_aac.lds.S similarity index 100% rename from scripts/link/best1000_msbc_aac.lds.S rename to src/scripts/link/best1000_msbc_aac.lds.S diff --git a/scripts/link/best1000savepower.lds.S b/src/scripts/link/best1000savepower.lds.S similarity index 100% rename from scripts/link/best1000savepower.lds.S rename to src/scripts/link/best1000savepower.lds.S diff --git a/scripts/link/best2000_bisto.lds.S b/src/scripts/link/best2000_bisto.lds.S similarity index 100% rename from scripts/link/best2000_bisto.lds.S rename to src/scripts/link/best2000_bisto.lds.S diff --git a/scripts/link/best2000_dma.lds.S b/src/scripts/link/best2000_dma.lds.S similarity index 100% rename from scripts/link/best2000_dma.lds.S rename to src/scripts/link/best2000_dma.lds.S diff --git a/scripts/link/programmer.lds.S b/src/scripts/link/programmer.lds.S similarity index 100% rename from scripts/link/programmer.lds.S rename to src/scripts/link/programmer.lds.S diff --git a/scripts/link/programmer.lds_scat.S b/src/scripts/link/programmer.lds_scat.S similarity index 100% rename from scripts/link/programmer.lds_scat.S rename to src/scripts/link/programmer.lds_scat.S diff --git a/scripts/link/programmer_inflash.lds.S b/src/scripts/link/programmer_inflash.lds.S similarity index 100% rename from scripts/link/programmer_inflash.lds.S rename to src/scripts/link/programmer_inflash.lds.S diff --git a/scripts/link/rom.lds.S b/src/scripts/link/rom.lds.S similarity index 100% rename from scripts/link/rom.lds.S rename to src/scripts/link/rom.lds.S diff --git a/scripts/link/rom.lds_scat.S b/src/scripts/link/rom.lds_scat.S similarity index 100% rename from scripts/link/rom.lds_scat.S rename to src/scripts/link/rom.lds_scat.S diff --git a/scripts/submods.mk b/src/scripts/submods.mk similarity index 100% rename from scripts/submods.mk rename to src/scripts/submods.mk diff --git a/scripts/submods_init.mk b/src/scripts/submods_init.mk similarity index 100% rename from scripts/submods_init.mk rename to src/scripts/submods_init.mk diff --git a/services/Makefile b/src/services/Makefile similarity index 100% rename from services/Makefile rename to src/services/Makefile diff --git a/services/anc_spp_tool/Makefile b/src/services/anc_spp_tool/Makefile similarity index 100% rename from services/anc_spp_tool/Makefile rename to src/services/anc_spp_tool/Makefile diff --git a/services/anc_spp_tool/anc_parse_data.h b/src/services/anc_spp_tool/anc_parse_data.h similarity index 100% rename from services/anc_spp_tool/anc_parse_data.h rename to src/services/anc_spp_tool/anc_parse_data.h diff --git a/services/anc_spp_tool/lib/libanc_spp_tool.a b/src/services/anc_spp_tool/lib/libanc_spp_tool.a similarity index 100% rename from services/anc_spp_tool/lib/libanc_spp_tool.a rename to src/services/anc_spp_tool/lib/libanc_spp_tool.a diff --git a/services/app_ai/Makefile b/src/services/app_ai/Makefile similarity index 100% rename from services/app_ai/Makefile rename to src/services/app_ai/Makefile diff --git a/services/app_ai/inc/app_ai_algorithm.h b/src/services/app_ai/inc/app_ai_algorithm.h similarity index 100% rename from services/app_ai/inc/app_ai_algorithm.h rename to src/services/app_ai/inc/app_ai_algorithm.h diff --git a/services/app_ai/inc/app_ai_if.h b/src/services/app_ai/inc/app_ai_if.h similarity index 100% rename from services/app_ai/inc/app_ai_if.h rename to src/services/app_ai/inc/app_ai_if.h diff --git a/services/app_ai/inc/app_ai_if_config.h b/src/services/app_ai/inc/app_ai_if_config.h similarity index 100% rename from services/app_ai/inc/app_ai_if_config.h rename to src/services/app_ai/inc/app_ai_if_config.h diff --git a/services/app_ai/inc/app_ai_if_custom_ui.h b/src/services/app_ai/inc/app_ai_if_custom_ui.h similarity index 100% rename from services/app_ai/inc/app_ai_if_custom_ui.h rename to src/services/app_ai/inc/app_ai_if_custom_ui.h diff --git a/services/app_ai/inc/app_ai_if_gsound.h b/src/services/app_ai/inc/app_ai_if_gsound.h similarity index 100% rename from services/app_ai/inc/app_ai_if_gsound.h rename to src/services/app_ai/inc/app_ai_if_gsound.h diff --git a/services/app_ai/inc/app_ai_if_thirdparty.h b/src/services/app_ai/inc/app_ai_if_thirdparty.h similarity index 100% rename from services/app_ai/inc/app_ai_if_thirdparty.h rename to src/services/app_ai/inc/app_ai_if_thirdparty.h diff --git a/services/app_ai/inc/app_ai_manager_api.h b/src/services/app_ai/inc/app_ai_manager_api.h similarity index 100% rename from services/app_ai/inc/app_ai_manager_api.h rename to src/services/app_ai/inc/app_ai_manager_api.h diff --git a/services/app_ai/inc/app_ai_tws.h b/src/services/app_ai/inc/app_ai_tws.h similarity index 100% rename from services/app_ai/inc/app_ai_tws.h rename to src/services/app_ai/inc/app_ai_tws.h diff --git a/services/app_ai/src/app_ai_algorithm.cpp b/src/services/app_ai/src/app_ai_algorithm.cpp similarity index 100% rename from services/app_ai/src/app_ai_algorithm.cpp rename to src/services/app_ai/src/app_ai_algorithm.cpp diff --git a/services/app_ai/src/app_ai_if.cpp b/src/services/app_ai/src/app_ai_if.cpp similarity index 100% rename from services/app_ai/src/app_ai_if.cpp rename to src/services/app_ai/src/app_ai_if.cpp diff --git a/services/app_ai/src/app_ai_if_custom_ui.cpp b/src/services/app_ai/src/app_ai_if_custom_ui.cpp similarity index 100% rename from services/app_ai/src/app_ai_if_custom_ui.cpp rename to src/services/app_ai/src/app_ai_if_custom_ui.cpp diff --git a/services/app_ai/src/app_ai_if_gsound.cpp b/src/services/app_ai/src/app_ai_if_gsound.cpp similarity index 100% rename from services/app_ai/src/app_ai_if_gsound.cpp rename to src/services/app_ai/src/app_ai_if_gsound.cpp diff --git a/services/app_ai/src/app_ai_if_thirdparty.cpp b/src/services/app_ai/src/app_ai_if_thirdparty.cpp similarity index 100% rename from services/app_ai/src/app_ai_if_thirdparty.cpp rename to src/services/app_ai/src/app_ai_if_thirdparty.cpp diff --git a/services/app_ai/src/app_ai_manager_api.cpp b/src/services/app_ai/src/app_ai_manager_api.cpp similarity index 100% rename from services/app_ai/src/app_ai_manager_api.cpp rename to src/services/app_ai/src/app_ai_manager_api.cpp diff --git a/services/app_ai/src/app_ai_tws.cpp b/src/services/app_ai/src/app_ai_tws.cpp similarity index 100% rename from services/app_ai/src/app_ai_tws.cpp rename to src/services/app_ai/src/app_ai_tws.cpp diff --git a/services/app_ai/voice_sbc/voice_sbc.cpp b/src/services/app_ai/voice_sbc/voice_sbc.cpp similarity index 100% rename from services/app_ai/voice_sbc/voice_sbc.cpp rename to src/services/app_ai/voice_sbc/voice_sbc.cpp diff --git a/services/app_ai/voice_sbc/voice_sbc.h b/src/services/app_ai/voice_sbc/voice_sbc.h similarity index 100% rename from services/app_ai/voice_sbc/voice_sbc.h rename to src/services/app_ai/voice_sbc/voice_sbc.h diff --git a/services/app_ibrt/Makefile b/src/services/app_ibrt/Makefile similarity index 100% rename from services/app_ibrt/Makefile rename to src/services/app_ibrt/Makefile diff --git a/services/app_ibrt/inc/app_ibrt_a2dp.h b/src/services/app_ibrt/inc/app_ibrt_a2dp.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_a2dp.h rename to src/services/app_ibrt/inc/app_ibrt_a2dp.h diff --git a/services/app_ibrt/inc/app_ibrt_auto_test.h b/src/services/app_ibrt/inc/app_ibrt_auto_test.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_auto_test.h rename to src/services/app_ibrt/inc/app_ibrt_auto_test.h diff --git a/services/app_ibrt/inc/app_ibrt_auto_test_cmd_handle.h b/src/services/app_ibrt/inc/app_ibrt_auto_test_cmd_handle.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_auto_test_cmd_handle.h rename to src/services/app_ibrt/inc/app_ibrt_auto_test_cmd_handle.h diff --git a/services/app_ibrt/inc/app_ibrt_ble_adv.h b/src/services/app_ibrt/inc/app_ibrt_ble_adv.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_ble_adv.h rename to src/services/app_ibrt/inc/app_ibrt_ble_adv.h diff --git a/services/app_ibrt/inc/app_ibrt_custom_cmd.h b/src/services/app_ibrt/inc/app_ibrt_custom_cmd.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_custom_cmd.h rename to src/services/app_ibrt/inc/app_ibrt_custom_cmd.h diff --git a/services/app_ibrt/inc/app_ibrt_customif_cmd.h b/src/services/app_ibrt/inc/app_ibrt_customif_cmd.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_customif_cmd.h rename to src/services/app_ibrt/inc/app_ibrt_customif_cmd.h diff --git a/services/app_ibrt/inc/app_ibrt_customif_ui.h b/src/services/app_ibrt/inc/app_ibrt_customif_ui.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_customif_ui.h rename to src/services/app_ibrt/inc/app_ibrt_customif_ui.h diff --git a/services/app_ibrt/inc/app_ibrt_hf.h b/src/services/app_ibrt/inc/app_ibrt_hf.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_hf.h rename to src/services/app_ibrt/inc/app_ibrt_hf.h diff --git a/services/app_ibrt/inc/app_ibrt_if.h b/src/services/app_ibrt/inc/app_ibrt_if.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_if.h rename to src/services/app_ibrt/inc/app_ibrt_if.h diff --git a/services/app_ibrt/inc/app_ibrt_if_internal.h b/src/services/app_ibrt/inc/app_ibrt_if_internal.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_if_internal.h rename to src/services/app_ibrt/inc/app_ibrt_if_internal.h diff --git a/services/app_ibrt/inc/app_ibrt_keyboard.h b/src/services/app_ibrt/inc/app_ibrt_keyboard.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_keyboard.h rename to src/services/app_ibrt/inc/app_ibrt_keyboard.h diff --git a/services/app_ibrt/inc/app_ibrt_nvrecord.h b/src/services/app_ibrt/inc/app_ibrt_nvrecord.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_nvrecord.h rename to src/services/app_ibrt/inc/app_ibrt_nvrecord.h diff --git a/services/app_ibrt/inc/app_ibrt_ota_cmd.h b/src/services/app_ibrt/inc/app_ibrt_ota_cmd.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_ota_cmd.h rename to src/services/app_ibrt/inc/app_ibrt_ota_cmd.h diff --git a/services/app_ibrt/inc/app_ibrt_ota_update.h b/src/services/app_ibrt/inc/app_ibrt_ota_update.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_ota_update.h rename to src/services/app_ibrt/inc/app_ibrt_ota_update.h diff --git a/services/app_ibrt/inc/app_ibrt_peripheral_manager.h b/src/services/app_ibrt/inc/app_ibrt_peripheral_manager.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_peripheral_manager.h rename to src/services/app_ibrt/inc/app_ibrt_peripheral_manager.h diff --git a/services/app_ibrt/inc/app_ibrt_rssi.h b/src/services/app_ibrt/inc/app_ibrt_rssi.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_rssi.h rename to src/services/app_ibrt/inc/app_ibrt_rssi.h diff --git a/services/app_ibrt/inc/app_ibrt_ui_test.h b/src/services/app_ibrt/inc/app_ibrt_ui_test.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_ui_test.h rename to src/services/app_ibrt/inc/app_ibrt_ui_test.h diff --git a/services/app_ibrt/inc/app_ibrt_ui_test_cmd_if.h b/src/services/app_ibrt/inc/app_ibrt_ui_test_cmd_if.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_ui_test_cmd_if.h rename to src/services/app_ibrt/inc/app_ibrt_ui_test_cmd_if.h diff --git a/services/app_ibrt/inc/app_ibrt_voice_report.h b/src/services/app_ibrt/inc/app_ibrt_voice_report.h similarity index 100% rename from services/app_ibrt/inc/app_ibrt_voice_report.h rename to src/services/app_ibrt/inc/app_ibrt_voice_report.h diff --git a/services/app_ibrt/src/app_ibrt_auto_test.cpp b/src/services/app_ibrt/src/app_ibrt_auto_test.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_auto_test.cpp rename to src/services/app_ibrt/src/app_ibrt_auto_test.cpp diff --git a/services/app_ibrt/src/app_ibrt_auto_test_cmd_handle.cpp b/src/services/app_ibrt/src/app_ibrt_auto_test_cmd_handle.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_auto_test_cmd_handle.cpp rename to src/services/app_ibrt/src/app_ibrt_auto_test_cmd_handle.cpp diff --git a/services/app_ibrt/src/app_ibrt_ble_adv.cpp b/src/services/app_ibrt/src/app_ibrt_ble_adv.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_ble_adv.cpp rename to src/services/app_ibrt/src/app_ibrt_ble_adv.cpp diff --git a/services/app_ibrt/src/app_ibrt_customif_cmd.cpp b/src/services/app_ibrt/src/app_ibrt_customif_cmd.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_customif_cmd.cpp rename to src/services/app_ibrt/src/app_ibrt_customif_cmd.cpp diff --git a/services/app_ibrt/src/app_ibrt_customif_ui.cpp b/src/services/app_ibrt/src/app_ibrt_customif_ui.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_customif_ui.cpp rename to src/services/app_ibrt/src/app_ibrt_customif_ui.cpp diff --git a/services/app_ibrt/src/app_ibrt_if.cpp b/src/services/app_ibrt/src/app_ibrt_if.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_if.cpp rename to src/services/app_ibrt/src/app_ibrt_if.cpp diff --git a/services/app_ibrt/src/app_ibrt_keyboard.cpp b/src/services/app_ibrt/src/app_ibrt_keyboard.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_keyboard.cpp rename to src/services/app_ibrt/src/app_ibrt_keyboard.cpp diff --git a/services/app_ibrt/src/app_ibrt_nvrecord.cpp b/src/services/app_ibrt/src/app_ibrt_nvrecord.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_nvrecord.cpp rename to src/services/app_ibrt/src/app_ibrt_nvrecord.cpp diff --git a/services/app_ibrt/src/app_ibrt_ota_cmd.cpp b/src/services/app_ibrt/src/app_ibrt_ota_cmd.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_ota_cmd.cpp rename to src/services/app_ibrt/src/app_ibrt_ota_cmd.cpp diff --git a/services/app_ibrt/src/app_ibrt_ota_update.cpp b/src/services/app_ibrt/src/app_ibrt_ota_update.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_ota_update.cpp rename to src/services/app_ibrt/src/app_ibrt_ota_update.cpp diff --git a/services/app_ibrt/src/app_ibrt_peripheral_manager.cpp b/src/services/app_ibrt/src/app_ibrt_peripheral_manager.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_peripheral_manager.cpp rename to src/services/app_ibrt/src/app_ibrt_peripheral_manager.cpp diff --git a/services/app_ibrt/src/app_ibrt_rssi.cpp b/src/services/app_ibrt/src/app_ibrt_rssi.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_rssi.cpp rename to src/services/app_ibrt/src/app_ibrt_rssi.cpp diff --git a/services/app_ibrt/src/app_ibrt_search_pair_ui.cpp b/src/services/app_ibrt/src/app_ibrt_search_pair_ui.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_search_pair_ui.cpp rename to src/services/app_ibrt/src/app_ibrt_search_pair_ui.cpp diff --git a/services/app_ibrt/src/app_ibrt_ui_test.cpp b/src/services/app_ibrt/src/app_ibrt_ui_test.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_ui_test.cpp rename to src/services/app_ibrt/src/app_ibrt_ui_test.cpp diff --git a/services/app_ibrt/src/app_ibrt_ui_test_cmd_if.cpp b/src/services/app_ibrt/src/app_ibrt_ui_test_cmd_if.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_ui_test_cmd_if.cpp rename to src/services/app_ibrt/src/app_ibrt_ui_test_cmd_if.cpp diff --git a/services/app_ibrt/src/app_ibrt_voice_report.cpp b/src/services/app_ibrt/src/app_ibrt_voice_report.cpp similarity index 100% rename from services/app_ibrt/src/app_ibrt_voice_report.cpp rename to src/services/app_ibrt/src/app_ibrt_voice_report.cpp diff --git a/services/app_tws/Makefile b/src/services/app_tws/Makefile similarity index 100% rename from services/app_tws/Makefile rename to src/services/app_tws/Makefile diff --git a/services/app_tws/inc/app_tws_if.h b/src/services/app_tws/inc/app_tws_if.h similarity index 100% rename from services/app_tws/inc/app_tws_if.h rename to src/services/app_tws/inc/app_tws_if.h diff --git a/services/app_tws/src/app_tws_if.cpp b/src/services/app_tws/src/app_tws_if.cpp similarity index 100% rename from services/app_tws/src/app_tws_if.cpp rename to src/services/app_tws/src/app_tws_if.cpp diff --git a/services/audio_dump/Makefile b/src/services/audio_dump/Makefile similarity index 100% rename from services/audio_dump/Makefile rename to src/services/audio_dump/Makefile diff --git a/services/audio_dump/include/audio_dump.h b/src/services/audio_dump/include/audio_dump.h similarity index 100% rename from services/audio_dump/include/audio_dump.h rename to src/services/audio_dump/include/audio_dump.h diff --git a/services/audio_dump/src/audio_dump.c b/src/services/audio_dump/src/audio_dump.c similarity index 100% rename from services/audio_dump/src/audio_dump.c rename to src/services/audio_dump/src/audio_dump.c diff --git a/services/audio_process/Makefile b/src/services/audio_process/Makefile similarity index 100% rename from services/audio_process/Makefile rename to src/services/audio_process/Makefile diff --git a/services/audio_process/audio_cfg.c b/src/services/audio_process/audio_cfg.c similarity index 100% rename from services/audio_process/audio_cfg.c rename to src/services/audio_process/audio_cfg.c diff --git a/services/audio_process/audio_cfg.h b/src/services/audio_process/audio_cfg.h similarity index 100% rename from services/audio_process/audio_cfg.h rename to src/services/audio_process/audio_cfg.h diff --git a/services/audio_process/audio_process.c b/src/services/audio_process/audio_process.c similarity index 100% rename from services/audio_process/audio_process.c rename to src/services/audio_process/audio_process.c diff --git a/services/audio_process/audio_process.h b/src/services/audio_process/audio_process.h similarity index 100% rename from services/audio_process/audio_process.h rename to src/services/audio_process/audio_process.h diff --git a/services/audio_process/audio_spectrum.cpp b/src/services/audio_process/audio_spectrum.cpp similarity index 100% rename from services/audio_process/audio_spectrum.cpp rename to src/services/audio_process/audio_spectrum.cpp diff --git a/services/audio_process/audio_spectrum.h b/src/services/audio_process/audio_spectrum.h similarity index 100% rename from services/audio_process/audio_spectrum.h rename to src/services/audio_process/audio_spectrum.h diff --git a/services/audioflinger/Makefile b/src/services/audioflinger/Makefile similarity index 100% rename from services/audioflinger/Makefile rename to src/services/audioflinger/Makefile diff --git a/services/audioflinger/audioflinger.c b/src/services/audioflinger/audioflinger.c similarity index 100% rename from services/audioflinger/audioflinger.c rename to src/services/audioflinger/audioflinger.c diff --git a/services/audioflinger/audioflinger.h b/src/services/audioflinger/audioflinger.h similarity index 100% rename from services/audioflinger/audioflinger.h rename to src/services/audioflinger/audioflinger.h diff --git a/services/auto_test/Makefile b/src/services/auto_test/Makefile similarity index 100% rename from services/auto_test/Makefile rename to src/services/auto_test/Makefile diff --git a/services/auto_test/at_thread.cpp b/src/services/auto_test/at_thread.cpp similarity index 100% rename from services/auto_test/at_thread.cpp rename to src/services/auto_test/at_thread.cpp diff --git a/services/auto_test/at_thread.h b/src/services/auto_test/at_thread.h similarity index 100% rename from services/auto_test/at_thread.h rename to src/services/auto_test/at_thread.h diff --git a/services/auto_test/at_thread_user.cpp b/src/services/auto_test/at_thread_user.cpp similarity index 100% rename from services/auto_test/at_thread_user.cpp rename to src/services/auto_test/at_thread_user.cpp diff --git a/services/auto_test/at_thread_user.h b/src/services/auto_test/at_thread_user.h similarity index 100% rename from services/auto_test/at_thread_user.h rename to src/services/auto_test/at_thread_user.h diff --git a/services/auto_test/auto_test.cpp b/src/services/auto_test/auto_test.cpp similarity index 100% rename from services/auto_test/auto_test.cpp rename to src/services/auto_test/auto_test.cpp diff --git a/services/ble_app/Makefile b/src/services/ble_app/Makefile similarity index 100% rename from services/ble_app/Makefile rename to src/services/ble_app/Makefile diff --git a/services/ble_app/app_amsc/app_amsc.c b/src/services/ble_app/app_amsc/app_amsc.c similarity index 100% rename from services/ble_app/app_amsc/app_amsc.c rename to src/services/ble_app/app_amsc/app_amsc.c diff --git a/services/ble_app/app_amsc/app_amsc.h b/src/services/ble_app/app_amsc/app_amsc.h similarity index 100% rename from services/ble_app/app_amsc/app_amsc.h rename to src/services/ble_app/app_amsc/app_amsc.h diff --git a/services/ble_app/app_amsc/app_amsc_task.c b/src/services/ble_app/app_amsc/app_amsc_task.c similarity index 100% rename from services/ble_app/app_amsc/app_amsc_task.c rename to src/services/ble_app/app_amsc/app_amsc_task.c diff --git a/services/ble_app/app_amsc/app_amsc_task.h b/src/services/ble_app/app_amsc/app_amsc_task.h similarity index 100% rename from services/ble_app/app_amsc/app_amsc_task.h rename to src/services/ble_app/app_amsc/app_amsc_task.h diff --git a/services/ble_app/app_ancc/app_ancc.c b/src/services/ble_app/app_ancc/app_ancc.c similarity index 100% rename from services/ble_app/app_ancc/app_ancc.c rename to src/services/ble_app/app_ancc/app_ancc.c diff --git a/services/ble_app/app_ancc/app_ancc.h b/src/services/ble_app/app_ancc/app_ancc.h similarity index 100% rename from services/ble_app/app_ancc/app_ancc.h rename to src/services/ble_app/app_ancc/app_ancc.h diff --git a/services/ble_app/app_ancc/app_ancc_task.c b/src/services/ble_app/app_ancc/app_ancc_task.c similarity index 100% rename from services/ble_app/app_ancc/app_ancc_task.c rename to src/services/ble_app/app_ancc/app_ancc_task.c diff --git a/services/ble_app/app_ancc/app_ancc_task.h b/src/services/ble_app/app_ancc/app_ancc_task.h similarity index 100% rename from services/ble_app/app_ancc/app_ancc_task.h rename to src/services/ble_app/app_ancc/app_ancc_task.h diff --git a/services/ble_app/app_batt/app_batt.c b/src/services/ble_app/app_batt/app_batt.c similarity index 100% rename from services/ble_app/app_batt/app_batt.c rename to src/services/ble_app/app_batt/app_batt.c diff --git a/services/ble_app/app_batt/app_batt.h b/src/services/ble_app/app_batt/app_batt.h similarity index 100% rename from services/ble_app/app_batt/app_batt.h rename to src/services/ble_app/app_batt/app_batt.h diff --git a/services/ble_app/app_ble_key.cpp b/src/services/ble_app/app_ble_key.cpp similarity index 100% rename from services/ble_app/app_ble_key.cpp rename to src/services/ble_app/app_ble_key.cpp diff --git a/services/ble_app/app_ble_uart.cpp b/src/services/ble_app/app_ble_uart.cpp similarity index 100% rename from services/ble_app/app_ble_uart.cpp rename to src/services/ble_app/app_ble_uart.cpp diff --git a/services/ble_app/app_ble_uart.h b/src/services/ble_app/app_ble_uart.h similarity index 100% rename from services/ble_app/app_ble_uart.h rename to src/services/ble_app/app_ble_uart.h diff --git a/services/ble_app/app_datapath/app_ble_cmd_handler.c b/src/services/ble_app/app_datapath/app_ble_cmd_handler.c similarity index 100% rename from services/ble_app/app_datapath/app_ble_cmd_handler.c rename to src/services/ble_app/app_datapath/app_ble_cmd_handler.c diff --git a/services/ble_app/app_datapath/app_ble_cmd_handler.h b/src/services/ble_app/app_datapath/app_ble_cmd_handler.h similarity index 100% rename from services/ble_app/app_datapath/app_ble_cmd_handler.h rename to src/services/ble_app/app_datapath/app_ble_cmd_handler.h diff --git a/services/ble_app/app_datapath/app_ble_custom_cmd.c b/src/services/ble_app/app_datapath/app_ble_custom_cmd.c similarity index 100% rename from services/ble_app/app_datapath/app_ble_custom_cmd.c rename to src/services/ble_app/app_datapath/app_ble_custom_cmd.c diff --git a/services/ble_app/app_datapath/app_ble_custom_cmd.h b/src/services/ble_app/app_datapath/app_ble_custom_cmd.h similarity index 100% rename from services/ble_app/app_datapath/app_ble_custom_cmd.h rename to src/services/ble_app/app_datapath/app_ble_custom_cmd.h diff --git a/services/ble_app/app_datapath/app_datapath_server.c b/src/services/ble_app/app_datapath/app_datapath_server.c similarity index 100% rename from services/ble_app/app_datapath/app_datapath_server.c rename to src/services/ble_app/app_datapath/app_datapath_server.c diff --git a/services/ble_app/app_datapath/app_datapath_server.h b/src/services/ble_app/app_datapath/app_datapath_server.h similarity index 100% rename from services/ble_app/app_datapath/app_datapath_server.h rename to src/services/ble_app/app_datapath/app_datapath_server.h diff --git a/services/ble_app/app_dis/app_dis.c b/src/services/ble_app/app_dis/app_dis.c similarity index 100% rename from services/ble_app/app_dis/app_dis.c rename to src/services/ble_app/app_dis/app_dis.c diff --git a/services/ble_app/app_dis/app_dis.h b/src/services/ble_app/app_dis/app_dis.h similarity index 100% rename from services/ble_app/app_dis/app_dis.h rename to src/services/ble_app/app_dis/app_dis.h diff --git a/services/ble_app/app_gfps/app_gfps.c b/src/services/ble_app/app_gfps/app_gfps.c similarity index 100% rename from services/ble_app/app_gfps/app_gfps.c rename to src/services/ble_app/app_gfps/app_gfps.c diff --git a/services/ble_app/app_gfps/app_gfps.h b/src/services/ble_app/app_gfps/app_gfps.h similarity index 100% rename from services/ble_app/app_gfps/app_gfps.h rename to src/services/ble_app/app_gfps/app_gfps.h diff --git a/services/ble_app/app_hid/app_hid.c b/src/services/ble_app/app_hid/app_hid.c similarity index 100% rename from services/ble_app/app_hid/app_hid.c rename to src/services/ble_app/app_hid/app_hid.c diff --git a/services/ble_app/app_hid/app_hid.h b/src/services/ble_app/app_hid/app_hid.h similarity index 100% rename from services/ble_app/app_hid/app_hid.h rename to src/services/ble_app/app_hid/app_hid.h diff --git a/services/ble_app/app_hrps/app_hrps.c b/src/services/ble_app/app_hrps/app_hrps.c similarity index 100% rename from services/ble_app/app_hrps/app_hrps.c rename to src/services/ble_app/app_hrps/app_hrps.c diff --git a/services/ble_app/app_hrps/app_hrps.h b/src/services/ble_app/app_hrps/app_hrps.h similarity index 100% rename from services/ble_app/app_hrps/app_hrps.h rename to src/services/ble_app/app_hrps/app_hrps.h diff --git a/services/ble_app/app_htp/app_ht.c b/src/services/ble_app/app_htp/app_ht.c similarity index 100% rename from services/ble_app/app_htp/app_ht.c rename to src/services/ble_app/app_htp/app_ht.c diff --git a/services/ble_app/app_htp/app_ht.h b/src/services/ble_app/app_htp/app_ht.h similarity index 100% rename from services/ble_app/app_htp/app_ht.h rename to src/services/ble_app/app_htp/app_ht.h diff --git a/services/ble_app/app_main/app.c b/src/services/ble_app/app_main/app.c similarity index 100% rename from services/ble_app/app_main/app.c rename to src/services/ble_app/app_main/app.c diff --git a/services/ble_app/app_main/app.h b/src/services/ble_app/app_main/app.h similarity index 100% rename from services/ble_app/app_main/app.h rename to src/services/ble_app/app_main/app.h diff --git a/services/ble_app/app_main/app_ble_core.c b/src/services/ble_app/app_main/app_ble_core.c similarity index 100% rename from services/ble_app/app_main/app_ble_core.c rename to src/services/ble_app/app_main/app_ble_core.c diff --git a/services/ble_app/app_main/app_ble_core.h b/src/services/ble_app/app_main/app_ble_core.h similarity index 100% rename from services/ble_app/app_main/app_ble_core.h rename to src/services/ble_app/app_main/app_ble_core.h diff --git a/services/ble_app/app_main/app_ble_customif.c b/src/services/ble_app/app_main/app_ble_customif.c similarity index 100% rename from services/ble_app/app_main/app_ble_customif.c rename to src/services/ble_app/app_main/app_ble_customif.c diff --git a/services/ble_app/app_main/app_ble_customif.h b/src/services/ble_app/app_main/app_ble_customif.h similarity index 100% rename from services/ble_app/app_main/app_ble_customif.h rename to src/services/ble_app/app_main/app_ble_customif.h diff --git a/services/ble_app/app_main/app_ble_include.h b/src/services/ble_app/app_main/app_ble_include.h similarity index 100% rename from services/ble_app/app_main/app_ble_include.h rename to src/services/ble_app/app_main/app_ble_include.h diff --git a/services/ble_app/app_main/app_ble_mode_switch.c b/src/services/ble_app/app_main/app_ble_mode_switch.c similarity index 100% rename from services/ble_app/app_main/app_ble_mode_switch.c rename to src/services/ble_app/app_main/app_ble_mode_switch.c diff --git a/services/ble_app/app_main/app_ble_mode_switch.h b/src/services/ble_app/app_main/app_ble_mode_switch.h similarity index 100% rename from services/ble_app/app_main/app_ble_mode_switch.h rename to src/services/ble_app/app_main/app_ble_mode_switch.h diff --git a/services/ble_app/app_main/app_ble_rx_handler.c b/src/services/ble_app/app_main/app_ble_rx_handler.c similarity index 100% rename from services/ble_app/app_main/app_ble_rx_handler.c rename to src/services/ble_app/app_main/app_ble_rx_handler.c diff --git a/services/ble_app/app_main/app_ble_rx_handler.h b/src/services/ble_app/app_main/app_ble_rx_handler.h similarity index 100% rename from services/ble_app/app_main/app_ble_rx_handler.h rename to src/services/ble_app/app_main/app_ble_rx_handler.h diff --git a/services/ble_app/app_main/app_task.c b/src/services/ble_app/app_main/app_task.c similarity index 100% rename from services/ble_app/app_main/app_task.c rename to src/services/ble_app/app_main/app_task.c diff --git a/services/ble_app/app_main/app_task.h b/src/services/ble_app/app_main/app_task.h similarity index 100% rename from services/ble_app/app_main/app_task.h rename to src/services/ble_app/app_main/app_task.h diff --git a/services/ble_app/app_ota/app_ota.c b/src/services/ble_app/app_ota/app_ota.c similarity index 100% rename from services/ble_app/app_ota/app_ota.c rename to src/services/ble_app/app_ota/app_ota.c diff --git a/services/ble_app/app_ota/app_ota.h b/src/services/ble_app/app_ota/app_ota.h similarity index 100% rename from services/ble_app/app_ota/app_ota.h rename to src/services/ble_app/app_ota/app_ota.h diff --git a/services/ble_app/app_sec/app_sec.c b/src/services/ble_app/app_sec/app_sec.c similarity index 100% rename from services/ble_app/app_sec/app_sec.c rename to src/services/ble_app/app_sec/app_sec.c diff --git a/services/ble_app/app_sec/app_sec.h b/src/services/ble_app/app_sec/app_sec.h similarity index 100% rename from services/ble_app/app_sec/app_sec.h rename to src/services/ble_app/app_sec/app_sec.h diff --git a/services/ble_app/app_tota/app_tota_ble.c b/src/services/ble_app/app_tota/app_tota_ble.c similarity index 100% rename from services/ble_app/app_tota/app_tota_ble.c rename to src/services/ble_app/app_tota/app_tota_ble.c diff --git a/services/ble_app/app_tota/app_tota_ble.h b/src/services/ble_app/app_tota/app_tota_ble.h similarity index 100% rename from services/ble_app/app_tota/app_tota_ble.h rename to src/services/ble_app/app_tota/app_tota_ble.h diff --git a/services/ble_app/app_vob/voice_over_ble.c b/src/services/ble_app/app_vob/voice_over_ble.c similarity index 100% rename from services/ble_app/app_vob/voice_over_ble.c rename to src/services/ble_app/app_vob/voice_over_ble.c diff --git a/services/ble_app/app_voice/app_voicepath_ble.c b/src/services/ble_app/app_voice/app_voicepath_ble.c similarity index 100% rename from services/ble_app/app_voice/app_voicepath_ble.c rename to src/services/ble_app/app_voice/app_voicepath_ble.c diff --git a/services/ble_app/app_voice/app_voicepath_ble.h b/src/services/ble_app/app_voice/app_voicepath_ble.h similarity index 100% rename from services/ble_app/app_voice/app_voicepath_ble.h rename to src/services/ble_app/app_voice/app_voicepath_ble.h diff --git a/services/ble_app/ble_app_dbg.h b/src/services/ble_app/ble_app_dbg.h similarity index 100% rename from services/ble_app/ble_app_dbg.h rename to src/services/ble_app/ble_app_dbg.h diff --git a/services/ble_profiles/Makefile b/src/services/ble_profiles/Makefile similarity index 100% rename from services/ble_profiles/Makefile rename to src/services/ble_profiles/Makefile diff --git a/services/ble_profiles/ams/ams_common.h b/src/services/ble_profiles/ams/ams_common.h similarity index 100% rename from services/ble_profiles/ams/ams_common.h rename to src/services/ble_profiles/ams/ams_common.h diff --git a/services/ble_profiles/ams/amsc/amsc.c b/src/services/ble_profiles/ams/amsc/amsc.c similarity index 100% rename from services/ble_profiles/ams/amsc/amsc.c rename to src/services/ble_profiles/ams/amsc/amsc.c diff --git a/services/ble_profiles/ams/amsc/amsc.h b/src/services/ble_profiles/ams/amsc/amsc.h similarity index 100% rename from services/ble_profiles/ams/amsc/amsc.h rename to src/services/ble_profiles/ams/amsc/amsc.h diff --git a/services/ble_profiles/ams/amsc/amsc_task.c b/src/services/ble_profiles/ams/amsc/amsc_task.c similarity index 100% rename from services/ble_profiles/ams/amsc/amsc_task.c rename to src/services/ble_profiles/ams/amsc/amsc_task.c diff --git a/services/ble_profiles/ams/amsc/amsc_task.h b/src/services/ble_profiles/ams/amsc/amsc_task.h similarity index 100% rename from services/ble_profiles/ams/amsc/amsc_task.h rename to src/services/ble_profiles/ams/amsc/amsc_task.h diff --git a/services/ble_profiles/anc/anc_common.h b/src/services/ble_profiles/anc/anc_common.h similarity index 100% rename from services/ble_profiles/anc/anc_common.h rename to src/services/ble_profiles/anc/anc_common.h diff --git a/services/ble_profiles/anc/ancc/ancc.c b/src/services/ble_profiles/anc/ancc/ancc.c similarity index 100% rename from services/ble_profiles/anc/ancc/ancc.c rename to src/services/ble_profiles/anc/ancc/ancc.c diff --git a/services/ble_profiles/anc/ancc/ancc.h b/src/services/ble_profiles/anc/ancc/ancc.h similarity index 100% rename from services/ble_profiles/anc/ancc/ancc.h rename to src/services/ble_profiles/anc/ancc/ancc.h diff --git a/services/ble_profiles/anc/ancc/ancc_task.c b/src/services/ble_profiles/anc/ancc/ancc_task.c similarity index 100% rename from services/ble_profiles/anc/ancc/ancc_task.c rename to src/services/ble_profiles/anc/ancc/ancc_task.c diff --git a/services/ble_profiles/anc/ancc/ancc_task.h b/src/services/ble_profiles/anc/ancc/ancc_task.h similarity index 100% rename from services/ble_profiles/anc/ancc/ancc_task.h rename to src/services/ble_profiles/anc/ancc/ancc_task.h diff --git a/services/ble_profiles/anp/anp_common.h b/src/services/ble_profiles/anp/anp_common.h similarity index 100% rename from services/ble_profiles/anp/anp_common.h rename to src/services/ble_profiles/anp/anp_common.h diff --git a/services/ble_profiles/anp/anpc/api/anpc_task.h b/src/services/ble_profiles/anp/anpc/api/anpc_task.h similarity index 100% rename from services/ble_profiles/anp/anpc/api/anpc_task.h rename to src/services/ble_profiles/anp/anpc/api/anpc_task.h diff --git a/services/ble_profiles/anp/anpc/src/anpc.c b/src/services/ble_profiles/anp/anpc/src/anpc.c similarity index 100% rename from services/ble_profiles/anp/anpc/src/anpc.c rename to src/services/ble_profiles/anp/anpc/src/anpc.c diff --git a/services/ble_profiles/anp/anpc/src/anpc.h b/src/services/ble_profiles/anp/anpc/src/anpc.h similarity index 100% rename from services/ble_profiles/anp/anpc/src/anpc.h rename to src/services/ble_profiles/anp/anpc/src/anpc.h diff --git a/services/ble_profiles/anp/anpc/src/anpc_task.c b/src/services/ble_profiles/anp/anpc/src/anpc_task.c similarity index 100% rename from services/ble_profiles/anp/anpc/src/anpc_task.c rename to src/services/ble_profiles/anp/anpc/src/anpc_task.c diff --git a/services/ble_profiles/anp/anps/api/anps_task.h b/src/services/ble_profiles/anp/anps/api/anps_task.h similarity index 100% rename from services/ble_profiles/anp/anps/api/anps_task.h rename to src/services/ble_profiles/anp/anps/api/anps_task.h diff --git a/services/ble_profiles/anp/anps/src/anps.c b/src/services/ble_profiles/anp/anps/src/anps.c similarity index 100% rename from services/ble_profiles/anp/anps/src/anps.c rename to src/services/ble_profiles/anp/anps/src/anps.c diff --git a/services/ble_profiles/anp/anps/src/anps.h b/src/services/ble_profiles/anp/anps/src/anps.h similarity index 100% rename from services/ble_profiles/anp/anps/src/anps.h rename to src/services/ble_profiles/anp/anps/src/anps.h diff --git a/services/ble_profiles/anp/anps/src/anps_task.c b/src/services/ble_profiles/anp/anps/src/anps_task.c similarity index 100% rename from services/ble_profiles/anp/anps/src/anps_task.c rename to src/services/ble_profiles/anp/anps/src/anps_task.c diff --git a/services/ble_profiles/bas/basc/api/basc_task.h b/src/services/ble_profiles/bas/basc/api/basc_task.h similarity index 100% rename from services/ble_profiles/bas/basc/api/basc_task.h rename to src/services/ble_profiles/bas/basc/api/basc_task.h diff --git a/services/ble_profiles/bas/basc/src/basc.c b/src/services/ble_profiles/bas/basc/src/basc.c similarity index 100% rename from services/ble_profiles/bas/basc/src/basc.c rename to src/services/ble_profiles/bas/basc/src/basc.c diff --git a/services/ble_profiles/bas/basc/src/basc.h b/src/services/ble_profiles/bas/basc/src/basc.h similarity index 100% rename from services/ble_profiles/bas/basc/src/basc.h rename to src/services/ble_profiles/bas/basc/src/basc.h diff --git a/services/ble_profiles/bas/basc/src/basc_task.c b/src/services/ble_profiles/bas/basc/src/basc_task.c similarity index 100% rename from services/ble_profiles/bas/basc/src/basc_task.c rename to src/services/ble_profiles/bas/basc/src/basc_task.c diff --git a/services/ble_profiles/bas/bass/api/bass_task.h b/src/services/ble_profiles/bas/bass/api/bass_task.h similarity index 100% rename from services/ble_profiles/bas/bass/api/bass_task.h rename to src/services/ble_profiles/bas/bass/api/bass_task.h diff --git a/services/ble_profiles/bas/bass/src/bass.c b/src/services/ble_profiles/bas/bass/src/bass.c similarity index 100% rename from services/ble_profiles/bas/bass/src/bass.c rename to src/services/ble_profiles/bas/bass/src/bass.c diff --git a/services/ble_profiles/bas/bass/src/bass.h b/src/services/ble_profiles/bas/bass/src/bass.h similarity index 100% rename from services/ble_profiles/bas/bass/src/bass.h rename to src/services/ble_profiles/bas/bass/src/bass.h diff --git a/services/ble_profiles/bas/bass/src/bass_task.c b/src/services/ble_profiles/bas/bass/src/bass_task.c similarity index 100% rename from services/ble_profiles/bas/bass/src/bass_task.c rename to src/services/ble_profiles/bas/bass/src/bass_task.c diff --git a/services/ble_profiles/blp/blp_common.h b/src/services/ble_profiles/blp/blp_common.h similarity index 100% rename from services/ble_profiles/blp/blp_common.h rename to src/services/ble_profiles/blp/blp_common.h diff --git a/services/ble_profiles/blp/blpc/api/blpc_task.h b/src/services/ble_profiles/blp/blpc/api/blpc_task.h similarity index 100% rename from services/ble_profiles/blp/blpc/api/blpc_task.h rename to src/services/ble_profiles/blp/blpc/api/blpc_task.h diff --git a/services/ble_profiles/blp/blpc/src/blpc.c b/src/services/ble_profiles/blp/blpc/src/blpc.c similarity index 100% rename from services/ble_profiles/blp/blpc/src/blpc.c rename to src/services/ble_profiles/blp/blpc/src/blpc.c diff --git a/services/ble_profiles/blp/blpc/src/blpc.h b/src/services/ble_profiles/blp/blpc/src/blpc.h similarity index 100% rename from services/ble_profiles/blp/blpc/src/blpc.h rename to src/services/ble_profiles/blp/blpc/src/blpc.h diff --git a/services/ble_profiles/blp/blpc/src/blpc_task.c b/src/services/ble_profiles/blp/blpc/src/blpc_task.c similarity index 100% rename from services/ble_profiles/blp/blpc/src/blpc_task.c rename to src/services/ble_profiles/blp/blpc/src/blpc_task.c diff --git a/services/ble_profiles/blp/blps/api/blps_task.h b/src/services/ble_profiles/blp/blps/api/blps_task.h similarity index 100% rename from services/ble_profiles/blp/blps/api/blps_task.h rename to src/services/ble_profiles/blp/blps/api/blps_task.h diff --git a/services/ble_profiles/blp/blps/src/blps.c b/src/services/ble_profiles/blp/blps/src/blps.c similarity index 100% rename from services/ble_profiles/blp/blps/src/blps.c rename to src/services/ble_profiles/blp/blps/src/blps.c diff --git a/services/ble_profiles/blp/blps/src/blps.h b/src/services/ble_profiles/blp/blps/src/blps.h similarity index 100% rename from services/ble_profiles/blp/blps/src/blps.h rename to src/services/ble_profiles/blp/blps/src/blps.h diff --git a/services/ble_profiles/blp/blps/src/blps_task.c b/src/services/ble_profiles/blp/blps/src/blps_task.c similarity index 100% rename from services/ble_profiles/blp/blps/src/blps_task.c rename to src/services/ble_profiles/blp/blps/src/blps_task.c diff --git a/services/ble_profiles/cpp/cpp_common.h b/src/services/ble_profiles/cpp/cpp_common.h similarity index 100% rename from services/ble_profiles/cpp/cpp_common.h rename to src/services/ble_profiles/cpp/cpp_common.h diff --git a/services/ble_profiles/cpp/cppc/api/cppc_task.h b/src/services/ble_profiles/cpp/cppc/api/cppc_task.h similarity index 100% rename from services/ble_profiles/cpp/cppc/api/cppc_task.h rename to src/services/ble_profiles/cpp/cppc/api/cppc_task.h diff --git a/services/ble_profiles/cpp/cppc/src/cppc.c b/src/services/ble_profiles/cpp/cppc/src/cppc.c similarity index 100% rename from services/ble_profiles/cpp/cppc/src/cppc.c rename to src/services/ble_profiles/cpp/cppc/src/cppc.c diff --git a/services/ble_profiles/cpp/cppc/src/cppc.h b/src/services/ble_profiles/cpp/cppc/src/cppc.h similarity index 100% rename from services/ble_profiles/cpp/cppc/src/cppc.h rename to src/services/ble_profiles/cpp/cppc/src/cppc.h diff --git a/services/ble_profiles/cpp/cppc/src/cppc_task.c b/src/services/ble_profiles/cpp/cppc/src/cppc_task.c similarity index 100% rename from services/ble_profiles/cpp/cppc/src/cppc_task.c rename to src/services/ble_profiles/cpp/cppc/src/cppc_task.c diff --git a/services/ble_profiles/cpp/cpps/api/cpps_task.h b/src/services/ble_profiles/cpp/cpps/api/cpps_task.h similarity index 100% rename from services/ble_profiles/cpp/cpps/api/cpps_task.h rename to src/services/ble_profiles/cpp/cpps/api/cpps_task.h diff --git a/services/ble_profiles/cpp/cpps/src/cpps.c b/src/services/ble_profiles/cpp/cpps/src/cpps.c similarity index 100% rename from services/ble_profiles/cpp/cpps/src/cpps.c rename to src/services/ble_profiles/cpp/cpps/src/cpps.c diff --git a/services/ble_profiles/cpp/cpps/src/cpps.h b/src/services/ble_profiles/cpp/cpps/src/cpps.h similarity index 100% rename from services/ble_profiles/cpp/cpps/src/cpps.h rename to src/services/ble_profiles/cpp/cpps/src/cpps.h diff --git a/services/ble_profiles/cpp/cpps/src/cpps_task.c b/src/services/ble_profiles/cpp/cpps/src/cpps_task.c similarity index 100% rename from services/ble_profiles/cpp/cpps/src/cpps_task.c rename to src/services/ble_profiles/cpp/cpps/src/cpps_task.c diff --git a/services/ble_profiles/cscp/cscp_common.h b/src/services/ble_profiles/cscp/cscp_common.h similarity index 100% rename from services/ble_profiles/cscp/cscp_common.h rename to src/services/ble_profiles/cscp/cscp_common.h diff --git a/services/ble_profiles/cscp/cscpc/api/cscpc_task.h b/src/services/ble_profiles/cscp/cscpc/api/cscpc_task.h similarity index 100% rename from services/ble_profiles/cscp/cscpc/api/cscpc_task.h rename to src/services/ble_profiles/cscp/cscpc/api/cscpc_task.h diff --git a/services/ble_profiles/cscp/cscpc/src/cscpc.c b/src/services/ble_profiles/cscp/cscpc/src/cscpc.c similarity index 100% rename from services/ble_profiles/cscp/cscpc/src/cscpc.c rename to src/services/ble_profiles/cscp/cscpc/src/cscpc.c diff --git a/services/ble_profiles/cscp/cscpc/src/cscpc.h b/src/services/ble_profiles/cscp/cscpc/src/cscpc.h similarity index 100% rename from services/ble_profiles/cscp/cscpc/src/cscpc.h rename to src/services/ble_profiles/cscp/cscpc/src/cscpc.h diff --git a/services/ble_profiles/cscp/cscpc/src/cscpc_task.c b/src/services/ble_profiles/cscp/cscpc/src/cscpc_task.c similarity index 100% rename from services/ble_profiles/cscp/cscpc/src/cscpc_task.c rename to src/services/ble_profiles/cscp/cscpc/src/cscpc_task.c diff --git a/services/ble_profiles/cscp/cscps/api/cscps_task.h b/src/services/ble_profiles/cscp/cscps/api/cscps_task.h similarity index 100% rename from services/ble_profiles/cscp/cscps/api/cscps_task.h rename to src/services/ble_profiles/cscp/cscps/api/cscps_task.h diff --git a/services/ble_profiles/cscp/cscps/src/cscps.c b/src/services/ble_profiles/cscp/cscps/src/cscps.c similarity index 100% rename from services/ble_profiles/cscp/cscps/src/cscps.c rename to src/services/ble_profiles/cscp/cscps/src/cscps.c diff --git a/services/ble_profiles/cscp/cscps/src/cscps.h b/src/services/ble_profiles/cscp/cscps/src/cscps.h similarity index 100% rename from services/ble_profiles/cscp/cscps/src/cscps.h rename to src/services/ble_profiles/cscp/cscps/src/cscps.h diff --git a/services/ble_profiles/cscp/cscps/src/cscps_task.c b/src/services/ble_profiles/cscp/cscps/src/cscps_task.c similarity index 100% rename from services/ble_profiles/cscp/cscps/src/cscps_task.c rename to src/services/ble_profiles/cscp/cscps/src/cscps_task.c diff --git a/services/ble_profiles/datapath/datapathps/api/datapathps_task.h b/src/services/ble_profiles/datapath/datapathps/api/datapathps_task.h similarity index 100% rename from services/ble_profiles/datapath/datapathps/api/datapathps_task.h rename to src/services/ble_profiles/datapath/datapathps/api/datapathps_task.h diff --git a/services/ble_profiles/datapath/datapathps/src/datapathps.c b/src/services/ble_profiles/datapath/datapathps/src/datapathps.c similarity index 100% rename from services/ble_profiles/datapath/datapathps/src/datapathps.c rename to src/services/ble_profiles/datapath/datapathps/src/datapathps.c diff --git a/services/ble_profiles/datapath/datapathps/src/datapathps.h b/src/services/ble_profiles/datapath/datapathps/src/datapathps.h similarity index 100% rename from services/ble_profiles/datapath/datapathps/src/datapathps.h rename to src/services/ble_profiles/datapath/datapathps/src/datapathps.h diff --git a/services/ble_profiles/datapath/datapathps/src/datapathps_task.c b/src/services/ble_profiles/datapath/datapathps/src/datapathps_task.c similarity index 100% rename from services/ble_profiles/datapath/datapathps/src/datapathps_task.c rename to src/services/ble_profiles/datapath/datapathps/src/datapathps_task.c diff --git a/services/ble_profiles/dis/disc/api/disc_task.h b/src/services/ble_profiles/dis/disc/api/disc_task.h similarity index 100% rename from services/ble_profiles/dis/disc/api/disc_task.h rename to src/services/ble_profiles/dis/disc/api/disc_task.h diff --git a/services/ble_profiles/dis/disc/src/disc.c b/src/services/ble_profiles/dis/disc/src/disc.c similarity index 100% rename from services/ble_profiles/dis/disc/src/disc.c rename to src/services/ble_profiles/dis/disc/src/disc.c diff --git a/services/ble_profiles/dis/disc/src/disc.h b/src/services/ble_profiles/dis/disc/src/disc.h similarity index 100% rename from services/ble_profiles/dis/disc/src/disc.h rename to src/services/ble_profiles/dis/disc/src/disc.h diff --git a/services/ble_profiles/dis/disc/src/disc_task.c b/src/services/ble_profiles/dis/disc/src/disc_task.c similarity index 100% rename from services/ble_profiles/dis/disc/src/disc_task.c rename to src/services/ble_profiles/dis/disc/src/disc_task.c diff --git a/services/ble_profiles/dis/diss/api/diss_task.h b/src/services/ble_profiles/dis/diss/api/diss_task.h similarity index 100% rename from services/ble_profiles/dis/diss/api/diss_task.h rename to src/services/ble_profiles/dis/diss/api/diss_task.h diff --git a/services/ble_profiles/dis/diss/src/diss.c b/src/services/ble_profiles/dis/diss/src/diss.c similarity index 100% rename from services/ble_profiles/dis/diss/src/diss.c rename to src/services/ble_profiles/dis/diss/src/diss.c diff --git a/services/ble_profiles/dis/diss/src/diss.h b/src/services/ble_profiles/dis/diss/src/diss.h similarity index 100% rename from services/ble_profiles/dis/diss/src/diss.h rename to src/services/ble_profiles/dis/diss/src/diss.h diff --git a/services/ble_profiles/dis/diss/src/diss_task.c b/src/services/ble_profiles/dis/diss/src/diss_task.c similarity index 100% rename from services/ble_profiles/dis/diss/src/diss_task.c rename to src/services/ble_profiles/dis/diss/src/diss_task.c diff --git a/services/ble_profiles/find/find_common.h b/src/services/ble_profiles/find/find_common.h similarity index 100% rename from services/ble_profiles/find/find_common.h rename to src/services/ble_profiles/find/find_common.h diff --git a/services/ble_profiles/find/findl/api/findl_task.h b/src/services/ble_profiles/find/findl/api/findl_task.h similarity index 100% rename from services/ble_profiles/find/findl/api/findl_task.h rename to src/services/ble_profiles/find/findl/api/findl_task.h diff --git a/services/ble_profiles/find/findl/src/findl.c b/src/services/ble_profiles/find/findl/src/findl.c similarity index 100% rename from services/ble_profiles/find/findl/src/findl.c rename to src/services/ble_profiles/find/findl/src/findl.c diff --git a/services/ble_profiles/find/findl/src/findl.h b/src/services/ble_profiles/find/findl/src/findl.h similarity index 100% rename from services/ble_profiles/find/findl/src/findl.h rename to src/services/ble_profiles/find/findl/src/findl.h diff --git a/services/ble_profiles/find/findl/src/findl_task.c b/src/services/ble_profiles/find/findl/src/findl_task.c similarity index 100% rename from services/ble_profiles/find/findl/src/findl_task.c rename to src/services/ble_profiles/find/findl/src/findl_task.c diff --git a/services/ble_profiles/find/findt/api/findt_task.h b/src/services/ble_profiles/find/findt/api/findt_task.h similarity index 100% rename from services/ble_profiles/find/findt/api/findt_task.h rename to src/services/ble_profiles/find/findt/api/findt_task.h diff --git a/services/ble_profiles/find/findt/src/findt.c b/src/services/ble_profiles/find/findt/src/findt.c similarity index 100% rename from services/ble_profiles/find/findt/src/findt.c rename to src/services/ble_profiles/find/findt/src/findt.c diff --git a/services/ble_profiles/find/findt/src/findt.h b/src/services/ble_profiles/find/findt/src/findt.h similarity index 100% rename from services/ble_profiles/find/findt/src/findt.h rename to src/services/ble_profiles/find/findt/src/findt.h diff --git a/services/ble_profiles/find/findt/src/findt_task.c b/src/services/ble_profiles/find/findt/src/findt_task.c similarity index 100% rename from services/ble_profiles/find/findt/src/findt_task.c rename to src/services/ble_profiles/find/findt/src/findt_task.c diff --git a/services/ble_profiles/gfps/Makefile b/src/services/ble_profiles/gfps/Makefile similarity index 100% rename from services/ble_profiles/gfps/Makefile rename to src/services/ble_profiles/gfps/Makefile diff --git a/services/ble_profiles/gfps/api/gfps_crypto.h b/src/services/ble_profiles/gfps/api/gfps_crypto.h similarity index 100% rename from services/ble_profiles/gfps/api/gfps_crypto.h rename to src/services/ble_profiles/gfps/api/gfps_crypto.h diff --git a/services/ble_profiles/gfps/gfps_provider/api/gfps_provider.h b/src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider.h similarity index 100% rename from services/ble_profiles/gfps/gfps_provider/api/gfps_provider.h rename to src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider.h diff --git a/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_errors.h b/src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_errors.h similarity index 100% rename from services/ble_profiles/gfps/gfps_provider/api/gfps_provider_errors.h rename to src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_errors.h diff --git a/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_task.h b/src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_task.h similarity index 100% rename from services/ble_profiles/gfps/gfps_provider/api/gfps_provider_task.h rename to src/services/ble_profiles/gfps/gfps_provider/api/gfps_provider_task.h diff --git a/services/ble_profiles/gfps/gfps_provider/src/gfps_provider.c b/src/services/ble_profiles/gfps/gfps_provider/src/gfps_provider.c similarity index 100% rename from services/ble_profiles/gfps/gfps_provider/src/gfps_provider.c rename to src/services/ble_profiles/gfps/gfps_provider/src/gfps_provider.c diff --git a/services/ble_profiles/gfps/gfps_provider/src/gfps_provider_task.c b/src/services/ble_profiles/gfps/gfps_provider/src/gfps_provider_task.c similarity index 100% rename from services/ble_profiles/gfps/gfps_provider/src/gfps_provider_task.c rename to src/services/ble_profiles/gfps/gfps_provider/src/gfps_provider_task.c diff --git a/services/ble_profiles/glp/glp_common.h b/src/services/ble_profiles/glp/glp_common.h similarity index 100% rename from services/ble_profiles/glp/glp_common.h rename to src/services/ble_profiles/glp/glp_common.h diff --git a/services/ble_profiles/glp/glpc/api/glpc_task.h b/src/services/ble_profiles/glp/glpc/api/glpc_task.h similarity index 100% rename from services/ble_profiles/glp/glpc/api/glpc_task.h rename to src/services/ble_profiles/glp/glpc/api/glpc_task.h diff --git a/services/ble_profiles/glp/glpc/src/glpc.c b/src/services/ble_profiles/glp/glpc/src/glpc.c similarity index 100% rename from services/ble_profiles/glp/glpc/src/glpc.c rename to src/services/ble_profiles/glp/glpc/src/glpc.c diff --git a/services/ble_profiles/glp/glpc/src/glpc.h b/src/services/ble_profiles/glp/glpc/src/glpc.h similarity index 100% rename from services/ble_profiles/glp/glpc/src/glpc.h rename to src/services/ble_profiles/glp/glpc/src/glpc.h diff --git a/services/ble_profiles/glp/glpc/src/glpc_task.c b/src/services/ble_profiles/glp/glpc/src/glpc_task.c similarity index 100% rename from services/ble_profiles/glp/glpc/src/glpc_task.c rename to src/services/ble_profiles/glp/glpc/src/glpc_task.c diff --git a/services/ble_profiles/glp/glps/api/glps.h b/src/services/ble_profiles/glp/glps/api/glps.h similarity index 100% rename from services/ble_profiles/glp/glps/api/glps.h rename to src/services/ble_profiles/glp/glps/api/glps.h diff --git a/services/ble_profiles/glp/glps/api/glps_task.h b/src/services/ble_profiles/glp/glps/api/glps_task.h similarity index 100% rename from services/ble_profiles/glp/glps/api/glps_task.h rename to src/services/ble_profiles/glp/glps/api/glps_task.h diff --git a/services/ble_profiles/glp/glps/src/glps.c b/src/services/ble_profiles/glp/glps/src/glps.c similarity index 100% rename from services/ble_profiles/glp/glps/src/glps.c rename to src/services/ble_profiles/glp/glps/src/glps.c diff --git a/services/ble_profiles/glp/glps/src/glps_task.c b/src/services/ble_profiles/glp/glps/src/glps_task.c similarity index 100% rename from services/ble_profiles/glp/glps/src/glps_task.c rename to src/services/ble_profiles/glp/glps/src/glps_task.c diff --git a/services/ble_profiles/hogp/hogp_common.h b/src/services/ble_profiles/hogp/hogp_common.h similarity index 100% rename from services/ble_profiles/hogp/hogp_common.h rename to src/services/ble_profiles/hogp/hogp_common.h diff --git a/services/ble_profiles/hogp/hogpbh/api/hogpbh_task.h b/src/services/ble_profiles/hogp/hogpbh/api/hogpbh_task.h similarity index 100% rename from services/ble_profiles/hogp/hogpbh/api/hogpbh_task.h rename to src/services/ble_profiles/hogp/hogpbh/api/hogpbh_task.h diff --git a/services/ble_profiles/hogp/hogpbh/src/hogpbh.c b/src/services/ble_profiles/hogp/hogpbh/src/hogpbh.c similarity index 100% rename from services/ble_profiles/hogp/hogpbh/src/hogpbh.c rename to src/services/ble_profiles/hogp/hogpbh/src/hogpbh.c diff --git a/services/ble_profiles/hogp/hogpbh/src/hogpbh.h b/src/services/ble_profiles/hogp/hogpbh/src/hogpbh.h similarity index 100% rename from services/ble_profiles/hogp/hogpbh/src/hogpbh.h rename to src/services/ble_profiles/hogp/hogpbh/src/hogpbh.h diff --git a/services/ble_profiles/hogp/hogpbh/src/hogpbh_task.c b/src/services/ble_profiles/hogp/hogpbh/src/hogpbh_task.c similarity index 100% rename from services/ble_profiles/hogp/hogpbh/src/hogpbh_task.c rename to src/services/ble_profiles/hogp/hogpbh/src/hogpbh_task.c diff --git a/services/ble_profiles/hogp/hogpd/api/hogpd_task.h b/src/services/ble_profiles/hogp/hogpd/api/hogpd_task.h similarity index 100% rename from services/ble_profiles/hogp/hogpd/api/hogpd_task.h rename to src/services/ble_profiles/hogp/hogpd/api/hogpd_task.h diff --git a/services/ble_profiles/hogp/hogpd/src/hogpd.c b/src/services/ble_profiles/hogp/hogpd/src/hogpd.c similarity index 100% rename from services/ble_profiles/hogp/hogpd/src/hogpd.c rename to src/services/ble_profiles/hogp/hogpd/src/hogpd.c diff --git a/services/ble_profiles/hogp/hogpd/src/hogpd.h b/src/services/ble_profiles/hogp/hogpd/src/hogpd.h similarity index 100% rename from services/ble_profiles/hogp/hogpd/src/hogpd.h rename to src/services/ble_profiles/hogp/hogpd/src/hogpd.h diff --git a/services/ble_profiles/hogp/hogpd/src/hogpd_task.c b/src/services/ble_profiles/hogp/hogpd/src/hogpd_task.c similarity index 100% rename from services/ble_profiles/hogp/hogpd/src/hogpd_task.c rename to src/services/ble_profiles/hogp/hogpd/src/hogpd_task.c diff --git a/services/ble_profiles/hogp/hogprh/api/hogprh_task.h b/src/services/ble_profiles/hogp/hogprh/api/hogprh_task.h similarity index 100% rename from services/ble_profiles/hogp/hogprh/api/hogprh_task.h rename to src/services/ble_profiles/hogp/hogprh/api/hogprh_task.h diff --git a/services/ble_profiles/hogp/hogprh/src/hogprh.c b/src/services/ble_profiles/hogp/hogprh/src/hogprh.c similarity index 100% rename from services/ble_profiles/hogp/hogprh/src/hogprh.c rename to src/services/ble_profiles/hogp/hogprh/src/hogprh.c diff --git a/services/ble_profiles/hogp/hogprh/src/hogprh.h b/src/services/ble_profiles/hogp/hogprh/src/hogprh.h similarity index 100% rename from services/ble_profiles/hogp/hogprh/src/hogprh.h rename to src/services/ble_profiles/hogp/hogprh/src/hogprh.h diff --git a/services/ble_profiles/hogp/hogprh/src/hogprh_task.c b/src/services/ble_profiles/hogp/hogprh/src/hogprh_task.c similarity index 100% rename from services/ble_profiles/hogp/hogprh/src/hogprh_task.c rename to src/services/ble_profiles/hogp/hogprh/src/hogprh_task.c diff --git a/services/ble_profiles/hrp/hrp_common.h b/src/services/ble_profiles/hrp/hrp_common.h similarity index 100% rename from services/ble_profiles/hrp/hrp_common.h rename to src/services/ble_profiles/hrp/hrp_common.h diff --git a/services/ble_profiles/hrp/hrpc/api/hrpc_task.h b/src/services/ble_profiles/hrp/hrpc/api/hrpc_task.h similarity index 100% rename from services/ble_profiles/hrp/hrpc/api/hrpc_task.h rename to src/services/ble_profiles/hrp/hrpc/api/hrpc_task.h diff --git a/services/ble_profiles/hrp/hrpc/src/hrpc.c b/src/services/ble_profiles/hrp/hrpc/src/hrpc.c similarity index 100% rename from services/ble_profiles/hrp/hrpc/src/hrpc.c rename to src/services/ble_profiles/hrp/hrpc/src/hrpc.c diff --git a/services/ble_profiles/hrp/hrpc/src/hrpc.h b/src/services/ble_profiles/hrp/hrpc/src/hrpc.h similarity index 100% rename from services/ble_profiles/hrp/hrpc/src/hrpc.h rename to src/services/ble_profiles/hrp/hrpc/src/hrpc.h diff --git a/services/ble_profiles/hrp/hrpc/src/hrpc_task.c b/src/services/ble_profiles/hrp/hrpc/src/hrpc_task.c similarity index 100% rename from services/ble_profiles/hrp/hrpc/src/hrpc_task.c rename to src/services/ble_profiles/hrp/hrpc/src/hrpc_task.c diff --git a/services/ble_profiles/hrp/hrps/api/hrps_task.h b/src/services/ble_profiles/hrp/hrps/api/hrps_task.h similarity index 100% rename from services/ble_profiles/hrp/hrps/api/hrps_task.h rename to src/services/ble_profiles/hrp/hrps/api/hrps_task.h diff --git a/services/ble_profiles/hrp/hrps/src/hrps.c b/src/services/ble_profiles/hrp/hrps/src/hrps.c similarity index 100% rename from services/ble_profiles/hrp/hrps/src/hrps.c rename to src/services/ble_profiles/hrp/hrps/src/hrps.c diff --git a/services/ble_profiles/hrp/hrps/src/hrps.h b/src/services/ble_profiles/hrp/hrps/src/hrps.h similarity index 100% rename from services/ble_profiles/hrp/hrps/src/hrps.h rename to src/services/ble_profiles/hrp/hrps/src/hrps.h diff --git a/services/ble_profiles/hrp/hrps/src/hrps_task.c b/src/services/ble_profiles/hrp/hrps/src/hrps_task.c similarity index 100% rename from services/ble_profiles/hrp/hrps/src/hrps_task.c rename to src/services/ble_profiles/hrp/hrps/src/hrps_task.c diff --git a/services/ble_profiles/htp/htp_common.h b/src/services/ble_profiles/htp/htp_common.h similarity index 100% rename from services/ble_profiles/htp/htp_common.h rename to src/services/ble_profiles/htp/htp_common.h diff --git a/services/ble_profiles/htp/htpc/api/htpc_task.h b/src/services/ble_profiles/htp/htpc/api/htpc_task.h similarity index 100% rename from services/ble_profiles/htp/htpc/api/htpc_task.h rename to src/services/ble_profiles/htp/htpc/api/htpc_task.h diff --git a/services/ble_profiles/htp/htpc/src/htpc.c b/src/services/ble_profiles/htp/htpc/src/htpc.c similarity index 100% rename from services/ble_profiles/htp/htpc/src/htpc.c rename to src/services/ble_profiles/htp/htpc/src/htpc.c diff --git a/services/ble_profiles/htp/htpc/src/htpc.h b/src/services/ble_profiles/htp/htpc/src/htpc.h similarity index 100% rename from services/ble_profiles/htp/htpc/src/htpc.h rename to src/services/ble_profiles/htp/htpc/src/htpc.h diff --git a/services/ble_profiles/htp/htpc/src/htpc_task.c b/src/services/ble_profiles/htp/htpc/src/htpc_task.c similarity index 100% rename from services/ble_profiles/htp/htpc/src/htpc_task.c rename to src/services/ble_profiles/htp/htpc/src/htpc_task.c diff --git a/services/ble_profiles/htp/htpt/api/htpt_task.h b/src/services/ble_profiles/htp/htpt/api/htpt_task.h similarity index 100% rename from services/ble_profiles/htp/htpt/api/htpt_task.h rename to src/services/ble_profiles/htp/htpt/api/htpt_task.h diff --git a/services/ble_profiles/htp/htpt/src/htpt.c b/src/services/ble_profiles/htp/htpt/src/htpt.c similarity index 100% rename from services/ble_profiles/htp/htpt/src/htpt.c rename to src/services/ble_profiles/htp/htpt/src/htpt.c diff --git a/services/ble_profiles/htp/htpt/src/htpt.h b/src/services/ble_profiles/htp/htpt/src/htpt.h similarity index 100% rename from services/ble_profiles/htp/htpt/src/htpt.h rename to src/services/ble_profiles/htp/htpt/src/htpt.h diff --git a/services/ble_profiles/htp/htpt/src/htpt_task.c b/src/services/ble_profiles/htp/htpt/src/htpt_task.c similarity index 100% rename from services/ble_profiles/htp/htpt/src/htpt_task.c rename to src/services/ble_profiles/htp/htpt/src/htpt_task.c diff --git a/services/ble_profiles/lan/lan_common.h b/src/services/ble_profiles/lan/lan_common.h similarity index 100% rename from services/ble_profiles/lan/lan_common.h rename to src/services/ble_profiles/lan/lan_common.h diff --git a/services/ble_profiles/lan/lanc/api/lanc_task.h b/src/services/ble_profiles/lan/lanc/api/lanc_task.h similarity index 100% rename from services/ble_profiles/lan/lanc/api/lanc_task.h rename to src/services/ble_profiles/lan/lanc/api/lanc_task.h diff --git a/services/ble_profiles/lan/lanc/src/lanc.c b/src/services/ble_profiles/lan/lanc/src/lanc.c similarity index 100% rename from services/ble_profiles/lan/lanc/src/lanc.c rename to src/services/ble_profiles/lan/lanc/src/lanc.c diff --git a/services/ble_profiles/lan/lanc/src/lanc.h b/src/services/ble_profiles/lan/lanc/src/lanc.h similarity index 100% rename from services/ble_profiles/lan/lanc/src/lanc.h rename to src/services/ble_profiles/lan/lanc/src/lanc.h diff --git a/services/ble_profiles/lan/lanc/src/lanc_task.c b/src/services/ble_profiles/lan/lanc/src/lanc_task.c similarity index 100% rename from services/ble_profiles/lan/lanc/src/lanc_task.c rename to src/services/ble_profiles/lan/lanc/src/lanc_task.c diff --git a/services/ble_profiles/lan/lans/api/lans_task.h b/src/services/ble_profiles/lan/lans/api/lans_task.h similarity index 100% rename from services/ble_profiles/lan/lans/api/lans_task.h rename to src/services/ble_profiles/lan/lans/api/lans_task.h diff --git a/services/ble_profiles/lan/lans/src/lans.c b/src/services/ble_profiles/lan/lans/src/lans.c similarity index 100% rename from services/ble_profiles/lan/lans/src/lans.c rename to src/services/ble_profiles/lan/lans/src/lans.c diff --git a/services/ble_profiles/lan/lans/src/lans.h b/src/services/ble_profiles/lan/lans/src/lans.h similarity index 100% rename from services/ble_profiles/lan/lans/src/lans.h rename to src/services/ble_profiles/lan/lans/src/lans.h diff --git a/services/ble_profiles/lan/lans/src/lans_task.c b/src/services/ble_profiles/lan/lans/src/lans_task.c similarity index 100% rename from services/ble_profiles/lan/lans/src/lans_task.c rename to src/services/ble_profiles/lan/lans/src/lans_task.c diff --git a/services/ble_profiles/ota/ota.c b/src/services/ble_profiles/ota/ota.c similarity index 100% rename from services/ble_profiles/ota/ota.c rename to src/services/ble_profiles/ota/ota.c diff --git a/services/ble_profiles/ota/ota.h b/src/services/ble_profiles/ota/ota.h similarity index 100% rename from services/ble_profiles/ota/ota.h rename to src/services/ble_profiles/ota/ota.h diff --git a/services/ble_profiles/ota/ota_task.c b/src/services/ble_profiles/ota/ota_task.c similarity index 100% rename from services/ble_profiles/ota/ota_task.c rename to src/services/ble_profiles/ota/ota_task.c diff --git a/services/ble_profiles/ota/ota_task.h b/src/services/ble_profiles/ota/ota_task.h similarity index 100% rename from services/ble_profiles/ota/ota_task.h rename to src/services/ble_profiles/ota/ota_task.h diff --git a/services/ble_profiles/pasp/pasp_common.h b/src/services/ble_profiles/pasp/pasp_common.h similarity index 100% rename from services/ble_profiles/pasp/pasp_common.h rename to src/services/ble_profiles/pasp/pasp_common.h diff --git a/services/ble_profiles/pasp/paspc/api/paspc_task.h b/src/services/ble_profiles/pasp/paspc/api/paspc_task.h similarity index 100% rename from services/ble_profiles/pasp/paspc/api/paspc_task.h rename to src/services/ble_profiles/pasp/paspc/api/paspc_task.h diff --git a/services/ble_profiles/pasp/paspc/src/paspc.c b/src/services/ble_profiles/pasp/paspc/src/paspc.c similarity index 100% rename from services/ble_profiles/pasp/paspc/src/paspc.c rename to src/services/ble_profiles/pasp/paspc/src/paspc.c diff --git a/services/ble_profiles/pasp/paspc/src/paspc.h b/src/services/ble_profiles/pasp/paspc/src/paspc.h similarity index 100% rename from services/ble_profiles/pasp/paspc/src/paspc.h rename to src/services/ble_profiles/pasp/paspc/src/paspc.h diff --git a/services/ble_profiles/pasp/paspc/src/paspc_task.c b/src/services/ble_profiles/pasp/paspc/src/paspc_task.c similarity index 100% rename from services/ble_profiles/pasp/paspc/src/paspc_task.c rename to src/services/ble_profiles/pasp/paspc/src/paspc_task.c diff --git a/services/ble_profiles/pasp/pasps/api/pasps_task.h b/src/services/ble_profiles/pasp/pasps/api/pasps_task.h similarity index 100% rename from services/ble_profiles/pasp/pasps/api/pasps_task.h rename to src/services/ble_profiles/pasp/pasps/api/pasps_task.h diff --git a/services/ble_profiles/pasp/pasps/src/pasps.c b/src/services/ble_profiles/pasp/pasps/src/pasps.c similarity index 100% rename from services/ble_profiles/pasp/pasps/src/pasps.c rename to src/services/ble_profiles/pasp/pasps/src/pasps.c diff --git a/services/ble_profiles/pasp/pasps/src/pasps.h b/src/services/ble_profiles/pasp/pasps/src/pasps.h similarity index 100% rename from services/ble_profiles/pasp/pasps/src/pasps.h rename to src/services/ble_profiles/pasp/pasps/src/pasps.h diff --git a/services/ble_profiles/pasp/pasps/src/pasps_task.c b/src/services/ble_profiles/pasp/pasps/src/pasps_task.c similarity index 100% rename from services/ble_profiles/pasp/pasps/src/pasps_task.c rename to src/services/ble_profiles/pasp/pasps/src/pasps_task.c diff --git a/services/ble_profiles/prf/prf.c b/src/services/ble_profiles/prf/prf.c similarity index 100% rename from services/ble_profiles/prf/prf.c rename to src/services/ble_profiles/prf/prf.c diff --git a/services/ble_profiles/prf/prf_utils.c b/src/services/ble_profiles/prf/prf_utils.c similarity index 100% rename from services/ble_profiles/prf/prf_utils.c rename to src/services/ble_profiles/prf/prf_utils.c diff --git a/services/ble_profiles/prf/prf_utils_128.c b/src/services/ble_profiles/prf/prf_utils_128.c similarity index 100% rename from services/ble_profiles/prf/prf_utils_128.c rename to src/services/ble_profiles/prf/prf_utils_128.c diff --git a/services/ble_profiles/prox/proxm/api/proxm_task.h b/src/services/ble_profiles/prox/proxm/api/proxm_task.h similarity index 100% rename from services/ble_profiles/prox/proxm/api/proxm_task.h rename to src/services/ble_profiles/prox/proxm/api/proxm_task.h diff --git a/services/ble_profiles/prox/proxm/src/proxm.c b/src/services/ble_profiles/prox/proxm/src/proxm.c similarity index 100% rename from services/ble_profiles/prox/proxm/src/proxm.c rename to src/services/ble_profiles/prox/proxm/src/proxm.c diff --git a/services/ble_profiles/prox/proxm/src/proxm.h b/src/services/ble_profiles/prox/proxm/src/proxm.h similarity index 100% rename from services/ble_profiles/prox/proxm/src/proxm.h rename to src/services/ble_profiles/prox/proxm/src/proxm.h diff --git a/services/ble_profiles/prox/proxm/src/proxm_task.c b/src/services/ble_profiles/prox/proxm/src/proxm_task.c similarity index 100% rename from services/ble_profiles/prox/proxm/src/proxm_task.c rename to src/services/ble_profiles/prox/proxm/src/proxm_task.c diff --git a/services/ble_profiles/prox/proxr/api/proxr_task.h b/src/services/ble_profiles/prox/proxr/api/proxr_task.h similarity index 100% rename from services/ble_profiles/prox/proxr/api/proxr_task.h rename to src/services/ble_profiles/prox/proxr/api/proxr_task.h diff --git a/services/ble_profiles/prox/proxr/src/proxr.c b/src/services/ble_profiles/prox/proxr/src/proxr.c similarity index 100% rename from services/ble_profiles/prox/proxr/src/proxr.c rename to src/services/ble_profiles/prox/proxr/src/proxr.c diff --git a/services/ble_profiles/prox/proxr/src/proxr.h b/src/services/ble_profiles/prox/proxr/src/proxr.h similarity index 100% rename from services/ble_profiles/prox/proxr/src/proxr.h rename to src/services/ble_profiles/prox/proxr/src/proxr.h diff --git a/services/ble_profiles/prox/proxr/src/proxr_task.c b/src/services/ble_profiles/prox/proxr/src/proxr_task.c similarity index 100% rename from services/ble_profiles/prox/proxr/src/proxr_task.c rename to src/services/ble_profiles/prox/proxr/src/proxr_task.c diff --git a/services/ble_profiles/rscp/rscp_common.h b/src/services/ble_profiles/rscp/rscp_common.h similarity index 100% rename from services/ble_profiles/rscp/rscp_common.h rename to src/services/ble_profiles/rscp/rscp_common.h diff --git a/services/ble_profiles/rscp/rscpc/api/rscpc_task.h b/src/services/ble_profiles/rscp/rscpc/api/rscpc_task.h similarity index 100% rename from services/ble_profiles/rscp/rscpc/api/rscpc_task.h rename to src/services/ble_profiles/rscp/rscpc/api/rscpc_task.h diff --git a/services/ble_profiles/rscp/rscpc/src/rscpc.c b/src/services/ble_profiles/rscp/rscpc/src/rscpc.c similarity index 100% rename from services/ble_profiles/rscp/rscpc/src/rscpc.c rename to src/services/ble_profiles/rscp/rscpc/src/rscpc.c diff --git a/services/ble_profiles/rscp/rscpc/src/rscpc.h b/src/services/ble_profiles/rscp/rscpc/src/rscpc.h similarity index 100% rename from services/ble_profiles/rscp/rscpc/src/rscpc.h rename to src/services/ble_profiles/rscp/rscpc/src/rscpc.h diff --git a/services/ble_profiles/rscp/rscpc/src/rscpc_task.c b/src/services/ble_profiles/rscp/rscpc/src/rscpc_task.c similarity index 100% rename from services/ble_profiles/rscp/rscpc/src/rscpc_task.c rename to src/services/ble_profiles/rscp/rscpc/src/rscpc_task.c diff --git a/services/ble_profiles/rscp/rscps/api/rscps_task.h b/src/services/ble_profiles/rscp/rscps/api/rscps_task.h similarity index 100% rename from services/ble_profiles/rscp/rscps/api/rscps_task.h rename to src/services/ble_profiles/rscp/rscps/api/rscps_task.h diff --git a/services/ble_profiles/rscp/rscps/src/rscps.c b/src/services/ble_profiles/rscp/rscps/src/rscps.c similarity index 100% rename from services/ble_profiles/rscp/rscps/src/rscps.c rename to src/services/ble_profiles/rscp/rscps/src/rscps.c diff --git a/services/ble_profiles/rscp/rscps/src/rscps.h b/src/services/ble_profiles/rscp/rscps/src/rscps.h similarity index 100% rename from services/ble_profiles/rscp/rscps/src/rscps.h rename to src/services/ble_profiles/rscp/rscps/src/rscps.h diff --git a/services/ble_profiles/rscp/rscps/src/rscps_task.c b/src/services/ble_profiles/rscp/rscps/src/rscps_task.c similarity index 100% rename from services/ble_profiles/rscp/rscps/src/rscps_task.c rename to src/services/ble_profiles/rscp/rscps/src/rscps_task.c diff --git a/services/ble_profiles/tip/tip_common.h b/src/services/ble_profiles/tip/tip_common.h similarity index 100% rename from services/ble_profiles/tip/tip_common.h rename to src/services/ble_profiles/tip/tip_common.h diff --git a/services/ble_profiles/tip/tipc/api/tipc_task.h b/src/services/ble_profiles/tip/tipc/api/tipc_task.h similarity index 100% rename from services/ble_profiles/tip/tipc/api/tipc_task.h rename to src/services/ble_profiles/tip/tipc/api/tipc_task.h diff --git a/services/ble_profiles/tip/tipc/src/tipc.c b/src/services/ble_profiles/tip/tipc/src/tipc.c similarity index 100% rename from services/ble_profiles/tip/tipc/src/tipc.c rename to src/services/ble_profiles/tip/tipc/src/tipc.c diff --git a/services/ble_profiles/tip/tipc/src/tipc.h b/src/services/ble_profiles/tip/tipc/src/tipc.h similarity index 100% rename from services/ble_profiles/tip/tipc/src/tipc.h rename to src/services/ble_profiles/tip/tipc/src/tipc.h diff --git a/services/ble_profiles/tip/tipc/src/tipc_task.c b/src/services/ble_profiles/tip/tipc/src/tipc_task.c similarity index 100% rename from services/ble_profiles/tip/tipc/src/tipc_task.c rename to src/services/ble_profiles/tip/tipc/src/tipc_task.c diff --git a/services/ble_profiles/tip/tips/api/tips_task.h b/src/services/ble_profiles/tip/tips/api/tips_task.h similarity index 100% rename from services/ble_profiles/tip/tips/api/tips_task.h rename to src/services/ble_profiles/tip/tips/api/tips_task.h diff --git a/services/ble_profiles/tip/tips/src/tips.c b/src/services/ble_profiles/tip/tips/src/tips.c similarity index 100% rename from services/ble_profiles/tip/tips/src/tips.c rename to src/services/ble_profiles/tip/tips/src/tips.c diff --git a/services/ble_profiles/tip/tips/src/tips.h b/src/services/ble_profiles/tip/tips/src/tips.h similarity index 100% rename from services/ble_profiles/tip/tips/src/tips.h rename to src/services/ble_profiles/tip/tips/src/tips.h diff --git a/services/ble_profiles/tip/tips/src/tips_task.c b/src/services/ble_profiles/tip/tips/src/tips_task.c similarity index 100% rename from services/ble_profiles/tip/tips/src/tips_task.c rename to src/services/ble_profiles/tip/tips/src/tips_task.c diff --git a/services/ble_profiles/tota/tota_ble.c b/src/services/ble_profiles/tota/tota_ble.c similarity index 100% rename from services/ble_profiles/tota/tota_ble.c rename to src/services/ble_profiles/tota/tota_ble.c diff --git a/services/ble_profiles/tota/tota_ble.h b/src/services/ble_profiles/tota/tota_ble.h similarity index 100% rename from services/ble_profiles/tota/tota_ble.h rename to src/services/ble_profiles/tota/tota_ble.h diff --git a/services/ble_profiles/tota/tota_task.c b/src/services/ble_profiles/tota/tota_task.c similarity index 100% rename from services/ble_profiles/tota/tota_task.c rename to src/services/ble_profiles/tota/tota_task.c diff --git a/services/ble_profiles/tota/tota_task.h b/src/services/ble_profiles/tota/tota_task.h similarity index 100% rename from services/ble_profiles/tota/tota_task.h rename to src/services/ble_profiles/tota/tota_task.h diff --git a/services/ble_stack/Makefile b/src/services/ble_stack/Makefile similarity index 100% rename from services/ble_stack/Makefile rename to src/services/ble_stack/Makefile diff --git a/services/ble_stack/ble_ip/arch.h b/src/services/ble_stack/ble_ip/arch.h similarity index 100% rename from services/ble_stack/ble_ip/arch.h rename to src/services/ble_stack/ble_ip/arch.h diff --git a/services/ble_stack/ble_ip/besble.h b/src/services/ble_stack/ble_ip/besble.h similarity index 100% rename from services/ble_stack/ble_ip/besble.h rename to src/services/ble_stack/ble_ip/besble.h diff --git a/services/ble_stack/ble_ip/compiler.h b/src/services/ble_stack/ble_ip/compiler.h similarity index 100% rename from services/ble_stack/ble_ip/compiler.h rename to src/services/ble_stack/ble_ip/compiler.h diff --git a/services/ble_stack/ble_ip/rwapp_config.h b/src/services/ble_stack/ble_ip/rwapp_config.h similarity index 100% rename from services/ble_stack/ble_ip/rwapp_config.h rename to src/services/ble_stack/ble_ip/rwapp_config.h diff --git a/services/ble_stack/ble_ip/rwble_hl.h b/src/services/ble_stack/ble_ip/rwble_hl.h similarity index 100% rename from services/ble_stack/ble_ip/rwble_hl.h rename to src/services/ble_stack/ble_ip/rwble_hl.h diff --git a/services/ble_stack/ble_ip/rwble_hl_config.h b/src/services/ble_stack/ble_ip/rwble_hl_config.h similarity index 100% rename from services/ble_stack/ble_ip/rwble_hl_config.h rename to src/services/ble_stack/ble_ip/rwble_hl_config.h diff --git a/services/ble_stack/ble_ip/rwip.h b/src/services/ble_stack/ble_ip/rwip.h similarity index 100% rename from services/ble_stack/ble_ip/rwip.h rename to src/services/ble_stack/ble_ip/rwip.h diff --git a/services/ble_stack/ble_ip/rwip_config.h b/src/services/ble_stack/ble_ip/rwip_config.h similarity index 100% rename from services/ble_stack/ble_ip/rwip_config.h rename to src/services/ble_stack/ble_ip/rwip_config.h diff --git a/services/ble_stack/ble_ip/rwip_task.h b/src/services/ble_stack/ble_ip/rwip_task.h similarity index 100% rename from services/ble_stack/ble_ip/rwip_task.h rename to src/services/ble_stack/ble_ip/rwip_task.h diff --git a/services/ble_stack/ble_ip/rwprf_config.h b/src/services/ble_stack/ble_ip/rwprf_config.h similarity index 100% rename from services/ble_stack/ble_ip/rwprf_config.h rename to src/services/ble_stack/ble_ip/rwprf_config.h diff --git a/services/ble_stack/common/api/co_bt.h b/src/services/ble_stack/common/api/co_bt.h similarity index 100% rename from services/ble_stack/common/api/co_bt.h rename to src/services/ble_stack/common/api/co_bt.h diff --git a/services/ble_stack/common/api/co_bt_defines.h b/src/services/ble_stack/common/api/co_bt_defines.h similarity index 100% rename from services/ble_stack/common/api/co_bt_defines.h rename to src/services/ble_stack/common/api/co_bt_defines.h diff --git a/services/ble_stack/common/api/co_endian.h b/src/services/ble_stack/common/api/co_endian.h similarity index 100% rename from services/ble_stack/common/api/co_endian.h rename to src/services/ble_stack/common/api/co_endian.h diff --git a/services/ble_stack/common/api/co_error.h b/src/services/ble_stack/common/api/co_error.h similarity index 100% rename from services/ble_stack/common/api/co_error.h rename to src/services/ble_stack/common/api/co_error.h diff --git a/services/ble_stack/common/api/co_hci.h b/src/services/ble_stack/common/api/co_hci.h similarity index 100% rename from services/ble_stack/common/api/co_hci.h rename to src/services/ble_stack/common/api/co_hci.h diff --git a/services/ble_stack/common/api/co_list.h b/src/services/ble_stack/common/api/co_list.h similarity index 100% rename from services/ble_stack/common/api/co_list.h rename to src/services/ble_stack/common/api/co_list.h diff --git a/services/ble_stack/common/api/co_llcp.h b/src/services/ble_stack/common/api/co_llcp.h similarity index 100% rename from services/ble_stack/common/api/co_llcp.h rename to src/services/ble_stack/common/api/co_llcp.h diff --git a/services/ble_stack/common/api/co_lmp.h b/src/services/ble_stack/common/api/co_lmp.h similarity index 100% rename from services/ble_stack/common/api/co_lmp.h rename to src/services/ble_stack/common/api/co_lmp.h diff --git a/services/ble_stack/common/api/co_math.h b/src/services/ble_stack/common/api/co_math.h similarity index 100% rename from services/ble_stack/common/api/co_math.h rename to src/services/ble_stack/common/api/co_math.h diff --git a/services/ble_stack/common/api/co_utils.h b/src/services/ble_stack/common/api/co_utils.h similarity index 100% rename from services/ble_stack/common/api/co_utils.h rename to src/services/ble_stack/common/api/co_utils.h diff --git a/services/ble_stack/common/api/co_version.h b/src/services/ble_stack/common/api/co_version.h similarity index 100% rename from services/ble_stack/common/api/co_version.h rename to src/services/ble_stack/common/api/co_version.h diff --git a/services/ble_stack/common/api/lePhone_rw_ble_error.txt b/src/services/ble_stack/common/api/lePhone_rw_ble_error.txt similarity index 100% rename from services/ble_stack/common/api/lePhone_rw_ble_error.txt rename to src/services/ble_stack/common/api/lePhone_rw_ble_error.txt diff --git a/services/ble_stack/dbg/api/dbg.h b/src/services/ble_stack/dbg/api/dbg.h similarity index 100% rename from services/ble_stack/dbg/api/dbg.h rename to src/services/ble_stack/dbg/api/dbg.h diff --git a/services/ble_stack/dbg/api/dbg_mwsgen.h b/src/services/ble_stack/dbg/api/dbg_mwsgen.h similarity index 100% rename from services/ble_stack/dbg/api/dbg_mwsgen.h rename to src/services/ble_stack/dbg/api/dbg_mwsgen.h diff --git a/services/ble_stack/dbg/api/dbg_swdiag.h b/src/services/ble_stack/dbg/api/dbg_swdiag.h similarity index 100% rename from services/ble_stack/dbg/api/dbg_swdiag.h rename to src/services/ble_stack/dbg/api/dbg_swdiag.h diff --git a/services/ble_stack/dbg/api/dbg_trc.h b/src/services/ble_stack/dbg/api/dbg_trc.h similarity index 100% rename from services/ble_stack/dbg/api/dbg_trc.h rename to src/services/ble_stack/dbg/api/dbg_trc.h diff --git a/services/ble_stack/dbg/api/dbg_trc_config.h b/src/services/ble_stack/dbg/api/dbg_trc_config.h similarity index 100% rename from services/ble_stack/dbg/api/dbg_trc_config.h rename to src/services/ble_stack/dbg/api/dbg_trc_config.h diff --git a/services/ble_stack/dbg/src/dbg_trc_int.h b/src/services/ble_stack/dbg/src/dbg_trc_int.h similarity index 100% rename from services/ble_stack/dbg/src/dbg_trc_int.h rename to src/services/ble_stack/dbg/src/dbg_trc_int.h diff --git a/services/ble_stack/hci/api/hci_ble.h b/src/services/ble_stack/hci/api/hci_ble.h similarity index 100% rename from services/ble_stack/hci/api/hci_ble.h rename to src/services/ble_stack/hci/api/hci_ble.h diff --git a/services/ble_stack/hci/src/hci_int.h b/src/services/ble_stack/hci/src/hci_int.h similarity index 100% rename from services/ble_stack/hci/src/hci_int.h rename to src/services/ble_stack/hci/src/hci_int.h diff --git a/services/ble_stack/hl/api/att.h b/src/services/ble_stack/hl/api/att.h similarity index 100% rename from services/ble_stack/hl/api/att.h rename to src/services/ble_stack/hl/api/att.h diff --git a/services/ble_stack/hl/api/gap.h b/src/services/ble_stack/hl/api/gap.h similarity index 100% rename from services/ble_stack/hl/api/gap.h rename to src/services/ble_stack/hl/api/gap.h diff --git a/services/ble_stack/hl/api/gapc_task.h b/src/services/ble_stack/hl/api/gapc_task.h similarity index 100% rename from services/ble_stack/hl/api/gapc_task.h rename to src/services/ble_stack/hl/api/gapc_task.h diff --git a/services/ble_stack/hl/api/gapm_task.h b/src/services/ble_stack/hl/api/gapm_task.h similarity index 100% rename from services/ble_stack/hl/api/gapm_task.h rename to src/services/ble_stack/hl/api/gapm_task.h diff --git a/services/ble_stack/hl/api/gattc_task.h b/src/services/ble_stack/hl/api/gattc_task.h similarity index 100% rename from services/ble_stack/hl/api/gattc_task.h rename to src/services/ble_stack/hl/api/gattc_task.h diff --git a/services/ble_stack/hl/api/gattm_task.h b/src/services/ble_stack/hl/api/gattm_task.h similarity index 100% rename from services/ble_stack/hl/api/gattm_task.h rename to src/services/ble_stack/hl/api/gattm_task.h diff --git a/services/ble_stack/hl/api/l2cc_task.h b/src/services/ble_stack/hl/api/l2cc_task.h similarity index 100% rename from services/ble_stack/hl/api/l2cc_task.h rename to src/services/ble_stack/hl/api/l2cc_task.h diff --git a/services/ble_stack/hl/api/prf_types.h b/src/services/ble_stack/hl/api/prf_types.h similarity index 100% rename from services/ble_stack/hl/api/prf_types.h rename to src/services/ble_stack/hl/api/prf_types.h diff --git a/services/ble_stack/hl/api/rwble_hl_error.h b/src/services/ble_stack/hl/api/rwble_hl_error.h similarity index 100% rename from services/ble_stack/hl/api/rwble_hl_error.h rename to src/services/ble_stack/hl/api/rwble_hl_error.h diff --git a/services/ble_stack/hl/inc/attm.h b/src/services/ble_stack/hl/inc/attm.h similarity index 100% rename from services/ble_stack/hl/inc/attm.h rename to src/services/ble_stack/hl/inc/attm.h diff --git a/services/ble_stack/hl/inc/gapc.h b/src/services/ble_stack/hl/inc/gapc.h similarity index 100% rename from services/ble_stack/hl/inc/gapc.h rename to src/services/ble_stack/hl/inc/gapc.h diff --git a/services/ble_stack/hl/inc/gapm.h b/src/services/ble_stack/hl/inc/gapm.h similarity index 100% rename from services/ble_stack/hl/inc/gapm.h rename to src/services/ble_stack/hl/inc/gapm.h diff --git a/services/ble_stack/hl/inc/gattc.h b/src/services/ble_stack/hl/inc/gattc.h similarity index 100% rename from services/ble_stack/hl/inc/gattc.h rename to src/services/ble_stack/hl/inc/gattc.h diff --git a/services/ble_stack/hl/inc/gattm.h b/src/services/ble_stack/hl/inc/gattm.h similarity index 100% rename from services/ble_stack/hl/inc/gattm.h rename to src/services/ble_stack/hl/inc/gattm.h diff --git a/services/ble_stack/hl/inc/l2cc.h b/src/services/ble_stack/hl/inc/l2cc.h similarity index 100% rename from services/ble_stack/hl/inc/l2cc.h rename to src/services/ble_stack/hl/inc/l2cc.h diff --git a/services/ble_stack/hl/inc/l2cc_pdu.h b/src/services/ble_stack/hl/inc/l2cc_pdu.h similarity index 100% rename from services/ble_stack/hl/inc/l2cc_pdu.h rename to src/services/ble_stack/hl/inc/l2cc_pdu.h diff --git a/services/ble_stack/hl/inc/l2cm.h b/src/services/ble_stack/hl/inc/l2cm.h similarity index 100% rename from services/ble_stack/hl/inc/l2cm.h rename to src/services/ble_stack/hl/inc/l2cm.h diff --git a/services/ble_stack/hl/inc/prf.h b/src/services/ble_stack/hl/inc/prf.h similarity index 100% rename from services/ble_stack/hl/inc/prf.h rename to src/services/ble_stack/hl/inc/prf.h diff --git a/services/ble_stack/hl/inc/prf_utils.h b/src/services/ble_stack/hl/inc/prf_utils.h similarity index 100% rename from services/ble_stack/hl/inc/prf_utils.h rename to src/services/ble_stack/hl/inc/prf_utils.h diff --git a/services/ble_stack/hl/inc/prf_utils_128.h b/src/services/ble_stack/hl/inc/prf_utils_128.h similarity index 100% rename from services/ble_stack/hl/inc/prf_utils_128.h rename to src/services/ble_stack/hl/inc/prf_utils_128.h diff --git a/services/ble_stack/hl/inc/smpc.h b/src/services/ble_stack/hl/inc/smpc.h similarity index 100% rename from services/ble_stack/hl/inc/smpc.h rename to src/services/ble_stack/hl/inc/smpc.h diff --git a/services/ble_stack/hl/src/gap/gapc/gapc_int.h b/src/services/ble_stack/hl/src/gap/gapc/gapc_int.h similarity index 100% rename from services/ble_stack/hl/src/gap/gapc/gapc_int.h rename to src/services/ble_stack/hl/src/gap/gapc/gapc_int.h diff --git a/services/ble_stack/hl/src/gap/gapc/gapc_sig.h b/src/services/ble_stack/hl/src/gap/gapc/gapc_sig.h similarity index 100% rename from services/ble_stack/hl/src/gap/gapc/gapc_sig.h rename to src/services/ble_stack/hl/src/gap/gapc/gapc_sig.h diff --git a/services/ble_stack/hl/src/gap/gapm/gapm_int.h b/src/services/ble_stack/hl/src/gap/gapm/gapm_int.h similarity index 100% rename from services/ble_stack/hl/src/gap/gapm/gapm_int.h rename to src/services/ble_stack/hl/src/gap/gapm/gapm_int.h diff --git a/services/ble_stack/hl/src/gap/smp_common.h b/src/services/ble_stack/hl/src/gap/smp_common.h similarity index 100% rename from services/ble_stack/hl/src/gap/smp_common.h rename to src/services/ble_stack/hl/src/gap/smp_common.h diff --git a/services/ble_stack/hl/src/gap/smpc/smpc_api.h b/src/services/ble_stack/hl/src/gap/smpc/smpc_api.h similarity index 100% rename from services/ble_stack/hl/src/gap/smpc/smpc_api.h rename to src/services/ble_stack/hl/src/gap/smpc/smpc_api.h diff --git a/services/ble_stack/hl/src/gap/smpc/smpc_crypto.h b/src/services/ble_stack/hl/src/gap/smpc/smpc_crypto.h similarity index 100% rename from services/ble_stack/hl/src/gap/smpc/smpc_crypto.h rename to src/services/ble_stack/hl/src/gap/smpc/smpc_crypto.h diff --git a/services/ble_stack/hl/src/gap/smpc/smpc_int.h b/src/services/ble_stack/hl/src/gap/smpc/smpc_int.h similarity index 100% rename from services/ble_stack/hl/src/gap/smpc/smpc_int.h rename to src/services/ble_stack/hl/src/gap/smpc/smpc_int.h diff --git a/services/ble_stack/hl/src/gap/smpc/smpc_util.h b/src/services/ble_stack/hl/src/gap/smpc/smpc_util.h similarity index 100% rename from services/ble_stack/hl/src/gap/smpc/smpc_util.h rename to src/services/ble_stack/hl/src/gap/smpc/smpc_util.h diff --git a/services/ble_stack/hl/src/gatt/attc/attc.h b/src/services/ble_stack/hl/src/gatt/attc/attc.h similarity index 100% rename from services/ble_stack/hl/src/gatt/attc/attc.h rename to src/services/ble_stack/hl/src/gatt/attc/attc.h diff --git a/services/ble_stack/hl/src/gatt/attm/attm_db.h b/src/services/ble_stack/hl/src/gatt/attm/attm_db.h similarity index 100% rename from services/ble_stack/hl/src/gatt/attm/attm_db.h rename to src/services/ble_stack/hl/src/gatt/attm/attm_db.h diff --git a/services/ble_stack/hl/src/gatt/atts/atts.h b/src/services/ble_stack/hl/src/gatt/atts/atts.h similarity index 100% rename from services/ble_stack/hl/src/gatt/atts/atts.h rename to src/services/ble_stack/hl/src/gatt/atts/atts.h diff --git a/services/ble_stack/hl/src/gatt/gatt.h b/src/services/ble_stack/hl/src/gatt/gatt.h similarity index 100% rename from services/ble_stack/hl/src/gatt/gatt.h rename to src/services/ble_stack/hl/src/gatt/gatt.h diff --git a/services/ble_stack/hl/src/gatt/gattc/gattc_int.h b/src/services/ble_stack/hl/src/gatt/gattc/gattc_int.h similarity index 100% rename from services/ble_stack/hl/src/gatt/gattc/gattc_int.h rename to src/services/ble_stack/hl/src/gatt/gattc/gattc_int.h diff --git a/services/ble_stack/hl/src/gatt/gattm/gattm_int.h b/src/services/ble_stack/hl/src/gatt/gattm/gattm_int.h similarity index 100% rename from services/ble_stack/hl/src/gatt/gattm/gattm_int.h rename to src/services/ble_stack/hl/src/gatt/gattm/gattm_int.h diff --git a/services/ble_stack/hl/src/l2c/l2cc/l2cc_int.h b/src/services/ble_stack/hl/src/l2c/l2cc/l2cc_int.h similarity index 100% rename from services/ble_stack/hl/src/l2c/l2cc/l2cc_int.h rename to src/services/ble_stack/hl/src/l2c/l2cc/l2cc_int.h diff --git a/services/ble_stack/hl/src/l2c/l2cc/l2cc_lecb.h b/src/services/ble_stack/hl/src/l2c/l2cc/l2cc_lecb.h similarity index 100% rename from services/ble_stack/hl/src/l2c/l2cc/l2cc_lecb.h rename to src/services/ble_stack/hl/src/l2c/l2cc/l2cc_lecb.h diff --git a/services/ble_stack/hl/src/l2c/l2cc/l2cc_pdu_int.h b/src/services/ble_stack/hl/src/l2c/l2cc/l2cc_pdu_int.h similarity index 100% rename from services/ble_stack/hl/src/l2c/l2cc/l2cc_pdu_int.h rename to src/services/ble_stack/hl/src/l2c/l2cc/l2cc_pdu_int.h diff --git a/services/ble_stack/hl/src/l2c/l2cc/l2cc_sig.h b/src/services/ble_stack/hl/src/l2c/l2cc/l2cc_sig.h similarity index 100% rename from services/ble_stack/hl/src/l2c/l2cc/l2cc_sig.h rename to src/services/ble_stack/hl/src/l2c/l2cc/l2cc_sig.h diff --git a/services/ble_stack/hl/src/l2c/l2cm/l2cm_int.h b/src/services/ble_stack/hl/src/l2c/l2cm/l2cm_int.h similarity index 100% rename from services/ble_stack/hl/src/l2c/l2cm/l2cm_int.h rename to src/services/ble_stack/hl/src/l2c/l2cm/l2cm_int.h diff --git a/services/ble_stack/ke/api/ke.h b/src/services/ble_stack/ke/api/ke.h similarity index 100% rename from services/ble_stack/ke/api/ke.h rename to src/services/ble_stack/ke/api/ke.h diff --git a/services/ble_stack/ke/api/ke_event.h b/src/services/ble_stack/ke/api/ke_event.h similarity index 100% rename from services/ble_stack/ke/api/ke_event.h rename to src/services/ble_stack/ke/api/ke_event.h diff --git a/services/ble_stack/ke/api/ke_mem.h b/src/services/ble_stack/ke/api/ke_mem.h similarity index 100% rename from services/ble_stack/ke/api/ke_mem.h rename to src/services/ble_stack/ke/api/ke_mem.h diff --git a/services/ble_stack/ke/api/ke_msg.h b/src/services/ble_stack/ke/api/ke_msg.h similarity index 100% rename from services/ble_stack/ke/api/ke_msg.h rename to src/services/ble_stack/ke/api/ke_msg.h diff --git a/services/ble_stack/ke/api/ke_task.h b/src/services/ble_stack/ke/api/ke_task.h similarity index 100% rename from services/ble_stack/ke/api/ke_task.h rename to src/services/ble_stack/ke/api/ke_task.h diff --git a/services/ble_stack/ke/api/ke_timer.h b/src/services/ble_stack/ke/api/ke_timer.h similarity index 100% rename from services/ble_stack/ke/api/ke_timer.h rename to src/services/ble_stack/ke/api/ke_timer.h diff --git a/services/ble_stack/ke/src/ke_env.h b/src/services/ble_stack/ke/src/ke_env.h similarity index 100% rename from services/ble_stack/ke/src/ke_env.h rename to src/services/ble_stack/ke/src/ke_env.h diff --git a/services/ble_stack/ke/src/ke_queue.h b/src/services/ble_stack/ke/src/ke_queue.h similarity index 100% rename from services/ble_stack/ke/src/ke_queue.h rename to src/services/ble_stack/ke/src/ke_queue.h diff --git a/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a b/src/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a similarity index 100% rename from services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a rename to src/services/ble_stack/lib/best2300p_libble_stack_sbc_enc.a diff --git a/services/bridge/Makefile b/src/services/bridge/Makefile similarity index 100% rename from services/bridge/Makefile rename to src/services/bridge/Makefile diff --git a/services/bridge/bridge.h b/src/services/bridge/bridge.h similarity index 100% rename from services/bridge/bridge.h rename to src/services/bridge/bridge.h diff --git a/services/bridge/lib/best2300p_libbridge_sbc_enc.a b/src/services/bridge/lib/best2300p_libbridge_sbc_enc.a similarity index 100% rename from services/bridge/lib/best2300p_libbridge_sbc_enc.a rename to src/services/bridge/lib/best2300p_libbridge_sbc_enc.a diff --git a/services/bt_app/Makefile b/src/services/bt_app/Makefile similarity index 100% rename from services/bt_app/Makefile rename to src/services/bt_app/Makefile diff --git a/services/bt_app/a2dp_codecs/Makefile b/src/services/bt_app/a2dp_codecs/Makefile similarity index 100% rename from services/bt_app/a2dp_codecs/Makefile rename to src/services/bt_app/a2dp_codecs/Makefile diff --git a/services/bt_app/a2dp_codecs/aac/a2dp_codec_aac.cpp b/src/services/bt_app/a2dp_codecs/aac/a2dp_codec_aac.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/aac/a2dp_codec_aac.cpp rename to src/services/bt_app/a2dp_codecs/aac/a2dp_codec_aac.cpp diff --git a/services/bt_app/a2dp_codecs/app_a2dp_codecs.cpp b/src/services/bt_app/a2dp_codecs/app_a2dp_codecs.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/app_a2dp_codecs.cpp rename to src/services/bt_app/a2dp_codecs/app_a2dp_codecs.cpp diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_aac.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_aac.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_aac.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_aac.h diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_ldac.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_ldac.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_ldac.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_ldac.h diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_lhdc.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_lhdc.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_lhdc.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_lhdc.h diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_opus.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_opus.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_opus.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_opus.h diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_sbc.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_sbc.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_sbc.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_sbc.h diff --git a/services/bt_app/a2dp_codecs/include/a2dp_codec_scalable.h b/src/services/bt_app/a2dp_codecs/include/a2dp_codec_scalable.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/a2dp_codec_scalable.h rename to src/services/bt_app/a2dp_codecs/include/a2dp_codec_scalable.h diff --git a/services/bt_app/a2dp_codecs/include/app_a2dp_codecs.h b/src/services/bt_app/a2dp_codecs/include/app_a2dp_codecs.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/app_a2dp_codecs.h rename to src/services/bt_app/a2dp_codecs/include/app_a2dp_codecs.h diff --git a/services/bt_app/a2dp_codecs/include/codec_lhdc.h b/src/services/bt_app/a2dp_codecs/include/codec_lhdc.h similarity index 100% rename from services/bt_app/a2dp_codecs/include/codec_lhdc.h rename to src/services/bt_app/a2dp_codecs/include/codec_lhdc.h diff --git a/services/bt_app/a2dp_codecs/ldac/a2dp_codec_ldac.cpp b/src/services/bt_app/a2dp_codecs/ldac/a2dp_codec_ldac.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/ldac/a2dp_codec_ldac.cpp rename to src/services/bt_app/a2dp_codecs/ldac/a2dp_codec_ldac.cpp diff --git a/services/bt_app/a2dp_codecs/lhdc/a2dp_codec_lhdc.cpp b/src/services/bt_app/a2dp_codecs/lhdc/a2dp_codec_lhdc.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/lhdc/a2dp_codec_lhdc.cpp rename to src/services/bt_app/a2dp_codecs/lhdc/a2dp_codec_lhdc.cpp diff --git a/services/bt_app/a2dp_codecs/lhdc/codec_lhdc.cpp b/src/services/bt_app/a2dp_codecs/lhdc/codec_lhdc.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/lhdc/codec_lhdc.cpp rename to src/services/bt_app/a2dp_codecs/lhdc/codec_lhdc.cpp diff --git a/services/bt_app/a2dp_codecs/opus/a2dp_codec_opus.cpp b/src/services/bt_app/a2dp_codecs/opus/a2dp_codec_opus.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/opus/a2dp_codec_opus.cpp rename to src/services/bt_app/a2dp_codecs/opus/a2dp_codec_opus.cpp diff --git a/services/bt_app/a2dp_codecs/sbc/a2dp_codec_sbc.cpp b/src/services/bt_app/a2dp_codecs/sbc/a2dp_codec_sbc.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/sbc/a2dp_codec_sbc.cpp rename to src/services/bt_app/a2dp_codecs/sbc/a2dp_codec_sbc.cpp diff --git a/services/bt_app/a2dp_codecs/scalable/a2dp_codec_scalable.cpp b/src/services/bt_app/a2dp_codecs/scalable/a2dp_codec_scalable.cpp similarity index 100% rename from services/bt_app/a2dp_codecs/scalable/a2dp_codec_scalable.cpp rename to src/services/bt_app/a2dp_codecs/scalable/a2dp_codec_scalable.cpp diff --git a/services/bt_app/app_a2dp.cpp b/src/services/bt_app/app_a2dp.cpp similarity index 100% rename from services/bt_app/app_a2dp.cpp rename to src/services/bt_app/app_a2dp.cpp diff --git a/services/bt_app/app_a2dp.h b/src/services/bt_app/app_a2dp.h similarity index 100% rename from services/bt_app/app_a2dp.h rename to src/services/bt_app/app_a2dp.h diff --git a/services/bt_app/app_a2dp_source.cpp b/src/services/bt_app/app_a2dp_source.cpp similarity index 100% rename from services/bt_app/app_a2dp_source.cpp rename to src/services/bt_app/app_a2dp_source.cpp diff --git a/services/bt_app/app_a2dp_source.h b/src/services/bt_app/app_a2dp_source.h similarity index 100% rename from services/bt_app/app_a2dp_source.h rename to src/services/bt_app/app_a2dp_source.h diff --git a/services/bt_app/app_bqb.cpp b/src/services/bt_app/app_bqb.cpp similarity index 100% rename from services/bt_app/app_bqb.cpp rename to src/services/bt_app/app_bqb.cpp diff --git a/services/bt_app/app_bqb_new_profile.cpp b/src/services/bt_app/app_bqb_new_profile.cpp similarity index 100% rename from services/bt_app/app_bqb_new_profile.cpp rename to src/services/bt_app/app_bqb_new_profile.cpp diff --git a/services/bt_app/app_bt.cpp b/src/services/bt_app/app_bt.cpp similarity index 100% rename from services/bt_app/app_bt.cpp rename to src/services/bt_app/app_bt.cpp diff --git a/services/bt_app/app_bt.h b/src/services/bt_app/app_bt.h similarity index 100% rename from services/bt_app/app_bt.h rename to src/services/bt_app/app_bt.h diff --git a/services/bt_app/app_bt_func.cpp b/src/services/bt_app/app_bt_func.cpp similarity index 100% rename from services/bt_app/app_bt_func.cpp rename to src/services/bt_app/app_bt_func.cpp diff --git a/services/bt_app/app_bt_func.h b/src/services/bt_app/app_bt_func.h similarity index 100% rename from services/bt_app/app_bt_func.h rename to src/services/bt_app/app_bt_func.h diff --git a/services/bt_app/app_bt_hid.cpp b/src/services/bt_app/app_bt_hid.cpp similarity index 100% rename from services/bt_app/app_bt_hid.cpp rename to src/services/bt_app/app_bt_hid.cpp diff --git a/services/bt_app/app_bt_hid.h b/src/services/bt_app/app_bt_hid.h similarity index 100% rename from services/bt_app/app_bt_hid.h rename to src/services/bt_app/app_bt_hid.h diff --git a/services/bt_app/app_bt_media_manager.cpp b/src/services/bt_app/app_bt_media_manager.cpp similarity index 100% rename from services/bt_app/app_bt_media_manager.cpp rename to src/services/bt_app/app_bt_media_manager.cpp diff --git a/services/bt_app/app_bt_media_manager.h b/src/services/bt_app/app_bt_media_manager.h similarity index 100% rename from services/bt_app/app_bt_media_manager.h rename to src/services/bt_app/app_bt_media_manager.h diff --git a/services/bt_app/app_bt_stream.cpp b/src/services/bt_app/app_bt_stream.cpp similarity index 100% rename from services/bt_app/app_bt_stream.cpp rename to src/services/bt_app/app_bt_stream.cpp diff --git a/services/bt_app/app_bt_stream.h b/src/services/bt_app/app_bt_stream.h similarity index 100% rename from services/bt_app/app_bt_stream.h rename to src/services/bt_app/app_bt_stream.h diff --git a/services/bt_app/app_bt_trace.h b/src/services/bt_app/app_bt_trace.h similarity index 100% rename from services/bt_app/app_bt_trace.h rename to src/services/bt_app/app_bt_trace.h diff --git a/services/bt_app/app_btgatt.cpp b/src/services/bt_app/app_btgatt.cpp similarity index 100% rename from services/bt_app/app_btgatt.cpp rename to src/services/bt_app/app_btgatt.cpp diff --git a/services/bt_app/app_btgatt.h b/src/services/bt_app/app_btgatt.h similarity index 100% rename from services/bt_app/app_btgatt.h rename to src/services/bt_app/app_btgatt.h diff --git a/services/bt_app/app_btmap_sms.cpp b/src/services/bt_app/app_btmap_sms.cpp similarity index 100% rename from services/bt_app/app_btmap_sms.cpp rename to src/services/bt_app/app_btmap_sms.cpp diff --git a/services/bt_app/app_btmap_sms.h b/src/services/bt_app/app_btmap_sms.h similarity index 100% rename from services/bt_app/app_btmap_sms.h rename to src/services/bt_app/app_btmap_sms.h diff --git a/services/bt_app/app_dip.cpp b/src/services/bt_app/app_dip.cpp similarity index 100% rename from services/bt_app/app_dip.cpp rename to src/services/bt_app/app_dip.cpp diff --git a/services/bt_app/app_dip.h b/src/services/bt_app/app_dip.h similarity index 100% rename from services/bt_app/app_dip.h rename to src/services/bt_app/app_dip.h diff --git a/services/bt_app/app_fp_rfcomm.cpp b/src/services/bt_app/app_fp_rfcomm.cpp similarity index 100% rename from services/bt_app/app_fp_rfcomm.cpp rename to src/services/bt_app/app_fp_rfcomm.cpp diff --git a/services/bt_app/app_fp_rfcomm.h b/src/services/bt_app/app_fp_rfcomm.h similarity index 100% rename from services/bt_app/app_fp_rfcomm.h rename to src/services/bt_app/app_fp_rfcomm.h diff --git a/services/bt_app/app_hfp.cpp b/src/services/bt_app/app_hfp.cpp similarity index 100% rename from services/bt_app/app_hfp.cpp rename to src/services/bt_app/app_hfp.cpp diff --git a/services/bt_app/app_hfp.h b/src/services/bt_app/app_hfp.h similarity index 100% rename from services/bt_app/app_hfp.h rename to src/services/bt_app/app_hfp.h diff --git a/services/bt_app/app_hsp.cpp b/src/services/bt_app/app_hsp.cpp similarity index 100% rename from services/bt_app/app_hsp.cpp rename to src/services/bt_app/app_hsp.cpp diff --git a/services/bt_app/app_keyhandle.cpp b/src/services/bt_app/app_keyhandle.cpp similarity index 100% rename from services/bt_app/app_keyhandle.cpp rename to src/services/bt_app/app_keyhandle.cpp diff --git a/services/bt_app/app_media_player.cpp b/src/services/bt_app/app_media_player.cpp similarity index 100% rename from services/bt_app/app_media_player.cpp rename to src/services/bt_app/app_media_player.cpp diff --git a/services/bt_app/app_media_player.h b/src/services/bt_app/app_media_player.h similarity index 100% rename from services/bt_app/app_media_player.h rename to src/services/bt_app/app_media_player.h diff --git a/services/bt_app/app_rfcomm_mgr.cpp b/src/services/bt_app/app_rfcomm_mgr.cpp similarity index 100% rename from services/bt_app/app_rfcomm_mgr.cpp rename to src/services/bt_app/app_rfcomm_mgr.cpp diff --git a/services/bt_app/app_rfcomm_mgr.h b/src/services/bt_app/app_rfcomm_mgr.h similarity index 100% rename from services/bt_app/app_rfcomm_mgr.h rename to src/services/bt_app/app_rfcomm_mgr.h diff --git a/services/bt_app/app_ring_merge.cpp b/src/services/bt_app/app_ring_merge.cpp similarity index 100% rename from services/bt_app/app_ring_merge.cpp rename to src/services/bt_app/app_ring_merge.cpp diff --git a/services/bt_app/app_ring_merge.h b/src/services/bt_app/app_ring_merge.h similarity index 100% rename from services/bt_app/app_ring_merge.h rename to src/services/bt_app/app_ring_merge.h diff --git a/services/bt_app/app_sec.cpp b/src/services/bt_app/app_sec.cpp similarity index 100% rename from services/bt_app/app_sec.cpp rename to src/services/bt_app/app_sec.cpp diff --git a/services/bt_app/app_spp.cpp b/src/services/bt_app/app_spp.cpp similarity index 100% rename from services/bt_app/app_spp.cpp rename to src/services/bt_app/app_spp.cpp diff --git a/services/bt_app/app_spp.h b/src/services/bt_app/app_spp.h similarity index 100% rename from services/bt_app/app_spp.h rename to src/services/bt_app/app_spp.h diff --git a/services/bt_app/audio_prompt_sbc.cpp b/src/services/bt_app/audio_prompt_sbc.cpp similarity index 100% rename from services/bt_app/audio_prompt_sbc.cpp rename to src/services/bt_app/audio_prompt_sbc.cpp diff --git a/services/bt_app/audio_prompt_sbc.h b/src/services/bt_app/audio_prompt_sbc.h similarity index 100% rename from services/bt_app/audio_prompt_sbc.h rename to src/services/bt_app/audio_prompt_sbc.h diff --git a/services/bt_app/besbt.h b/src/services/bt_app/besbt.h similarity index 100% rename from services/bt_app/besbt.h rename to src/services/bt_app/besbt.h diff --git a/services/bt_app/besbt_cfg.h b/src/services/bt_app/besbt_cfg.h similarity index 100% rename from services/bt_app/besbt_cfg.h rename to src/services/bt_app/besbt_cfg.h diff --git a/services/bt_app/besmain.cpp b/src/services/bt_app/besmain.cpp similarity index 100% rename from services/bt_app/besmain.cpp rename to src/services/bt_app/besmain.cpp diff --git a/services/bt_app/btapp.h b/src/services/bt_app/btapp.h similarity index 100% rename from services/bt_app/btapp.h rename to src/services/bt_app/btapp.h diff --git a/services/bt_app/res_audio_data.h b/src/services/bt_app/res_audio_data.h similarity index 100% rename from services/bt_app/res_audio_data.h rename to src/services/bt_app/res_audio_data.h diff --git a/services/bt_app/res_audio_ring.h b/src/services/bt_app/res_audio_ring.h similarity index 100% rename from services/bt_app/res_audio_ring.h rename to src/services/bt_app/res_audio_ring.h diff --git a/services/bt_if_enhanced/Makefile b/src/services/bt_if_enhanced/Makefile similarity index 100% rename from services/bt_if_enhanced/Makefile rename to src/services/bt_if_enhanced/Makefile diff --git a/services/bt_if_enhanced/inc/a2dp_api.h b/src/services/bt_if_enhanced/inc/a2dp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/a2dp_api.h rename to src/services/bt_if_enhanced/inc/a2dp_api.h diff --git a/services/bt_if_enhanced/inc/avctp_api.h b/src/services/bt_if_enhanced/inc/avctp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/avctp_api.h rename to src/services/bt_if_enhanced/inc/avctp_api.h diff --git a/services/bt_if_enhanced/inc/avdtp_api.h b/src/services/bt_if_enhanced/inc/avdtp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/avdtp_api.h rename to src/services/bt_if_enhanced/inc/avdtp_api.h diff --git a/services/bt_if_enhanced/inc/avrcp_api.h b/src/services/bt_if_enhanced/inc/avrcp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/avrcp_api.h rename to src/services/bt_if_enhanced/inc/avrcp_api.h diff --git a/services/bt_if_enhanced/inc/avtp_api.h b/src/services/bt_if_enhanced/inc/avtp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/avtp_api.h rename to src/services/bt_if_enhanced/inc/avtp_api.h diff --git a/services/bt_if_enhanced/inc/besaud_api.h b/src/services/bt_if_enhanced/inc/besaud_api.h similarity index 100% rename from services/bt_if_enhanced/inc/besaud_api.h rename to src/services/bt_if_enhanced/inc/besaud_api.h diff --git a/services/bt_if_enhanced/inc/besble_debug.h b/src/services/bt_if_enhanced/inc/besble_debug.h similarity index 100% rename from services/bt_if_enhanced/inc/besble_debug.h rename to src/services/bt_if_enhanced/inc/besble_debug.h diff --git a/services/bt_if_enhanced/inc/bluetooth.h b/src/services/bt_if_enhanced/inc/bluetooth.h similarity index 100% rename from services/bt_if_enhanced/inc/bluetooth.h rename to src/services/bt_if_enhanced/inc/bluetooth.h diff --git a/services/bt_if_enhanced/inc/bt_if.h b/src/services/bt_if_enhanced/inc/bt_if.h similarity index 100% rename from services/bt_if_enhanced/inc/bt_if.h rename to src/services/bt_if_enhanced/inc/bt_if.h diff --git a/services/bt_if_enhanced/inc/bt_status_conv.h b/src/services/bt_if_enhanced/inc/bt_status_conv.h similarity index 100% rename from services/bt_if_enhanced/inc/bt_status_conv.h rename to src/services/bt_if_enhanced/inc/bt_status_conv.h diff --git a/services/bt_if_enhanced/inc/bt_xtal_sync.h b/src/services/bt_if_enhanced/inc/bt_xtal_sync.h similarity index 100% rename from services/bt_if_enhanced/inc/bt_xtal_sync.h rename to src/services/bt_if_enhanced/inc/bt_xtal_sync.h diff --git a/services/bt_if_enhanced/inc/btgatt_api.h b/src/services/bt_if_enhanced/inc/btgatt_api.h similarity index 100% rename from services/bt_if_enhanced/inc/btgatt_api.h rename to src/services/bt_if_enhanced/inc/btgatt_api.h diff --git a/services/bt_if_enhanced/inc/btif_sys_config.h b/src/services/bt_if_enhanced/inc/btif_sys_config.h similarity index 100% rename from services/bt_if_enhanced/inc/btif_sys_config.h rename to src/services/bt_if_enhanced/inc/btif_sys_config.h diff --git a/services/bt_if_enhanced/inc/color_log.h b/src/services/bt_if_enhanced/inc/color_log.h similarity index 100% rename from services/bt_if_enhanced/inc/color_log.h rename to src/services/bt_if_enhanced/inc/color_log.h diff --git a/services/bt_if_enhanced/inc/conmgr_api.h b/src/services/bt_if_enhanced/inc/conmgr_api.h similarity index 100% rename from services/bt_if_enhanced/inc/conmgr_api.h rename to src/services/bt_if_enhanced/inc/conmgr_api.h diff --git a/services/bt_if_enhanced/inc/dip_api.h b/src/services/bt_if_enhanced/inc/dip_api.h similarity index 100% rename from services/bt_if_enhanced/inc/dip_api.h rename to src/services/bt_if_enhanced/inc/dip_api.h diff --git a/services/bt_if_enhanced/inc/hci_api.h b/src/services/bt_if_enhanced/inc/hci_api.h similarity index 100% rename from services/bt_if_enhanced/inc/hci_api.h rename to src/services/bt_if_enhanced/inc/hci_api.h diff --git a/services/bt_if_enhanced/inc/hfp_api.h b/src/services/bt_if_enhanced/inc/hfp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/hfp_api.h rename to src/services/bt_if_enhanced/inc/hfp_api.h diff --git a/services/bt_if_enhanced/inc/hid_api.h b/src/services/bt_if_enhanced/inc/hid_api.h similarity index 100% rename from services/bt_if_enhanced/inc/hid_api.h rename to src/services/bt_if_enhanced/inc/hid_api.h diff --git a/services/bt_if_enhanced/inc/hshf_api.h b/src/services/bt_if_enhanced/inc/hshf_api.h similarity index 100% rename from services/bt_if_enhanced/inc/hshf_api.h rename to src/services/bt_if_enhanced/inc/hshf_api.h diff --git a/services/bt_if_enhanced/inc/l2cap_api.h b/src/services/bt_if_enhanced/inc/l2cap_api.h similarity index 100% rename from services/bt_if_enhanced/inc/l2cap_api.h rename to src/services/bt_if_enhanced/inc/l2cap_api.h diff --git a/services/bt_if_enhanced/inc/map_api.h b/src/services/bt_if_enhanced/inc/map_api.h similarity index 100% rename from services/bt_if_enhanced/inc/map_api.h rename to src/services/bt_if_enhanced/inc/map_api.h diff --git a/services/bt_if_enhanced/inc/map_internal.h b/src/services/bt_if_enhanced/inc/map_internal.h similarity index 100% rename from services/bt_if_enhanced/inc/map_internal.h rename to src/services/bt_if_enhanced/inc/map_internal.h diff --git a/services/bt_if_enhanced/inc/me_api.h b/src/services/bt_if_enhanced/inc/me_api.h similarity index 100% rename from services/bt_if_enhanced/inc/me_api.h rename to src/services/bt_if_enhanced/inc/me_api.h diff --git a/services/bt_if_enhanced/inc/mei_api.h b/src/services/bt_if_enhanced/inc/mei_api.h similarity index 100% rename from services/bt_if_enhanced/inc/mei_api.h rename to src/services/bt_if_enhanced/inc/mei_api.h diff --git a/services/bt_if_enhanced/inc/obex_api.h b/src/services/bt_if_enhanced/inc/obex_api.h similarity index 100% rename from services/bt_if_enhanced/inc/obex_api.h rename to src/services/bt_if_enhanced/inc/obex_api.h diff --git a/services/bt_if_enhanced/inc/os_api.h b/src/services/bt_if_enhanced/inc/os_api.h similarity index 100% rename from services/bt_if_enhanced/inc/os_api.h rename to src/services/bt_if_enhanced/inc/os_api.h diff --git a/services/bt_if_enhanced/inc/rfcomm_api.h b/src/services/bt_if_enhanced/inc/rfcomm_api.h similarity index 100% rename from services/bt_if_enhanced/inc/rfcomm_api.h rename to src/services/bt_if_enhanced/inc/rfcomm_api.h diff --git a/services/bt_if_enhanced/inc/sco_api.h b/src/services/bt_if_enhanced/inc/sco_api.h similarity index 100% rename from services/bt_if_enhanced/inc/sco_api.h rename to src/services/bt_if_enhanced/inc/sco_api.h diff --git a/services/bt_if_enhanced/inc/sdp_api.h b/src/services/bt_if_enhanced/inc/sdp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/sdp_api.h rename to src/services/bt_if_enhanced/inc/sdp_api.h diff --git a/services/bt_if_enhanced/inc/spp_api.h b/src/services/bt_if_enhanced/inc/spp_api.h similarity index 100% rename from services/bt_if_enhanced/inc/spp_api.h rename to src/services/bt_if_enhanced/inc/spp_api.h diff --git a/services/bt_if_enhanced/inc/spp_task.h b/src/services/bt_if_enhanced/inc/spp_task.h similarity index 100% rename from services/bt_if_enhanced/inc/spp_task.h rename to src/services/bt_if_enhanced/inc/spp_task.h diff --git a/services/bt_if_enhanced/inc/tws_role_switch.h b/src/services/bt_if_enhanced/inc/tws_role_switch.h similarity index 100% rename from services/bt_if_enhanced/inc/tws_role_switch.h rename to src/services/bt_if_enhanced/inc/tws_role_switch.h diff --git a/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a b/src/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a similarity index 100% rename from services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a rename to src/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_RTX.a diff --git a/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a b/src/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a similarity index 100% rename from services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a rename to src/services/bt_if_enhanced/lib/ibrt_libbt_api_sbc_enc_2m_ble_RTX.a diff --git a/services/bt_profiles_enhanced/Makefile b/src/services/bt_profiles_enhanced/Makefile similarity index 100% rename from services/bt_profiles_enhanced/Makefile rename to src/services/bt_profiles_enhanced/Makefile diff --git a/services/bt_profiles_enhanced/inc/a2dp.h b/src/services/bt_profiles_enhanced/inc/a2dp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/a2dp.h rename to src/services/bt_profiles_enhanced/inc/a2dp.h diff --git a/services/bt_profiles_enhanced/inc/a2dp_i.h b/src/services/bt_profiles_enhanced/inc/a2dp_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/a2dp_i.h rename to src/services/bt_profiles_enhanced/inc/a2dp_i.h diff --git a/services/bt_profiles_enhanced/inc/avctp.h b/src/services/bt_profiles_enhanced/inc/avctp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avctp.h rename to src/services/bt_profiles_enhanced/inc/avctp.h diff --git a/services/bt_profiles_enhanced/inc/avctp_i.h b/src/services/bt_profiles_enhanced/inc/avctp_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avctp_i.h rename to src/services/bt_profiles_enhanced/inc/avctp_i.h diff --git a/services/bt_profiles_enhanced/inc/avdtp.h b/src/services/bt_profiles_enhanced/inc/avdtp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avdtp.h rename to src/services/bt_profiles_enhanced/inc/avdtp.h diff --git a/services/bt_profiles_enhanced/inc/avdtp_i.h b/src/services/bt_profiles_enhanced/inc/avdtp_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avdtp_i.h rename to src/services/bt_profiles_enhanced/inc/avdtp_i.h diff --git a/services/bt_profiles_enhanced/inc/avrcp.h b/src/services/bt_profiles_enhanced/inc/avrcp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avrcp.h rename to src/services/bt_profiles_enhanced/inc/avrcp.h diff --git a/services/bt_profiles_enhanced/inc/avrcp_i.h b/src/services/bt_profiles_enhanced/inc/avrcp_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/avrcp_i.h rename to src/services/bt_profiles_enhanced/inc/avrcp_i.h diff --git a/services/bt_profiles_enhanced/inc/bes_os.h b/src/services/bt_profiles_enhanced/inc/bes_os.h similarity index 100% rename from services/bt_profiles_enhanced/inc/bes_os.h rename to src/services/bt_profiles_enhanced/inc/bes_os.h diff --git a/services/bt_profiles_enhanced/inc/besaud.h b/src/services/bt_profiles_enhanced/inc/besaud.h similarity index 100% rename from services/bt_profiles_enhanced/inc/besaud.h rename to src/services/bt_profiles_enhanced/inc/besaud.h diff --git a/services/bt_profiles_enhanced/inc/besaudalloc.h b/src/services/bt_profiles_enhanced/inc/besaudalloc.h similarity index 100% rename from services/bt_profiles_enhanced/inc/besaudalloc.h rename to src/services/bt_profiles_enhanced/inc/besaudalloc.h diff --git a/services/bt_profiles_enhanced/inc/bt_co_list.h b/src/services/bt_profiles_enhanced/inc/bt_co_list.h similarity index 100% rename from services/bt_profiles_enhanced/inc/bt_co_list.h rename to src/services/bt_profiles_enhanced/inc/bt_co_list.h diff --git a/services/bt_profiles_enhanced/inc/bt_common.h b/src/services/bt_profiles_enhanced/inc/bt_common.h similarity index 100% rename from services/bt_profiles_enhanced/inc/bt_common.h rename to src/services/bt_profiles_enhanced/inc/bt_common.h diff --git a/services/bt_profiles_enhanced/inc/bt_schedule.h b/src/services/bt_profiles_enhanced/inc/bt_schedule.h similarity index 100% rename from services/bt_profiles_enhanced/inc/bt_schedule.h rename to src/services/bt_profiles_enhanced/inc/bt_schedule.h diff --git a/services/bt_profiles_enhanced/inc/bt_sys_cfg.h b/src/services/bt_profiles_enhanced/inc/bt_sys_cfg.h similarity index 100% rename from services/bt_profiles_enhanced/inc/bt_sys_cfg.h rename to src/services/bt_profiles_enhanced/inc/bt_sys_cfg.h diff --git a/services/bt_profiles_enhanced/inc/btgatt.h b/src/services/bt_profiles_enhanced/inc/btgatt.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btgatt.h rename to src/services/bt_profiles_enhanced/inc/btgatt.h diff --git a/services/bt_profiles_enhanced/inc/btlib.h b/src/services/bt_profiles_enhanced/inc/btlib.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btlib.h rename to src/services/bt_profiles_enhanced/inc/btlib.h diff --git a/services/bt_profiles_enhanced/inc/btlib_more.h b/src/services/bt_profiles_enhanced/inc/btlib_more.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btlib_more.h rename to src/services/bt_profiles_enhanced/inc/btlib_more.h diff --git a/services/bt_profiles_enhanced/inc/btlib_type.h b/src/services/bt_profiles_enhanced/inc/btlib_type.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btlib_type.h rename to src/services/bt_profiles_enhanced/inc/btlib_type.h diff --git a/services/bt_profiles_enhanced/inc/btm.h b/src/services/bt_profiles_enhanced/inc/btm.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm.h rename to src/services/bt_profiles_enhanced/inc/btm.h diff --git a/services/bt_profiles_enhanced/inc/btm_devicedb.h b/src/services/bt_profiles_enhanced/inc/btm_devicedb.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_devicedb.h rename to src/services/bt_profiles_enhanced/inc/btm_devicedb.h diff --git a/services/bt_profiles_enhanced/inc/btm_fast_init.h b/src/services/bt_profiles_enhanced/inc/btm_fast_init.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_fast_init.h rename to src/services/bt_profiles_enhanced/inc/btm_fast_init.h diff --git a/services/bt_profiles_enhanced/inc/btm_handle_hcievent.h b/src/services/bt_profiles_enhanced/inc/btm_handle_hcievent.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_handle_hcievent.h rename to src/services/bt_profiles_enhanced/inc/btm_handle_hcievent.h diff --git a/services/bt_profiles_enhanced/inc/btm_hci.h b/src/services/bt_profiles_enhanced/inc/btm_hci.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_hci.h rename to src/services/bt_profiles_enhanced/inc/btm_hci.h diff --git a/services/bt_profiles_enhanced/inc/btm_i.h b/src/services/bt_profiles_enhanced/inc/btm_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_i.h rename to src/services/bt_profiles_enhanced/inc/btm_i.h diff --git a/services/bt_profiles_enhanced/inc/btm_security.h b/src/services/bt_profiles_enhanced/inc/btm_security.h similarity index 100% rename from services/bt_profiles_enhanced/inc/btm_security.h rename to src/services/bt_profiles_enhanced/inc/btm_security.h diff --git a/services/bt_profiles_enhanced/inc/co_lib.h b/src/services/bt_profiles_enhanced/inc/co_lib.h similarity index 100% rename from services/bt_profiles_enhanced/inc/co_lib.h rename to src/services/bt_profiles_enhanced/inc/co_lib.h diff --git a/services/bt_profiles_enhanced/inc/co_ppbuff.h b/src/services/bt_profiles_enhanced/inc/co_ppbuff.h similarity index 100% rename from services/bt_profiles_enhanced/inc/co_ppbuff.h rename to src/services/bt_profiles_enhanced/inc/co_ppbuff.h diff --git a/services/bt_profiles_enhanced/inc/co_printf.h b/src/services/bt_profiles_enhanced/inc/co_printf.h similarity index 100% rename from services/bt_profiles_enhanced/inc/co_printf.h rename to src/services/bt_profiles_enhanced/inc/co_printf.h diff --git a/services/bt_profiles_enhanced/inc/co_queue.h b/src/services/bt_profiles_enhanced/inc/co_queue.h similarity index 100% rename from services/bt_profiles_enhanced/inc/co_queue.h rename to src/services/bt_profiles_enhanced/inc/co_queue.h diff --git a/services/bt_profiles_enhanced/inc/co_timer.h b/src/services/bt_profiles_enhanced/inc/co_timer.h similarity index 100% rename from services/bt_profiles_enhanced/inc/co_timer.h rename to src/services/bt_profiles_enhanced/inc/co_timer.h diff --git a/services/bt_profiles_enhanced/inc/cobt.h b/src/services/bt_profiles_enhanced/inc/cobt.h similarity index 100% rename from services/bt_profiles_enhanced/inc/cobt.h rename to src/services/bt_profiles_enhanced/inc/cobt.h diff --git a/services/bt_profiles_enhanced/inc/cobuf.h b/src/services/bt_profiles_enhanced/inc/cobuf.h similarity index 100% rename from services/bt_profiles_enhanced/inc/cobuf.h rename to src/services/bt_profiles_enhanced/inc/cobuf.h diff --git a/services/bt_profiles_enhanced/inc/data_link.h b/src/services/bt_profiles_enhanced/inc/data_link.h similarity index 100% rename from services/bt_profiles_enhanced/inc/data_link.h rename to src/services/bt_profiles_enhanced/inc/data_link.h diff --git a/services/bt_profiles_enhanced/inc/debug_cfg.h b/src/services/bt_profiles_enhanced/inc/debug_cfg.h similarity index 100% rename from services/bt_profiles_enhanced/inc/debug_cfg.h rename to src/services/bt_profiles_enhanced/inc/debug_cfg.h diff --git a/services/bt_profiles_enhanced/inc/debug_print.h b/src/services/bt_profiles_enhanced/inc/debug_print.h similarity index 100% rename from services/bt_profiles_enhanced/inc/debug_print.h rename to src/services/bt_profiles_enhanced/inc/debug_print.h diff --git a/services/bt_profiles_enhanced/inc/dip.h b/src/services/bt_profiles_enhanced/inc/dip.h similarity index 100% rename from services/bt_profiles_enhanced/inc/dip.h rename to src/services/bt_profiles_enhanced/inc/dip.h diff --git a/services/bt_profiles_enhanced/inc/hci.h b/src/services/bt_profiles_enhanced/inc/hci.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hci.h rename to src/services/bt_profiles_enhanced/inc/hci.h diff --git a/services/bt_profiles_enhanced/inc/hci_buff.h b/src/services/bt_profiles_enhanced/inc/hci_buff.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hci_buff.h rename to src/services/bt_profiles_enhanced/inc/hci_buff.h diff --git a/services/bt_profiles_enhanced/inc/hfp.h b/src/services/bt_profiles_enhanced/inc/hfp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hfp.h rename to src/services/bt_profiles_enhanced/inc/hfp.h diff --git a/services/bt_profiles_enhanced/inc/hid_i.h b/src/services/bt_profiles_enhanced/inc/hid_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hid_i.h rename to src/services/bt_profiles_enhanced/inc/hid_i.h diff --git a/services/bt_profiles_enhanced/inc/hshf.h b/src/services/bt_profiles_enhanced/inc/hshf.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hshf.h rename to src/services/bt_profiles_enhanced/inc/hshf.h diff --git a/services/bt_profiles_enhanced/inc/hshf_i.h b/src/services/bt_profiles_enhanced/inc/hshf_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/hshf_i.h rename to src/services/bt_profiles_enhanced/inc/hshf_i.h diff --git a/services/bt_profiles_enhanced/inc/l2cap.h b/src/services/bt_profiles_enhanced/inc/l2cap.h similarity index 100% rename from services/bt_profiles_enhanced/inc/l2cap.h rename to src/services/bt_profiles_enhanced/inc/l2cap.h diff --git a/services/bt_profiles_enhanced/inc/l2cap_er.h b/src/services/bt_profiles_enhanced/inc/l2cap_er.h similarity index 100% rename from services/bt_profiles_enhanced/inc/l2cap_er.h rename to src/services/bt_profiles_enhanced/inc/l2cap_er.h diff --git a/services/bt_profiles_enhanced/inc/l2cap_i.h b/src/services/bt_profiles_enhanced/inc/l2cap_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/l2cap_i.h rename to src/services/bt_profiles_enhanced/inc/l2cap_i.h diff --git a/services/bt_profiles_enhanced/inc/map_bmessage_builder.h b/src/services/bt_profiles_enhanced/inc/map_bmessage_builder.h similarity index 100% rename from services/bt_profiles_enhanced/inc/map_bmessage_builder.h rename to src/services/bt_profiles_enhanced/inc/map_bmessage_builder.h diff --git a/services/bt_profiles_enhanced/inc/map_protocol.h b/src/services/bt_profiles_enhanced/inc/map_protocol.h similarity index 100% rename from services/bt_profiles_enhanced/inc/map_protocol.h rename to src/services/bt_profiles_enhanced/inc/map_protocol.h diff --git a/services/bt_profiles_enhanced/inc/map_sdp.h b/src/services/bt_profiles_enhanced/inc/map_sdp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/map_sdp.h rename to src/services/bt_profiles_enhanced/inc/map_sdp.h diff --git a/services/bt_profiles_enhanced/inc/map_session.h b/src/services/bt_profiles_enhanced/inc/map_session.h similarity index 100% rename from services/bt_profiles_enhanced/inc/map_session.h rename to src/services/bt_profiles_enhanced/inc/map_session.h diff --git a/services/bt_profiles_enhanced/inc/md5.h b/src/services/bt_profiles_enhanced/inc/md5.h similarity index 100% rename from services/bt_profiles_enhanced/inc/md5.h rename to src/services/bt_profiles_enhanced/inc/md5.h diff --git a/services/bt_profiles_enhanced/inc/obex.h b/src/services/bt_profiles_enhanced/inc/obex.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex.h rename to src/services/bt_profiles_enhanced/inc/obex.h diff --git a/services/bt_profiles_enhanced/inc/obex_ascii_unicode.h b/src/services/bt_profiles_enhanced/inc/obex_ascii_unicode.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_ascii_unicode.h rename to src/services/bt_profiles_enhanced/inc/obex_ascii_unicode.h diff --git a/services/bt_profiles_enhanced/inc/obex_i.h b/src/services/bt_profiles_enhanced/inc/obex_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_i.h rename to src/services/bt_profiles_enhanced/inc/obex_i.h diff --git a/services/bt_profiles_enhanced/inc/obex_if.h b/src/services/bt_profiles_enhanced/inc/obex_if.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_if.h rename to src/services/bt_profiles_enhanced/inc/obex_if.h diff --git a/services/bt_profiles_enhanced/inc/obex_protocol.h b/src/services/bt_profiles_enhanced/inc/obex_protocol.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_protocol.h rename to src/services/bt_profiles_enhanced/inc/obex_protocol.h diff --git a/services/bt_profiles_enhanced/inc/obex_session.h b/src/services/bt_profiles_enhanced/inc/obex_session.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_session.h rename to src/services/bt_profiles_enhanced/inc/obex_session.h diff --git a/services/bt_profiles_enhanced/inc/obex_tlv.h b/src/services/bt_profiles_enhanced/inc/obex_tlv.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_tlv.h rename to src/services/bt_profiles_enhanced/inc/obex_tlv.h diff --git a/services/bt_profiles_enhanced/inc/obex_transmission.h b/src/services/bt_profiles_enhanced/inc/obex_transmission.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_transmission.h rename to src/services/bt_profiles_enhanced/inc/obex_transmission.h diff --git a/services/bt_profiles_enhanced/inc/obex_transportlayer.h b/src/services/bt_profiles_enhanced/inc/obex_transportlayer.h similarity index 100% rename from services/bt_profiles_enhanced/inc/obex_transportlayer.h rename to src/services/bt_profiles_enhanced/inc/obex_transportlayer.h diff --git a/services/bt_profiles_enhanced/inc/overide.h b/src/services/bt_profiles_enhanced/inc/overide.h similarity index 100% rename from services/bt_profiles_enhanced/inc/overide.h rename to src/services/bt_profiles_enhanced/inc/overide.h diff --git a/services/bt_profiles_enhanced/inc/packer.h b/src/services/bt_profiles_enhanced/inc/packer.h similarity index 100% rename from services/bt_profiles_enhanced/inc/packer.h rename to src/services/bt_profiles_enhanced/inc/packer.h diff --git a/services/bt_profiles_enhanced/inc/pbap.h b/src/services/bt_profiles_enhanced/inc/pbap.h similarity index 100% rename from services/bt_profiles_enhanced/inc/pbap.h rename to src/services/bt_profiles_enhanced/inc/pbap.h diff --git a/services/bt_profiles_enhanced/inc/pbap_i.h b/src/services/bt_profiles_enhanced/inc/pbap_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/pbap_i.h rename to src/services/bt_profiles_enhanced/inc/pbap_i.h diff --git a/services/bt_profiles_enhanced/inc/platform_deps.h b/src/services/bt_profiles_enhanced/inc/platform_deps.h similarity index 100% rename from services/bt_profiles_enhanced/inc/platform_deps.h rename to src/services/bt_profiles_enhanced/inc/platform_deps.h diff --git a/services/bt_profiles_enhanced/inc/rfcomm.h b/src/services/bt_profiles_enhanced/inc/rfcomm.h similarity index 100% rename from services/bt_profiles_enhanced/inc/rfcomm.h rename to src/services/bt_profiles_enhanced/inc/rfcomm.h diff --git a/services/bt_profiles_enhanced/inc/rfcomm_i.h b/src/services/bt_profiles_enhanced/inc/rfcomm_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/rfcomm_i.h rename to src/services/bt_profiles_enhanced/inc/rfcomm_i.h diff --git a/services/bt_profiles_enhanced/inc/sco.h b/src/services/bt_profiles_enhanced/inc/sco.h similarity index 100% rename from services/bt_profiles_enhanced/inc/sco.h rename to src/services/bt_profiles_enhanced/inc/sco.h diff --git a/services/bt_profiles_enhanced/inc/sco_i.h b/src/services/bt_profiles_enhanced/inc/sco_i.h similarity index 100% rename from services/bt_profiles_enhanced/inc/sco_i.h rename to src/services/bt_profiles_enhanced/inc/sco_i.h diff --git a/services/bt_profiles_enhanced/inc/sdp.h b/src/services/bt_profiles_enhanced/inc/sdp.h similarity index 100% rename from services/bt_profiles_enhanced/inc/sdp.h rename to src/services/bt_profiles_enhanced/inc/sdp.h diff --git a/services/bt_profiles_enhanced/inc/sppnew.h b/src/services/bt_profiles_enhanced/inc/sppnew.h similarity index 100% rename from services/bt_profiles_enhanced/inc/sppnew.h rename to src/services/bt_profiles_enhanced/inc/sppnew.h diff --git a/services/bt_profiles_enhanced/inc/win32_os.h b/src/services/bt_profiles_enhanced/inc/win32_os.h similarity index 100% rename from services/bt_profiles_enhanced/inc/win32_os.h rename to src/services/bt_profiles_enhanced/inc/win32_os.h diff --git a/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a b/src/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a similarity index 100% rename from services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a rename to src/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_2m_RTX.a diff --git a/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a b/src/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a similarity index 100% rename from services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a rename to src/services/bt_profiles_enhanced/lib/ibrt_libbt_profiles_sbc_enc_ble_2m_RTX.a diff --git a/services/communication/Makefile b/src/services/communication/Makefile similarity index 100% rename from services/communication/Makefile rename to src/services/communication/Makefile diff --git a/services/communication/comminication_knowles/Makefile b/src/services/communication/comminication_knowles/Makefile similarity index 100% rename from services/communication/comminication_knowles/Makefile rename to src/services/communication/comminication_knowles/Makefile diff --git a/services/communication/comminication_knowles/communication_cmd_handle.cpp b/src/services/communication/comminication_knowles/communication_cmd_handle.cpp similarity index 100% rename from services/communication/comminication_knowles/communication_cmd_handle.cpp rename to src/services/communication/comminication_knowles/communication_cmd_handle.cpp diff --git a/services/communication/comminication_knowles/communication_cmd_handle.h b/src/services/communication/comminication_knowles/communication_cmd_handle.h similarity index 100% rename from services/communication/comminication_knowles/communication_cmd_handle.h rename to src/services/communication/comminication_knowles/communication_cmd_handle.h diff --git a/services/communication/comminication_knowles/communication_cmd_msg.h b/src/services/communication/comminication_knowles/communication_cmd_msg.h similarity index 100% rename from services/communication/comminication_knowles/communication_cmd_msg.h rename to src/services/communication/comminication_knowles/communication_cmd_msg.h diff --git a/services/communication/comminication_knowles/communication_sysapi.cpp b/src/services/communication/comminication_knowles/communication_sysapi.cpp similarity index 100% rename from services/communication/comminication_knowles/communication_sysapi.cpp rename to src/services/communication/comminication_knowles/communication_sysapi.cpp diff --git a/services/communication/comminication_knowles/communication_sysapi.h b/src/services/communication/comminication_knowles/communication_sysapi.h similarity index 100% rename from services/communication/comminication_knowles/communication_sysapi.h rename to src/services/communication/comminication_knowles/communication_sysapi.h diff --git a/services/communication/comminication_knowles/tool_msg.h b/src/services/communication/comminication_knowles/tool_msg.h similarity index 100% rename from services/communication/comminication_knowles/tool_msg.h rename to src/services/communication/comminication_knowles/tool_msg.h diff --git a/services/communication/communication_svr.cpp b/src/services/communication/communication_svr.cpp similarity index 100% rename from services/communication/communication_svr.cpp rename to src/services/communication/communication_svr.cpp diff --git a/services/communication/communication_svr.h b/src/services/communication/communication_svr.h similarity index 100% rename from services/communication/communication_svr.h rename to src/services/communication/communication_svr.h diff --git a/services/cp_accel/Makefile b/src/services/cp_accel/Makefile similarity index 100% rename from services/cp_accel/Makefile rename to src/services/cp_accel/Makefile diff --git a/services/cp_accel/cp_accel.c b/src/services/cp_accel/cp_accel.c similarity index 100% rename from services/cp_accel/cp_accel.c rename to src/services/cp_accel/cp_accel.c diff --git a/services/cp_accel/cp_accel.h b/src/services/cp_accel/cp_accel.h similarity index 100% rename from services/cp_accel/cp_accel.h rename to src/services/cp_accel/cp_accel.h diff --git a/services/cp_accel/cp_queue.c b/src/services/cp_accel/cp_queue.c similarity index 100% rename from services/cp_accel/cp_queue.c rename to src/services/cp_accel/cp_queue.c diff --git a/services/cp_accel/cp_queue.h b/src/services/cp_accel/cp_queue.h similarity index 100% rename from services/cp_accel/cp_queue.h rename to src/services/cp_accel/cp_queue.h diff --git a/services/hw_dsp/Makefile b/src/services/hw_dsp/Makefile similarity index 100% rename from services/hw_dsp/Makefile rename to src/services/hw_dsp/Makefile diff --git a/services/hw_dsp/inc/hw_filter_codec_iir.h b/src/services/hw_dsp/inc/hw_filter_codec_iir.h similarity index 100% rename from services/hw_dsp/inc/hw_filter_codec_iir.h rename to src/services/hw_dsp/inc/hw_filter_codec_iir.h diff --git a/services/hw_dsp/src/hw_filter_codec_iir.c b/src/services/hw_dsp/src/hw_filter_codec_iir.c similarity index 100% rename from services/hw_dsp/src/hw_filter_codec_iir.c rename to src/services/hw_dsp/src/hw_filter_codec_iir.c diff --git a/services/ibrt_core/Makefile b/src/services/ibrt_core/Makefile similarity index 100% rename from services/ibrt_core/Makefile rename to src/services/ibrt_core/Makefile diff --git a/services/ibrt_core/inc/app_ibrt_bt_profile_sync.h b/src/services/ibrt_core/inc/app_ibrt_bt_profile_sync.h similarity index 100% rename from services/ibrt_core/inc/app_ibrt_bt_profile_sync.h rename to src/services/ibrt_core/inc/app_ibrt_bt_profile_sync.h diff --git a/services/ibrt_core/inc/app_tws_besaud.h b/src/services/ibrt_core/inc/app_tws_besaud.h similarity index 100% rename from services/ibrt_core/inc/app_tws_besaud.h rename to src/services/ibrt_core/inc/app_tws_besaud.h diff --git a/services/ibrt_core/inc/app_tws_ctrl_thread.h b/src/services/ibrt_core/inc/app_tws_ctrl_thread.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ctrl_thread.h rename to src/services/ibrt_core/inc/app_tws_ctrl_thread.h diff --git a/services/ibrt_core/inc/app_tws_ibrt.h b/src/services/ibrt_core/inc/app_tws_ibrt.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt.h rename to src/services/ibrt_core/inc/app_tws_ibrt.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_audio_analysis.h b/src/services/ibrt_core/inc/app_tws_ibrt_audio_analysis.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_audio_analysis.h rename to src/services/ibrt_core/inc/app_tws_ibrt_audio_analysis.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_audio_sync.h b/src/services/ibrt_core/inc/app_tws_ibrt_audio_sync.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_audio_sync.h rename to src/services/ibrt_core/inc/app_tws_ibrt_audio_sync.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_cmd_audio_analysis.h b/src/services/ibrt_core/inc/app_tws_ibrt_cmd_audio_analysis.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_cmd_audio_analysis.h rename to src/services/ibrt_core/inc/app_tws_ibrt_cmd_audio_analysis.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_cmd_handler.h b/src/services/ibrt_core/inc/app_tws_ibrt_cmd_handler.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_cmd_handler.h rename to src/services/ibrt_core/inc/app_tws_ibrt_cmd_handler.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_a2dp_status.h b/src/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_a2dp_status.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_cmd_sync_a2dp_status.h rename to src/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_a2dp_status.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_hfp_status.h b/src/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_hfp_status.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_cmd_sync_hfp_status.h rename to src/services/ibrt_core/inc/app_tws_ibrt_cmd_sync_hfp_status.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_mock.h b/src/services/ibrt_core/inc/app_tws_ibrt_mock.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_mock.h rename to src/services/ibrt_core/inc/app_tws_ibrt_mock.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_queue.h b/src/services/ibrt_core/inc/app_tws_ibrt_queue.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_queue.h rename to src/services/ibrt_core/inc/app_tws_ibrt_queue.h diff --git a/services/ibrt_core/inc/app_tws_ibrt_trace.h b/src/services/ibrt_core/inc/app_tws_ibrt_trace.h similarity index 100% rename from services/ibrt_core/inc/app_tws_ibrt_trace.h rename to src/services/ibrt_core/inc/app_tws_ibrt_trace.h diff --git a/services/ibrt_core/inc/app_tws_profile_sync.h b/src/services/ibrt_core/inc/app_tws_profile_sync.h similarity index 100% rename from services/ibrt_core/inc/app_tws_profile_sync.h rename to src/services/ibrt_core/inc/app_tws_profile_sync.h diff --git a/services/ibrt_core/inc/app_vendor_cmd_evt.h b/src/services/ibrt_core/inc/app_vendor_cmd_evt.h similarity index 100% rename from services/ibrt_core/inc/app_vendor_cmd_evt.h rename to src/services/ibrt_core/inc/app_vendor_cmd_evt.h diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a b/src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a similarity index 100% rename from services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a rename to src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_RTX.a diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a b/src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a similarity index 100% rename from services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a rename to src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_anc_RTX.a diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a b/src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a similarity index 100% rename from services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a rename to src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_RTX.a diff --git a/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a b/src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a similarity index 100% rename from services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a rename to src/services/ibrt_core/lib/libtws_ibrt_enhanced_stack_ble_anc_RTX.a diff --git a/services/ibrt_ota/Makefile b/src/services/ibrt_ota/Makefile similarity index 100% rename from services/ibrt_ota/Makefile rename to src/services/ibrt_ota/Makefile diff --git a/services/ibrt_ota/inc/ota_bes.h b/src/services/ibrt_ota/inc/ota_bes.h similarity index 100% rename from services/ibrt_ota/inc/ota_bes.h rename to src/services/ibrt_ota/inc/ota_bes.h diff --git a/services/ibrt_ota/inc/ota_control.h b/src/services/ibrt_ota/inc/ota_control.h similarity index 100% rename from services/ibrt_ota/inc/ota_control.h rename to src/services/ibrt_ota/inc/ota_control.h diff --git a/services/ibrt_ota/inc/ota_spp.h b/src/services/ibrt_ota/inc/ota_spp.h similarity index 100% rename from services/ibrt_ota/inc/ota_spp.h rename to src/services/ibrt_ota/inc/ota_spp.h diff --git a/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a b/src/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a similarity index 100% rename from services/ibrt_ota/lib/lib_ibrt_ota_RTX.a rename to src/services/ibrt_ota/lib/lib_ibrt_ota_RTX.a diff --git a/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a b/src/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a similarity index 100% rename from services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a rename to src/services/ibrt_ota/lib/lib_ibrt_ota_ble_RTX.a diff --git a/services/ibrt_ui/Makefile b/src/services/ibrt_ui/Makefile similarity index 100% rename from services/ibrt_ui/Makefile rename to src/services/ibrt_ui/Makefile diff --git a/services/ibrt_ui/inc/app_ibrt_ui.h b/src/services/ibrt_ui/inc/app_ibrt_ui.h similarity index 100% rename from services/ibrt_ui/inc/app_ibrt_ui.h rename to src/services/ibrt_ui/inc/app_ibrt_ui.h diff --git a/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a b/src/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a similarity index 100% rename from services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a rename to src/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_RTX.a diff --git a/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a b/src/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a similarity index 100% rename from services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a rename to src/services/ibrt_ui/lib/libtws_ibrt_enhanced_stack_ble_RTX.a diff --git a/services/interconnection/Makefile b/src/services/interconnection/Makefile similarity index 100% rename from services/interconnection/Makefile rename to src/services/interconnection/Makefile diff --git a/services/interconnection/umm_malloc/dbglog.h b/src/services/interconnection/umm_malloc/dbglog.h similarity index 100% rename from services/interconnection/umm_malloc/dbglog.h rename to src/services/interconnection/umm_malloc/dbglog.h diff --git a/services/interconnection/umm_malloc/umm_malloc.c b/src/services/interconnection/umm_malloc/umm_malloc.c similarity index 100% rename from services/interconnection/umm_malloc/umm_malloc.c rename to src/services/interconnection/umm_malloc/umm_malloc.c diff --git a/services/interconnection/umm_malloc/umm_malloc.h b/src/services/interconnection/umm_malloc/umm_malloc.h similarity index 100% rename from services/interconnection/umm_malloc/umm_malloc.h rename to src/services/interconnection/umm_malloc/umm_malloc.h diff --git a/services/lhdc_license/Makefile b/src/services/lhdc_license/Makefile similarity index 100% rename from services/lhdc_license/Makefile rename to src/services/lhdc_license/Makefile diff --git a/services/multimedia/Makefile b/src/services/multimedia/Makefile similarity index 100% rename from services/multimedia/Makefile rename to src/services/multimedia/Makefile diff --git a/services/multimedia/algorithm/fft/include/fft128dot.h b/src/services/multimedia/algorithm/fft/include/fft128dot.h similarity index 100% rename from services/multimedia/algorithm/fft/include/fft128dot.h rename to src/services/multimedia/algorithm/fft/include/fft128dot.h diff --git a/services/multimedia/algorithm/fft/include/fftr4_fxp.h b/src/services/multimedia/algorithm/fft/include/fftr4_fxp.h similarity index 100% rename from services/multimedia/algorithm/fft/include/fftr4_fxp.h rename to src/services/multimedia/algorithm/fft/include/fftr4_fxp.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/ChangeLog b/src/services/multimedia/audio/codec/fdkaac_codec/ChangeLog similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/ChangeLog rename to src/services/multimedia/audio/codec/fdkaac_codec/ChangeLog diff --git a/services/multimedia/audio/codec/fdkaac_codec/NOTICE b/src/services/multimedia/audio/codec/fdkaac_codec/NOTICE similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/NOTICE rename to src/services/multimedia/audio/codec/fdkaac_codec/NOTICE diff --git a/services/multimedia/audio/codec/fdkaac_codec/README b/src/services/multimedia/audio/codec/fdkaac_codec/README similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/README rename to src/services/multimedia/audio/codec/fdkaac_codec/README diff --git a/services/multimedia/audio/codec/fdkaac_codec/libAACdec/include/aacdecoder_lib.h b/src/services/multimedia/audio/codec/fdkaac_codec/libAACdec/include/aacdecoder_lib.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libAACdec/include/aacdecoder_lib.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libAACdec/include/aacdecoder_lib.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libAACenc/include/aacenc_lib.h b/src/services/multimedia/audio/codec/fdkaac_codec/libAACenc/include/aacenc_lib.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libAACenc/include/aacenc_lib.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libAACenc/include/aacenc_lib.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_archdef.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_archdef.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_archdef.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_archdef.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitbuffer.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitbuffer.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitbuffer.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitbuffer.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitstream.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitstream.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitstream.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_bitstream.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_core.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_core.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_core.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_core.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_crc.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_crc.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_crc.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_crc.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_hybrid.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_hybrid.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_hybrid.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_hybrid.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_tools_rom.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_tools_rom.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_tools_rom.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_tools_rom.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_trigFcts.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_trigFcts.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_trigFcts.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/FDK_trigFcts.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/clz_aarch64.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/clz_aarch64.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/clz_aarch64.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/clz_aarch64.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/fixmul_aarch64.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/fixmul_aarch64.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/fixmul_aarch64.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/aarch64/fixmul_aarch64.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/abs.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/abs.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/abs.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/abs.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/clz_arm.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/clz_arm.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/clz_arm.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/clz_arm.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/cplx_mul.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/cplx_mul.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/cplx_mul.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/cplx_mul.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmadd_arm.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmadd_arm.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmadd_arm.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmadd_arm.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmul_arm.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmul_arm.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmul_arm.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/fixmul_arm.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scale.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scale.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scale.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scale.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scramble.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scramble.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scramble.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/arm/scramble.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/autocorr2nd.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/autocorr2nd.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/autocorr2nd.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/autocorr2nd.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/clz.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/clz.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/clz.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/clz.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/common_fix.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/common_fix.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/common_fix.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/common_fix.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/cplx_mul.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/cplx_mul.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/cplx_mul.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/cplx_mul.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/dct.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/dct.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/dct.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/dct.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft_rad2.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft_rad2.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft_rad2.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fft_rad2.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmadd.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmadd.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmadd.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmadd.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixminmax.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixminmax.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixminmax.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixminmax.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmul.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmul.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmul.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixmul.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixpoint_math.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixpoint_math.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixpoint_math.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/fixpoint_math.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mdct.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mdct.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mdct.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mdct.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/abs_mips.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/abs_mips.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/abs_mips.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/abs_mips.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/clz_mips.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/clz_mips.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/clz_mips.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/clz_mips.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/cplx_mul.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/cplx_mul.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/cplx_mul.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/cplx_mul.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmadd_mips.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmadd_mips.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmadd_mips.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmadd_mips.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmul_mips.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmul_mips.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmul_mips.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/fixmul_mips.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scale.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scale.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scale.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scale.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scramble.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scramble.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scramble.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/mips/scramble.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/clz_ppc.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/clz_ppc.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/clz_ppc.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/clz_ppc.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/fixmul_ppc.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/fixmul_ppc.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/fixmul_ppc.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/ppc/fixmul_ppc.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/qmf.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/qmf.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/qmf.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/qmf.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scale.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scale.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scale.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scale.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scramble.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scramble.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scramble.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/scramble.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/abs_x86.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/abs_x86.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/abs_x86.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/abs_x86.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/clz_x86.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/clz_x86.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/clz_x86.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/clz_x86.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/fixmul_x86.h b/src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/fixmul_x86.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/fixmul_x86.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libFDK/include/x86/fixmul_x86.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/mpegFileRead.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/mpegFileRead.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/mpegFileRead.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/mpegFileRead.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tp_data.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tp_data.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tp_data.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tp_data.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tpdec_lib.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tpdec_lib.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tpdec_lib.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPDec/include/tpdec_lib.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/mpegFileWrite.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/mpegFileWrite.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/mpegFileWrite.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/mpegFileWrite.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tp_data.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tp_data.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tp_data.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tp_data.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tpenc_lib.h b/src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tpenc_lib.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tpenc_lib.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libMpegTPEnc/include/tpenc_lib.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/limiter.h b/src/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/limiter.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/limiter.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/limiter.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/pcmutils_lib.h b/src/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/pcmutils_lib.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/pcmutils_lib.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libPCMutils/include/pcmutils_lib.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSBRdec/include/sbrdecoder.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSBRdec/include/sbrdecoder.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSBRdec/include/sbrdecoder.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSBRdec/include/sbrdecoder.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSBRenc/include/sbr_encoder.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSBRenc/include/sbr_encoder.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSBRenc/include/sbr_encoder.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSBRenc/include/sbr_encoder.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/FDK_audio.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/FDK_audio.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/FDK_audio.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/FDK_audio.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/audio.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/audio.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/audio.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/audio.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/cmdl_parser.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/cmdl_parser.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/cmdl_parser.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/cmdl_parser.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/conv_string.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/conv_string.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/conv_string.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/conv_string.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/genericStds.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/genericStds.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/genericStds.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/genericStds.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/machine_type.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/machine_type.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/machine_type.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/machine_type.h diff --git a/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/wav_file.h b/src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/wav_file.h similarity index 100% rename from services/multimedia/audio/codec/fdkaac_codec/libSYS/include/wav_file.h rename to src/services/multimedia/audio/codec/fdkaac_codec/libSYS/include/wav_file.h diff --git a/services/multimedia/audio/codec/sbc/inc/codec_sbc.h b/src/services/multimedia/audio/codec/sbc/inc/codec_sbc.h similarity index 100% rename from services/multimedia/audio/codec/sbc/inc/codec_sbc.h rename to src/services/multimedia/audio/codec/sbc/inc/codec_sbc.h diff --git a/services/multimedia/audio/process/adp/include/adp_arch.h b/src/services/multimedia/audio/process/adp/include/adp_arch.h similarity index 100% rename from services/multimedia/audio/process/adp/include/adp_arch.h rename to src/services/multimedia/audio/process/adp/include/adp_arch.h diff --git a/services/multimedia/audio/process/adp/include/adp_config.h b/src/services/multimedia/audio/process/adp/include/adp_config.h similarity index 100% rename from services/multimedia/audio/process/adp/include/adp_config.h rename to src/services/multimedia/audio/process/adp/include/adp_config.h diff --git a/services/multimedia/audio/process/adp/include/adp_fftwrap.h b/src/services/multimedia/audio/process/adp/include/adp_fftwrap.h similarity index 100% rename from services/multimedia/audio/process/adp/include/adp_fftwrap.h rename to src/services/multimedia/audio/process/adp/include/adp_fftwrap.h diff --git a/services/multimedia/audio/process/adp/include/adp_filter.h b/src/services/multimedia/audio/process/adp/include/adp_filter.h similarity index 100% rename from services/multimedia/audio/process/adp/include/adp_filter.h rename to src/services/multimedia/audio/process/adp/include/adp_filter.h diff --git a/services/multimedia/audio/process/adp/include/adp_smallft.h b/src/services/multimedia/audio/process/adp/include/adp_smallft.h similarity index 100% rename from services/multimedia/audio/process/adp/include/adp_smallft.h rename to src/services/multimedia/audio/process/adp/include/adp_smallft.h diff --git a/services/multimedia/audio/process/anc/cfg/Makefile b/src/services/multimedia/audio/process/anc/cfg/Makefile similarity index 100% rename from services/multimedia/audio/process/anc/cfg/Makefile rename to src/services/multimedia/audio/process/anc/cfg/Makefile diff --git a/services/multimedia/audio/process/anc/cfg/anc_cfg.c b/src/services/multimedia/audio/process/anc/cfg/anc_cfg.c similarity index 100% rename from services/multimedia/audio/process/anc/cfg/anc_cfg.c rename to src/services/multimedia/audio/process/anc/cfg/anc_cfg.c diff --git a/services/multimedia/audio/process/anc/include/anc_process.h b/src/services/multimedia/audio/process/anc/include/anc_process.h similarity index 100% rename from services/multimedia/audio/process/anc/include/anc_process.h rename to src/services/multimedia/audio/process/anc/include/anc_process.h diff --git a/services/multimedia/audio/process/anc/include/fftfilt2.h b/src/services/multimedia/audio/process/anc/include/fftfilt2.h similarity index 100% rename from services/multimedia/audio/process/anc/include/fftfilt2.h rename to src/services/multimedia/audio/process/anc/include/fftfilt2.h diff --git a/services/multimedia/audio/process/common/include/audio_memory.h b/src/services/multimedia/audio/process/common/include/audio_memory.h similarity index 100% rename from services/multimedia/audio/process/common/include/audio_memory.h rename to src/services/multimedia/audio/process/common/include/audio_memory.h diff --git a/services/multimedia/audio/process/drc/include/drc.h b/src/services/multimedia/audio/process/drc/include/drc.h similarity index 100% rename from services/multimedia/audio/process/drc/include/drc.h rename to src/services/multimedia/audio/process/drc/include/drc.h diff --git a/services/multimedia/audio/process/filters/cfg/Makefile b/src/services/multimedia/audio/process/filters/cfg/Makefile similarity index 100% rename from services/multimedia/audio/process/filters/cfg/Makefile rename to src/services/multimedia/audio/process/filters/cfg/Makefile diff --git a/services/multimedia/audio/process/filters/cfg/eq_cfg.c b/src/services/multimedia/audio/process/filters/cfg/eq_cfg.c similarity index 100% rename from services/multimedia/audio/process/filters/cfg/eq_cfg.c rename to src/services/multimedia/audio/process/filters/cfg/eq_cfg.c diff --git a/services/multimedia/audio/process/filters/cfg/eq_cfg.h b/src/services/multimedia/audio/process/filters/cfg/eq_cfg.h similarity index 100% rename from services/multimedia/audio/process/filters/cfg/eq_cfg.h rename to src/services/multimedia/audio/process/filters/cfg/eq_cfg.h diff --git a/services/multimedia/audio/process/filters/include/dsd_process.h b/src/services/multimedia/audio/process/filters/include/dsd_process.h similarity index 100% rename from services/multimedia/audio/process/filters/include/dsd_process.h rename to src/services/multimedia/audio/process/filters/include/dsd_process.h diff --git a/services/multimedia/audio/process/filters/include/filter_debug_trace.h b/src/services/multimedia/audio/process/filters/include/filter_debug_trace.h similarity index 100% rename from services/multimedia/audio/process/filters/include/filter_debug_trace.h rename to src/services/multimedia/audio/process/filters/include/filter_debug_trace.h diff --git a/services/multimedia/audio/process/filters/include/fir_process.h b/src/services/multimedia/audio/process/filters/include/fir_process.h similarity index 100% rename from services/multimedia/audio/process/filters/include/fir_process.h rename to src/services/multimedia/audio/process/filters/include/fir_process.h diff --git a/services/multimedia/audio/process/filters/include/hw_codec_iir_process.h b/src/services/multimedia/audio/process/filters/include/hw_codec_iir_process.h similarity index 100% rename from services/multimedia/audio/process/filters/include/hw_codec_iir_process.h rename to src/services/multimedia/audio/process/filters/include/hw_codec_iir_process.h diff --git a/services/multimedia/audio/process/filters/include/hw_iir_process.h b/src/services/multimedia/audio/process/filters/include/hw_iir_process.h similarity index 100% rename from services/multimedia/audio/process/filters/include/hw_iir_process.h rename to src/services/multimedia/audio/process/filters/include/hw_iir_process.h diff --git a/services/multimedia/audio/process/filters/include/iir_process.h b/src/services/multimedia/audio/process/filters/include/iir_process.h similarity index 100% rename from services/multimedia/audio/process/filters/include/iir_process.h rename to src/services/multimedia/audio/process/filters/include/iir_process.h diff --git a/services/multimedia/audio/process/fir2iir/include/fir2iir.h b/src/services/multimedia/audio/process/fir2iir/include/fir2iir.h similarity index 100% rename from services/multimedia/audio/process/fir2iir/include/fir2iir.h rename to src/services/multimedia/audio/process/fir2iir/include/fir2iir.h diff --git a/services/multimedia/audio/process/integer_resampling/include/integer_resampling.h b/src/services/multimedia/audio/process/integer_resampling/include/integer_resampling.h similarity index 100% rename from services/multimedia/audio/process/integer_resampling/include/integer_resampling.h rename to src/services/multimedia/audio/process/integer_resampling/include/integer_resampling.h diff --git a/services/multimedia/audio/process/limiter/include/limiter.h b/src/services/multimedia/audio/process/limiter/include/limiter.h similarity index 100% rename from services/multimedia/audio/process/limiter/include/limiter.h rename to src/services/multimedia/audio/process/limiter/include/limiter.h diff --git a/services/multimedia/audio/process/resample/coef/Makefile b/src/services/multimedia/audio/process/resample/coef/Makefile similarity index 100% rename from services/multimedia/audio/process/resample/coef/Makefile rename to src/services/multimedia/audio/process/resample/coef/Makefile diff --git a/services/multimedia/audio/process/resample/coef/resample_16k_to_48k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_16k_to_48k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_16k_to_48k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_16k_to_48k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_32k_to_50p7k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_32k_to_50p7k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_32k_to_50p7k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_32k_to_50p7k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_44p1k_to_48k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_44p1k_to_48k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_44p1k_to_48k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_44p1k_to_48k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_44p1k_to_50p7k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_44p1k_to_50p7k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_44p1k_to_50p7k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_44p1k_to_50p7k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_48k_to_44p1k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_48k_to_44p1k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_48k_to_44p1k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_48k_to_44p1k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_48k_to_50p7k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_48k_to_50p7k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_48k_to_50p7k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_48k_to_50p7k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_50p7k_to_44p1k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_50p7k_to_44p1k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_50p7k_to_44p1k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_50p7k_to_44p1k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_50p7k_to_48k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_50p7k_to_48k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_50p7k_to_48k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_50p7k_to_48k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_8k_to_8p4k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_8k_to_8p4k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_8k_to_8p4k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_8k_to_8p4k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_8p4k_to_8k_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_8p4k_to_8k_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_8p4k_to_8k_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_8p4k_to_8k_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_any_up256_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_any_up256_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_any_up256_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_any_up256_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_any_up512_32_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_any_up512_32_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_any_up512_32_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_any_up512_32_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_any_up512_36_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_any_up512_36_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_any_up512_36_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_any_up512_36_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_any_up64_filter.txt b/src/services/multimedia/audio/process/resample/coef/resample_any_up64_filter.txt similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_any_up64_filter.txt rename to src/services/multimedia/audio/process/resample/coef/resample_any_up64_filter.txt diff --git a/services/multimedia/audio/process/resample/coef/resample_coef.c b/src/services/multimedia/audio/process/resample/coef/resample_coef.c similarity index 100% rename from services/multimedia/audio/process/resample/coef/resample_coef.c rename to src/services/multimedia/audio/process/resample/coef/resample_coef.c diff --git a/services/multimedia/audio/process/resample/include/audio_resample.h b/src/services/multimedia/audio/process/resample/include/audio_resample.h similarity index 100% rename from services/multimedia/audio/process/resample/include/audio_resample.h rename to src/services/multimedia/audio/process/resample/include/audio_resample.h diff --git a/services/multimedia/audio/process/resample/include/audio_resample_ex.h b/src/services/multimedia/audio/process/resample/include/audio_resample_ex.h similarity index 100% rename from services/multimedia/audio/process/resample/include/audio_resample_ex.h rename to src/services/multimedia/audio/process/resample/include/audio_resample_ex.h diff --git a/services/multimedia/audio/process/resample/include/audio_resample_ex_32bit.h b/src/services/multimedia/audio/process/resample/include/audio_resample_ex_32bit.h similarity index 100% rename from services/multimedia/audio/process/resample/include/audio_resample_ex_32bit.h rename to src/services/multimedia/audio/process/resample/include/audio_resample_ex_32bit.h diff --git a/services/multimedia/audio/process/resample/include/resample_coef.h b/src/services/multimedia/audio/process/resample/include/resample_coef.h similarity index 100% rename from services/multimedia/audio/process/resample/include/resample_coef.h rename to src/services/multimedia/audio/process/resample/include/resample_coef.h diff --git a/services/multimedia/lib/best2300p_libmultimedia_cp.a b/src/services/multimedia/lib/best2300p_libmultimedia_cp.a similarity index 100% rename from services/multimedia/lib/best2300p_libmultimedia_cp.a rename to src/services/multimedia/lib/best2300p_libmultimedia_cp.a diff --git a/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a b/src/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a similarity index 100% rename from services/multimedia/lib/best2300p_libmultimedia_cp_anc.a rename to src/services/multimedia/lib/best2300p_libmultimedia_cp_anc.a diff --git a/services/multimedia/speech/inc/Pcm8k_Cvsd.h b/src/services/multimedia/speech/inc/Pcm8k_Cvsd.h similarity index 100% rename from services/multimedia/speech/inc/Pcm8k_Cvsd.h rename to src/services/multimedia/speech/inc/Pcm8k_Cvsd.h diff --git a/services/multimedia/speech/inc/SubBandBasedAEC.h b/src/services/multimedia/speech/inc/SubBandBasedAEC.h similarity index 100% rename from services/multimedia/speech/inc/SubBandBasedAEC.h rename to src/services/multimedia/speech/inc/SubBandBasedAEC.h diff --git a/services/multimedia/speech/inc/VoiceActivityDetection.h b/src/services/multimedia/speech/inc/VoiceActivityDetection.h similarity index 100% rename from services/multimedia/speech/inc/VoiceActivityDetection.h rename to src/services/multimedia/speech/inc/VoiceActivityDetection.h diff --git a/services/multimedia/speech/inc/ae_macros.h b/src/services/multimedia/speech/inc/ae_macros.h similarity index 100% rename from services/multimedia/speech/inc/ae_macros.h rename to src/services/multimedia/speech/inc/ae_macros.h diff --git a/services/multimedia/speech/inc/ae_math.h b/src/services/multimedia/speech/inc/ae_math.h similarity index 100% rename from services/multimedia/speech/inc/ae_math.h rename to src/services/multimedia/speech/inc/ae_math.h diff --git a/services/multimedia/speech/inc/agc.h b/src/services/multimedia/speech/inc/agc.h similarity index 100% rename from services/multimedia/speech/inc/agc.h rename to src/services/multimedia/speech/inc/agc.h diff --git a/services/multimedia/speech/inc/anc_assist_algo.h b/src/services/multimedia/speech/inc/anc_assist_algo.h similarity index 100% rename from services/multimedia/speech/inc/anc_assist_algo.h rename to src/services/multimedia/speech/inc/anc_assist_algo.h diff --git a/services/multimedia/speech/inc/audio_drc2.h b/src/services/multimedia/speech/inc/audio_drc2.h similarity index 100% rename from services/multimedia/speech/inc/audio_drc2.h rename to src/services/multimedia/speech/inc/audio_drc2.h diff --git a/services/multimedia/speech/inc/buffer_manager.h b/src/services/multimedia/speech/inc/buffer_manager.h similarity index 100% rename from services/multimedia/speech/inc/buffer_manager.h rename to src/services/multimedia/speech/inc/buffer_manager.h diff --git a/services/multimedia/speech/inc/compexp.h b/src/services/multimedia/speech/inc/compexp.h similarity index 100% rename from services/multimedia/speech/inc/compexp.h rename to src/services/multimedia/speech/inc/compexp.h diff --git a/services/multimedia/speech/inc/crossfade.h b/src/services/multimedia/speech/inc/crossfade.h similarity index 100% rename from services/multimedia/speech/inc/crossfade.h rename to src/services/multimedia/speech/inc/crossfade.h diff --git a/services/multimedia/speech/inc/cvsd_codec.h b/src/services/multimedia/speech/inc/cvsd_codec.h similarity index 100% rename from services/multimedia/speech/inc/cvsd_codec.h rename to src/services/multimedia/speech/inc/cvsd_codec.h diff --git a/services/multimedia/speech/inc/dual_mic_denoise.h b/src/services/multimedia/speech/inc/dual_mic_denoise.h similarity index 100% rename from services/multimedia/speech/inc/dual_mic_denoise.h rename to src/services/multimedia/speech/inc/dual_mic_denoise.h diff --git a/services/multimedia/speech/inc/echo_canceller.h b/src/services/multimedia/speech/inc/echo_canceller.h similarity index 100% rename from services/multimedia/speech/inc/echo_canceller.h rename to src/services/multimedia/speech/inc/echo_canceller.h diff --git a/services/multimedia/speech/inc/ext_fft_f32.h b/src/services/multimedia/speech/inc/ext_fft_f32.h similarity index 100% rename from services/multimedia/speech/inc/ext_fft_f32.h rename to src/services/multimedia/speech/inc/ext_fft_f32.h diff --git a/services/multimedia/speech/inc/ext_heap.h b/src/services/multimedia/speech/inc/ext_heap.h similarity index 100% rename from services/multimedia/speech/inc/ext_heap.h rename to src/services/multimedia/speech/inc/ext_heap.h diff --git a/services/multimedia/speech/inc/far_field_speech_enhancement.h b/src/services/multimedia/speech/inc/far_field_speech_enhancement.h similarity index 100% rename from services/multimedia/speech/inc/far_field_speech_enhancement.h rename to src/services/multimedia/speech/inc/far_field_speech_enhancement.h diff --git a/services/multimedia/speech/inc/fftfilt.h b/src/services/multimedia/speech/inc/fftfilt.h similarity index 100% rename from services/multimedia/speech/inc/fftfilt.h rename to src/services/multimedia/speech/inc/fftfilt.h diff --git a/services/multimedia/speech/inc/frame_resize.h b/src/services/multimedia/speech/inc/frame_resize.h similarity index 100% rename from services/multimedia/speech/inc/frame_resize.h rename to src/services/multimedia/speech/inc/frame_resize.h diff --git a/services/multimedia/speech/inc/g726.h b/src/services/multimedia/speech/inc/g726.h similarity index 100% rename from services/multimedia/speech/inc/g726.h rename to src/services/multimedia/speech/inc/g726.h diff --git a/services/multimedia/speech/inc/g72x.h b/src/services/multimedia/speech/inc/g72x.h similarity index 100% rename from services/multimedia/speech/inc/g72x.h rename to src/services/multimedia/speech/inc/g72x.h diff --git a/services/multimedia/speech/inc/iir_resample.h b/src/services/multimedia/speech/inc/iir_resample.h similarity index 100% rename from services/multimedia/speech/inc/iir_resample.h rename to src/services/multimedia/speech/inc/iir_resample.h diff --git a/services/multimedia/speech/inc/iirfilt.h b/src/services/multimedia/speech/inc/iirfilt.h similarity index 100% rename from services/multimedia/speech/inc/iirfilt.h rename to src/services/multimedia/speech/inc/iirfilt.h diff --git a/services/multimedia/speech/inc/lc_mmse_ns.h b/src/services/multimedia/speech/inc/lc_mmse_ns.h similarity index 100% rename from services/multimedia/speech/inc/lc_mmse_ns.h rename to src/services/multimedia/speech/inc/lc_mmse_ns.h diff --git a/services/multimedia/speech/inc/lc_mmse_ns_float.h b/src/services/multimedia/speech/inc/lc_mmse_ns_float.h similarity index 100% rename from services/multimedia/speech/inc/lc_mmse_ns_float.h rename to src/services/multimedia/speech/inc/lc_mmse_ns_float.h diff --git a/services/multimedia/speech/inc/leftright_denoise.h b/src/services/multimedia/speech/inc/leftright_denoise.h similarity index 100% rename from services/multimedia/speech/inc/leftright_denoise.h rename to src/services/multimedia/speech/inc/leftright_denoise.h diff --git a/services/multimedia/speech/inc/lpc_plc_api.h b/src/services/multimedia/speech/inc/lpc_plc_api.h similarity index 100% rename from services/multimedia/speech/inc/lpc_plc_api.h rename to src/services/multimedia/speech/inc/lpc_plc_api.h diff --git a/services/multimedia/speech/inc/main_classify.h b/src/services/multimedia/speech/inc/main_classify.h similarity index 100% rename from services/multimedia/speech/inc/main_classify.h rename to src/services/multimedia/speech/inc/main_classify.h diff --git a/services/multimedia/speech/inc/med_aec3_comm.h b/src/services/multimedia/speech/inc/med_aec3_comm.h similarity index 100% rename from services/multimedia/speech/inc/med_aec3_comm.h rename to src/services/multimedia/speech/inc/med_aec3_comm.h diff --git a/services/multimedia/speech/inc/med_aec3_main.h b/src/services/multimedia/speech/inc/med_aec3_main.h similarity index 100% rename from services/multimedia/speech/inc/med_aec3_main.h rename to src/services/multimedia/speech/inc/med_aec3_main.h diff --git a/services/multimedia/speech/inc/med_aec3_main_internal.h b/src/services/multimedia/speech/inc/med_aec3_main_internal.h similarity index 100% rename from services/multimedia/speech/inc/med_aec3_main_internal.h rename to src/services/multimedia/speech/inc/med_aec3_main_internal.h diff --git a/services/multimedia/speech/inc/ns3.h b/src/services/multimedia/speech/inc/ns3.h similarity index 100% rename from services/multimedia/speech/inc/ns3.h rename to src/services/multimedia/speech/inc/ns3.h diff --git a/services/multimedia/speech/inc/plc_16000.h b/src/services/multimedia/speech/inc/plc_16000.h similarity index 100% rename from services/multimedia/speech/inc/plc_16000.h rename to src/services/multimedia/speech/inc/plc_16000.h diff --git a/services/multimedia/speech/inc/plc_8000.h b/src/services/multimedia/speech/inc/plc_8000.h similarity index 100% rename from services/multimedia/speech/inc/plc_8000.h rename to src/services/multimedia/speech/inc/plc_8000.h diff --git a/services/multimedia/speech/inc/recognition.h b/src/services/multimedia/speech/inc/recognition.h similarity index 100% rename from services/multimedia/speech/inc/recognition.h rename to src/services/multimedia/speech/inc/recognition.h diff --git a/services/multimedia/speech/inc/sensormic_denoise.h b/src/services/multimedia/speech/inc/sensormic_denoise.h similarity index 100% rename from services/multimedia/speech/inc/sensormic_denoise.h rename to src/services/multimedia/speech/inc/sensormic_denoise.h diff --git a/services/multimedia/speech/inc/single_mic_NNDenoise.h b/src/services/multimedia/speech/inc/single_mic_NNDenoise.h similarity index 100% rename from services/multimedia/speech/inc/single_mic_NNDenoise.h rename to src/services/multimedia/speech/inc/single_mic_NNDenoise.h diff --git a/services/multimedia/speech/inc/spectrum.h b/src/services/multimedia/speech/inc/spectrum.h similarity index 100% rename from services/multimedia/speech/inc/spectrum.h rename to src/services/multimedia/speech/inc/spectrum.h diff --git a/services/multimedia/speech/inc/spectrum_fix.h b/src/services/multimedia/speech/inc/spectrum_fix.h similarity index 100% rename from services/multimedia/speech/inc/spectrum_fix.h rename to src/services/multimedia/speech/inc/spectrum_fix.h diff --git a/services/multimedia/speech/inc/speech_2mic_ns2_denoise.h b/src/services/multimedia/speech/inc/speech_2mic_ns2_denoise.h similarity index 100% rename from services/multimedia/speech/inc/speech_2mic_ns2_denoise.h rename to src/services/multimedia/speech/inc/speech_2mic_ns2_denoise.h diff --git a/services/multimedia/speech/inc/speech_3mic_ns.h b/src/services/multimedia/speech/inc/speech_3mic_ns.h similarity index 100% rename from services/multimedia/speech/inc/speech_3mic_ns.h rename to src/services/multimedia/speech/inc/speech_3mic_ns.h diff --git a/services/multimedia/speech/inc/speech_aec.h b/src/services/multimedia/speech/inc/speech_aec.h similarity index 100% rename from services/multimedia/speech/inc/speech_aec.h rename to src/services/multimedia/speech/inc/speech_aec.h diff --git a/services/multimedia/speech/inc/speech_aec2.h b/src/services/multimedia/speech/inc/speech_aec2.h similarity index 100% rename from services/multimedia/speech/inc/speech_aec2.h rename to src/services/multimedia/speech/inc/speech_aec2.h diff --git a/services/multimedia/speech/inc/speech_cfg.h b/src/services/multimedia/speech/inc/speech_cfg.h similarity index 100% rename from services/multimedia/speech/inc/speech_cfg.h rename to src/services/multimedia/speech/inc/speech_cfg.h diff --git a/services/multimedia/speech/inc/speech_config.h b/src/services/multimedia/speech/inc/speech_config.h similarity index 100% rename from services/multimedia/speech/inc/speech_config.h rename to src/services/multimedia/speech/inc/speech_config.h diff --git a/services/multimedia/speech/inc/speech_dc_filter.h b/src/services/multimedia/speech/inc/speech_dc_filter.h similarity index 100% rename from services/multimedia/speech/inc/speech_dc_filter.h rename to src/services/multimedia/speech/inc/speech_dc_filter.h diff --git a/services/multimedia/speech/inc/speech_eq.h b/src/services/multimedia/speech/inc/speech_eq.h similarity index 100% rename from services/multimedia/speech/inc/speech_eq.h rename to src/services/multimedia/speech/inc/speech_eq.h diff --git a/services/multimedia/speech/inc/speech_ff_2mic_ns2.h b/src/services/multimedia/speech/inc/speech_ff_2mic_ns2.h similarity index 100% rename from services/multimedia/speech/inc/speech_ff_2mic_ns2.h rename to src/services/multimedia/speech/inc/speech_ff_2mic_ns2.h diff --git a/services/multimedia/speech/inc/speech_ff_3mic_ns1.h b/src/services/multimedia/speech/inc/speech_ff_3mic_ns1.h similarity index 100% rename from services/multimedia/speech/inc/speech_ff_3mic_ns1.h rename to src/services/multimedia/speech/inc/speech_ff_3mic_ns1.h diff --git a/services/multimedia/speech/inc/speech_fir_calibration.h b/src/services/multimedia/speech/inc/speech_fir_calibration.h similarity index 100% rename from services/multimedia/speech/inc/speech_fir_calibration.h rename to src/services/multimedia/speech/inc/speech_fir_calibration.h diff --git a/services/multimedia/speech/inc/speech_gain.h b/src/services/multimedia/speech/inc/speech_gain.h similarity index 100% rename from services/multimedia/speech/inc/speech_gain.h rename to src/services/multimedia/speech/inc/speech_gain.h diff --git a/services/multimedia/speech/inc/speech_iir.h b/src/services/multimedia/speech/inc/speech_iir.h similarity index 100% rename from services/multimedia/speech/inc/speech_iir.h rename to src/services/multimedia/speech/inc/speech_iir.h diff --git a/services/multimedia/speech/inc/speech_iir_calibration.h b/src/services/multimedia/speech/inc/speech_iir_calibration.h similarity index 100% rename from services/multimedia/speech/inc/speech_iir_calibration.h rename to src/services/multimedia/speech/inc/speech_iir_calibration.h diff --git a/services/multimedia/speech/inc/speech_memory.h b/src/services/multimedia/speech/inc/speech_memory.h similarity index 100% rename from services/multimedia/speech/inc/speech_memory.h rename to src/services/multimedia/speech/inc/speech_memory.h diff --git a/services/multimedia/speech/inc/speech_mics_calibration.h b/src/services/multimedia/speech/inc/speech_mics_calibration.h similarity index 100% rename from services/multimedia/speech/inc/speech_mics_calibration.h rename to src/services/multimedia/speech/inc/speech_mics_calibration.h diff --git a/services/multimedia/speech/inc/speech_noise_gate.h b/src/services/multimedia/speech/inc/speech_noise_gate.h similarity index 100% rename from services/multimedia/speech/inc/speech_noise_gate.h rename to src/services/multimedia/speech/inc/speech_noise_gate.h diff --git a/services/multimedia/speech/inc/speech_ns.h b/src/services/multimedia/speech/inc/speech_ns.h similarity index 100% rename from services/multimedia/speech/inc/speech_ns.h rename to src/services/multimedia/speech/inc/speech_ns.h diff --git a/services/multimedia/speech/inc/speech_peak_detector.h b/src/services/multimedia/speech/inc/speech_peak_detector.h similarity index 100% rename from services/multimedia/speech/inc/speech_peak_detector.h rename to src/services/multimedia/speech/inc/speech_peak_detector.h diff --git a/services/multimedia/speech/inc/speech_ssat.h b/src/services/multimedia/speech/inc/speech_ssat.h similarity index 100% rename from services/multimedia/speech/inc/speech_ssat.h rename to src/services/multimedia/speech/inc/speech_ssat.h diff --git a/services/multimedia/speech/inc/speech_utils.h b/src/services/multimedia/speech/inc/speech_utils.h similarity index 100% rename from services/multimedia/speech/inc/speech_utils.h rename to src/services/multimedia/speech/inc/speech_utils.h diff --git a/services/multimedia/speech/inc/speex_resampler.h b/src/services/multimedia/speech/inc/speex_resampler.h similarity index 100% rename from services/multimedia/speech/inc/speex_resampler.h rename to src/services/multimedia/speech/inc/speex_resampler.h diff --git a/services/multimedia/speech/inc/triple_mic_denoise3.h b/src/services/multimedia/speech/inc/triple_mic_denoise3.h similarity index 100% rename from services/multimedia/speech/inc/triple_mic_denoise3.h rename to src/services/multimedia/speech/inc/triple_mic_denoise3.h diff --git a/services/multimedia/speech/inc/wind_detection_2mic.h b/src/services/multimedia/speech/inc/wind_detection_2mic.h similarity index 100% rename from services/multimedia/speech/inc/wind_detection_2mic.h rename to src/services/multimedia/speech/inc/wind_detection_2mic.h diff --git a/services/multimedia/speech/inc/wnr.h b/src/services/multimedia/speech/inc/wnr.h similarity index 100% rename from services/multimedia/speech/inc/wnr.h rename to src/services/multimedia/speech/inc/wnr.h diff --git a/services/norflash_api/Makefile b/src/services/norflash_api/Makefile similarity index 100% rename from services/norflash_api/Makefile rename to src/services/norflash_api/Makefile diff --git a/services/norflash_api/norflash_api.cpp b/src/services/norflash_api/norflash_api.cpp similarity index 100% rename from services/norflash_api/norflash_api.cpp rename to src/services/norflash_api/norflash_api.cpp diff --git a/services/norflash_api/norflash_api.h b/src/services/norflash_api/norflash_api.h similarity index 100% rename from services/norflash_api/norflash_api.h rename to src/services/norflash_api/norflash_api.h diff --git a/services/nv_section/Makefile b/src/services/nv_section/Makefile similarity index 100% rename from services/nv_section/Makefile rename to src/services/nv_section/Makefile diff --git a/services/nv_section/aud_section/Makefile b/src/services/nv_section/aud_section/Makefile similarity index 100% rename from services/nv_section/aud_section/Makefile rename to src/services/nv_section/aud_section/Makefile diff --git a/services/nv_section/aud_section/aud_section.c b/src/services/nv_section/aud_section/aud_section.c similarity index 100% rename from services/nv_section/aud_section/aud_section.c rename to src/services/nv_section/aud_section/aud_section.c diff --git a/services/nv_section/aud_section/aud_section.h b/src/services/nv_section/aud_section/aud_section.h similarity index 100% rename from services/nv_section/aud_section/aud_section.h rename to src/services/nv_section/aud_section/aud_section.h diff --git a/services/nv_section/aud_section/aud_section_inc.h b/src/services/nv_section/aud_section/aud_section_inc.h similarity index 100% rename from services/nv_section/aud_section/aud_section_inc.h rename to src/services/nv_section/aud_section/aud_section_inc.h diff --git a/services/nv_section/customparam_section/Makefile b/src/services/nv_section/customparam_section/Makefile similarity index 100% rename from services/nv_section/customparam_section/Makefile rename to src/services/nv_section/customparam_section/Makefile diff --git a/services/nv_section/customparam_section/customparam_section.c b/src/services/nv_section/customparam_section/customparam_section.c similarity index 100% rename from services/nv_section/customparam_section/customparam_section.c rename to src/services/nv_section/customparam_section/customparam_section.c diff --git a/services/nv_section/customparam_section/customparam_section.h b/src/services/nv_section/customparam_section/customparam_section.h similarity index 100% rename from services/nv_section/customparam_section/customparam_section.h rename to src/services/nv_section/customparam_section/customparam_section.h diff --git a/services/nv_section/factory_section/Makefile b/src/services/nv_section/factory_section/Makefile similarity index 100% rename from services/nv_section/factory_section/Makefile rename to src/services/nv_section/factory_section/Makefile diff --git a/services/nv_section/factory_section/factory_section.c b/src/services/nv_section/factory_section/factory_section.c similarity index 100% rename from services/nv_section/factory_section/factory_section.c rename to src/services/nv_section/factory_section/factory_section.c diff --git a/services/nv_section/factory_section/factory_section.h b/src/services/nv_section/factory_section/factory_section.h similarity index 100% rename from services/nv_section/factory_section/factory_section.h rename to src/services/nv_section/factory_section/factory_section.h diff --git a/services/nv_section/include/section_def.h b/src/services/nv_section/include/section_def.h similarity index 100% rename from services/nv_section/include/section_def.h rename to src/services/nv_section/include/section_def.h diff --git a/services/nv_section/log_section/Makefile b/src/services/nv_section/log_section/Makefile similarity index 100% rename from services/nv_section/log_section/Makefile rename to src/services/nv_section/log_section/Makefile diff --git a/services/nv_section/log_section/coredump_section.c b/src/services/nv_section/log_section/coredump_section.c similarity index 100% rename from services/nv_section/log_section/coredump_section.c rename to src/services/nv_section/log_section/coredump_section.c diff --git a/services/nv_section/log_section/coredump_section.h b/src/services/nv_section/log_section/coredump_section.h similarity index 100% rename from services/nv_section/log_section/coredump_section.h rename to src/services/nv_section/log_section/coredump_section.h diff --git a/services/nv_section/log_section/crash_dump_section.c b/src/services/nv_section/log_section/crash_dump_section.c similarity index 100% rename from services/nv_section/log_section/crash_dump_section.c rename to src/services/nv_section/log_section/crash_dump_section.c diff --git a/services/nv_section/log_section/crash_dump_section.h b/src/services/nv_section/log_section/crash_dump_section.h similarity index 100% rename from services/nv_section/log_section/crash_dump_section.h rename to src/services/nv_section/log_section/crash_dump_section.h diff --git a/services/nv_section/log_section/log_section.c b/src/services/nv_section/log_section/log_section.c similarity index 100% rename from services/nv_section/log_section/log_section.c rename to src/services/nv_section/log_section/log_section.c diff --git a/services/nv_section/log_section/log_section.h b/src/services/nv_section/log_section/log_section.h similarity index 100% rename from services/nv_section/log_section/log_section.h rename to src/services/nv_section/log_section/log_section.h diff --git a/services/nv_section/nv_section_dbg.h b/src/services/nv_section/nv_section_dbg.h similarity index 100% rename from services/nv_section/nv_section_dbg.h rename to src/services/nv_section/nv_section_dbg.h diff --git a/services/nv_section/userdata_section/Makefile b/src/services/nv_section/userdata_section/Makefile similarity index 100% rename from services/nv_section/userdata_section/Makefile rename to src/services/nv_section/userdata_section/Makefile diff --git a/services/nv_section/userdata_section/nvrecord_ble.c b/src/services/nv_section/userdata_section/nvrecord_ble.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_ble.c rename to src/services/nv_section/userdata_section/nvrecord_ble.c diff --git a/services/nv_section/userdata_section/nvrecord_ble.h b/src/services/nv_section/userdata_section/nvrecord_ble.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_ble.h rename to src/services/nv_section/userdata_section/nvrecord_ble.h diff --git a/services/nv_section/userdata_section/nvrecord_bt.c b/src/services/nv_section/userdata_section/nvrecord_bt.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_bt.c rename to src/services/nv_section/userdata_section/nvrecord_bt.c diff --git a/services/nv_section/userdata_section/nvrecord_bt.h b/src/services/nv_section/userdata_section/nvrecord_bt.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_bt.h rename to src/services/nv_section/userdata_section/nvrecord_bt.h diff --git a/services/nv_section/userdata_section/nvrecord_dma_config.c b/src/services/nv_section/userdata_section/nvrecord_dma_config.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_dma_config.c rename to src/services/nv_section/userdata_section/nvrecord_dma_config.c diff --git a/services/nv_section/userdata_section/nvrecord_dma_config.h b/src/services/nv_section/userdata_section/nvrecord_dma_config.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_dma_config.h rename to src/services/nv_section/userdata_section/nvrecord_dma_config.h diff --git a/services/nv_section/userdata_section/nvrecord_env.c b/src/services/nv_section/userdata_section/nvrecord_env.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_env.c rename to src/services/nv_section/userdata_section/nvrecord_env.c diff --git a/services/nv_section/userdata_section/nvrecord_env.h b/src/services/nv_section/userdata_section/nvrecord_env.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_env.h rename to src/services/nv_section/userdata_section/nvrecord_env.h diff --git a/services/nv_section/userdata_section/nvrecord_extension.c b/src/services/nv_section/userdata_section/nvrecord_extension.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_extension.c rename to src/services/nv_section/userdata_section/nvrecord_extension.c diff --git a/services/nv_section/userdata_section/nvrecord_extension.h b/src/services/nv_section/userdata_section/nvrecord_extension.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_extension.h rename to src/services/nv_section/userdata_section/nvrecord_extension.h diff --git a/services/nv_section/userdata_section/nvrecord_fp_account_key.c b/src/services/nv_section/userdata_section/nvrecord_fp_account_key.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_fp_account_key.c rename to src/services/nv_section/userdata_section/nvrecord_fp_account_key.c diff --git a/services/nv_section/userdata_section/nvrecord_fp_account_key.h b/src/services/nv_section/userdata_section/nvrecord_fp_account_key.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_fp_account_key.h rename to src/services/nv_section/userdata_section/nvrecord_fp_account_key.h diff --git a/services/nv_section/userdata_section/nvrecord_gsound.c b/src/services/nv_section/userdata_section/nvrecord_gsound.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_gsound.c rename to src/services/nv_section/userdata_section/nvrecord_gsound.c diff --git a/services/nv_section/userdata_section/nvrecord_gsound.h b/src/services/nv_section/userdata_section/nvrecord_gsound.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_gsound.h rename to src/services/nv_section/userdata_section/nvrecord_gsound.h diff --git a/services/nv_section/userdata_section/nvrecord_ota.c b/src/services/nv_section/userdata_section/nvrecord_ota.c similarity index 100% rename from services/nv_section/userdata_section/nvrecord_ota.c rename to src/services/nv_section/userdata_section/nvrecord_ota.c diff --git a/services/nv_section/userdata_section/nvrecord_ota.h b/src/services/nv_section/userdata_section/nvrecord_ota.h similarity index 100% rename from services/nv_section/userdata_section/nvrecord_ota.h rename to src/services/nv_section/userdata_section/nvrecord_ota.h diff --git a/services/nvrecord/Makefile b/src/services/nvrecord/Makefile similarity index 100% rename from services/nvrecord/Makefile rename to src/services/nvrecord/Makefile diff --git a/services/nvrecord/list_ext.c b/src/services/nvrecord/list_ext.c similarity index 100% rename from services/nvrecord/list_ext.c rename to src/services/nvrecord/list_ext.c diff --git a/services/nvrecord/list_ext.h b/src/services/nvrecord/list_ext.h similarity index 100% rename from services/nvrecord/list_ext.h rename to src/services/nvrecord/list_ext.h diff --git a/services/nvrecord/nvrec_config.c b/src/services/nvrecord/nvrec_config.c similarity index 100% rename from services/nvrecord/nvrec_config.c rename to src/services/nvrecord/nvrec_config.c diff --git a/services/nvrecord/nvrec_config.h b/src/services/nvrecord/nvrec_config.h similarity index 100% rename from services/nvrecord/nvrec_config.h rename to src/services/nvrecord/nvrec_config.h diff --git a/services/nvrecord/nvrecord.c b/src/services/nvrecord/nvrecord.c similarity index 100% rename from services/nvrecord/nvrecord.c rename to src/services/nvrecord/nvrecord.c diff --git a/services/nvrecord/nvrecord.h b/src/services/nvrecord/nvrecord.h similarity index 100% rename from services/nvrecord/nvrecord.h rename to src/services/nvrecord/nvrecord.h diff --git a/services/nvrecord/nvrecord_ble.c b/src/services/nvrecord/nvrecord_ble.c similarity index 100% rename from services/nvrecord/nvrecord_ble.c rename to src/services/nvrecord/nvrecord_ble.c diff --git a/services/nvrecord/nvrecord_ble.h b/src/services/nvrecord/nvrecord_ble.h similarity index 100% rename from services/nvrecord/nvrecord_ble.h rename to src/services/nvrecord/nvrecord_ble.h diff --git a/services/nvrecord/nvrecord_dev.h b/src/services/nvrecord/nvrecord_dev.h similarity index 100% rename from services/nvrecord/nvrecord_dev.h rename to src/services/nvrecord/nvrecord_dev.h diff --git a/services/nvrecord/nvrecord_env.c b/src/services/nvrecord/nvrecord_env.c similarity index 100% rename from services/nvrecord/nvrecord_env.c rename to src/services/nvrecord/nvrecord_env.c diff --git a/services/nvrecord/nvrecord_env.h b/src/services/nvrecord/nvrecord_env.h similarity index 100% rename from services/nvrecord/nvrecord_env.h rename to src/services/nvrecord/nvrecord_env.h diff --git a/services/nvrecord/nvrecord_fp_account_key.c b/src/services/nvrecord/nvrecord_fp_account_key.c similarity index 100% rename from services/nvrecord/nvrecord_fp_account_key.c rename to src/services/nvrecord/nvrecord_fp_account_key.c diff --git a/services/nvrecord/nvrecord_fp_account_key.h b/src/services/nvrecord/nvrecord_fp_account_key.h similarity index 100% rename from services/nvrecord/nvrecord_fp_account_key.h rename to src/services/nvrecord/nvrecord_fp_account_key.h diff --git a/services/osif/Makefile b/src/services/osif/Makefile similarity index 100% rename from services/osif/Makefile rename to src/services/osif/Makefile diff --git a/services/osif/ddbif.h b/src/services/osif/ddbif.h similarity index 100% rename from services/osif/ddbif.h rename to src/services/osif/ddbif.h diff --git a/services/osif/ddbif_bes.c b/src/services/osif/ddbif_bes.c similarity index 100% rename from services/osif/ddbif_bes.c rename to src/services/osif/ddbif_bes.c diff --git a/services/osif/osif.h b/src/services/osif/osif.h similarity index 100% rename from services/osif/osif.h rename to src/services/osif/osif.h diff --git a/services/osif/osif_rtx.c b/src/services/osif/osif_rtx.c similarity index 100% rename from services/osif/osif_rtx.c rename to src/services/osif/osif_rtx.c diff --git a/services/ota/Makefile b/src/services/ota/Makefile similarity index 100% rename from services/ota/Makefile rename to src/services/ota/Makefile diff --git a/services/ota/ota_common.cpp b/src/services/ota/ota_common.cpp similarity index 100% rename from services/ota/ota_common.cpp rename to src/services/ota/ota_common.cpp diff --git a/services/ota/ota_common.h b/src/services/ota/ota_common.h similarity index 100% rename from services/ota/ota_common.h rename to src/services/ota/ota_common.h diff --git a/services/ota/ota_dbg.h b/src/services/ota/ota_dbg.h similarity index 100% rename from services/ota/ota_dbg.h rename to src/services/ota/ota_dbg.h diff --git a/services/overlay/Makefile b/src/services/overlay/Makefile similarity index 100% rename from services/overlay/Makefile rename to src/services/overlay/Makefile diff --git a/services/overlay/app_overlay.cpp b/src/services/overlay/app_overlay.cpp similarity index 100% rename from services/overlay/app_overlay.cpp rename to src/services/overlay/app_overlay.cpp diff --git a/services/overlay/app_overlay.h b/src/services/overlay/app_overlay.h similarity index 100% rename from services/overlay/app_overlay.h rename to src/services/overlay/app_overlay.h diff --git a/services/resources/Makefile b/src/services/resources/Makefile similarity index 100% rename from services/resources/Makefile rename to src/services/resources/Makefile diff --git a/services/resources/resources.cpp b/src/services/resources/resources.cpp similarity index 100% rename from services/resources/resources.cpp rename to src/services/resources/resources.cpp diff --git a/services/resources/resources.h b/src/services/resources/resources.h similarity index 100% rename from services/resources/resources.h rename to src/services/resources/resources.h diff --git a/services/through_put/Makefile b/src/services/through_put/Makefile similarity index 100% rename from services/through_put/Makefile rename to src/services/through_put/Makefile diff --git a/services/through_put/app_through_put.cpp b/src/services/through_put/app_through_put.cpp similarity index 100% rename from services/through_put/app_through_put.cpp rename to src/services/through_put/app_through_put.cpp diff --git a/services/through_put/app_through_put.h b/src/services/through_put/app_through_put.h similarity index 100% rename from services/through_put/app_through_put.h rename to src/services/through_put/app_through_put.h diff --git a/services/tota/Makefile b/src/services/tota/Makefile similarity index 100% rename from services/tota/Makefile rename to src/services/tota/Makefile diff --git a/services/tota/app_spp_tota.cpp b/src/services/tota/app_spp_tota.cpp similarity index 100% rename from services/tota/app_spp_tota.cpp rename to src/services/tota/app_spp_tota.cpp diff --git a/services/tota/app_spp_tota.h b/src/services/tota/app_spp_tota.h similarity index 100% rename from services/tota/app_spp_tota.h rename to src/services/tota/app_spp_tota.h diff --git a/services/tota/app_spp_tota_general_service.cpp b/src/services/tota/app_spp_tota_general_service.cpp similarity index 100% rename from services/tota/app_spp_tota_general_service.cpp rename to src/services/tota/app_spp_tota_general_service.cpp diff --git a/services/tota/app_spp_tota_general_service.h b/src/services/tota/app_spp_tota_general_service.h similarity index 100% rename from services/tota/app_spp_tota_general_service.h rename to src/services/tota/app_spp_tota_general_service.h diff --git a/services/tota/app_tota.cpp b/src/services/tota/app_tota.cpp similarity index 100% rename from services/tota/app_tota.cpp rename to src/services/tota/app_tota.cpp diff --git a/services/tota/app_tota.h b/src/services/tota/app_tota.h similarity index 100% rename from services/tota/app_tota.h rename to src/services/tota/app_tota.h diff --git a/services/tota/app_tota_anc.cpp b/src/services/tota/app_tota_anc.cpp similarity index 100% rename from services/tota/app_tota_anc.cpp rename to src/services/tota/app_tota_anc.cpp diff --git a/services/tota/app_tota_anc.h b/src/services/tota/app_tota_anc.h similarity index 100% rename from services/tota/app_tota_anc.h rename to src/services/tota/app_tota_anc.h diff --git a/services/tota/app_tota_audio_dump.cpp b/src/services/tota/app_tota_audio_dump.cpp similarity index 100% rename from services/tota/app_tota_audio_dump.cpp rename to src/services/tota/app_tota_audio_dump.cpp diff --git a/services/tota/app_tota_audio_dump.h b/src/services/tota/app_tota_audio_dump.h similarity index 100% rename from services/tota/app_tota_audio_dump.h rename to src/services/tota/app_tota_audio_dump.h diff --git a/services/tota/app_tota_cmd_code.h b/src/services/tota/app_tota_cmd_code.h similarity index 100% rename from services/tota/app_tota_cmd_code.h rename to src/services/tota/app_tota_cmd_code.h diff --git a/services/tota/app_tota_cmd_handler.cpp b/src/services/tota/app_tota_cmd_handler.cpp similarity index 100% rename from services/tota/app_tota_cmd_handler.cpp rename to src/services/tota/app_tota_cmd_handler.cpp diff --git a/services/tota/app_tota_cmd_handler.h b/src/services/tota/app_tota_cmd_handler.h similarity index 100% rename from services/tota/app_tota_cmd_handler.h rename to src/services/tota/app_tota_cmd_handler.h diff --git a/services/tota/app_tota_conn.cpp b/src/services/tota/app_tota_conn.cpp similarity index 100% rename from services/tota/app_tota_conn.cpp rename to src/services/tota/app_tota_conn.cpp diff --git a/services/tota/app_tota_conn.h b/src/services/tota/app_tota_conn.h similarity index 100% rename from services/tota/app_tota_conn.h rename to src/services/tota/app_tota_conn.h diff --git a/services/tota/app_tota_custom.cpp b/src/services/tota/app_tota_custom.cpp similarity index 100% rename from services/tota/app_tota_custom.cpp rename to src/services/tota/app_tota_custom.cpp diff --git a/services/tota/app_tota_custom.h b/src/services/tota/app_tota_custom.h similarity index 100% rename from services/tota/app_tota_custom.h rename to src/services/tota/app_tota_custom.h diff --git a/services/tota/app_tota_data_handler.cpp b/src/services/tota/app_tota_data_handler.cpp similarity index 100% rename from services/tota/app_tota_data_handler.cpp rename to src/services/tota/app_tota_data_handler.cpp diff --git a/services/tota/app_tota_data_handler.h b/src/services/tota/app_tota_data_handler.h similarity index 100% rename from services/tota/app_tota_data_handler.h rename to src/services/tota/app_tota_data_handler.h diff --git a/services/tota/app_tota_flash_program.cpp b/src/services/tota/app_tota_flash_program.cpp similarity index 100% rename from services/tota/app_tota_flash_program.cpp rename to src/services/tota/app_tota_flash_program.cpp diff --git a/services/tota/app_tota_flash_program.h b/src/services/tota/app_tota_flash_program.h similarity index 100% rename from services/tota/app_tota_flash_program.h rename to src/services/tota/app_tota_flash_program.h diff --git a/services/tota/app_tota_general.cpp b/src/services/tota/app_tota_general.cpp similarity index 100% rename from services/tota/app_tota_general.cpp rename to src/services/tota/app_tota_general.cpp diff --git a/services/tota/app_tota_general.h b/src/services/tota/app_tota_general.h similarity index 100% rename from services/tota/app_tota_general.h rename to src/services/tota/app_tota_general.h diff --git a/services/tota/app_tota_mic.cpp b/src/services/tota/app_tota_mic.cpp similarity index 100% rename from services/tota/app_tota_mic.cpp rename to src/services/tota/app_tota_mic.cpp diff --git a/services/tota/app_tota_mic.h b/src/services/tota/app_tota_mic.h similarity index 100% rename from services/tota/app_tota_mic.h rename to src/services/tota/app_tota_mic.h diff --git a/services/tota/tota_buffer_manager.cpp b/src/services/tota/tota_buffer_manager.cpp similarity index 100% rename from services/tota/tota_buffer_manager.cpp rename to src/services/tota/tota_buffer_manager.cpp diff --git a/services/tota/tota_buffer_manager.h b/src/services/tota/tota_buffer_manager.h similarity index 100% rename from services/tota/tota_buffer_manager.h rename to src/services/tota/tota_buffer_manager.h diff --git a/services/tota/tota_stream_data_transfer.cpp b/src/services/tota/tota_stream_data_transfer.cpp similarity index 100% rename from services/tota/tota_stream_data_transfer.cpp rename to src/services/tota/tota_stream_data_transfer.cpp diff --git a/services/tota/tota_stream_data_transfer.h b/src/services/tota/tota_stream_data_transfer.h similarity index 100% rename from services/tota/tota_stream_data_transfer.h rename to src/services/tota/tota_stream_data_transfer.h diff --git a/services/tota/tota_test.cpp b/src/services/tota/tota_test.cpp similarity index 100% rename from services/tota/tota_test.cpp rename to src/services/tota/tota_test.cpp diff --git a/thirdparty/Makefile b/src/thirdparty/Makefile similarity index 100% rename from thirdparty/Makefile rename to src/thirdparty/Makefile diff --git a/thirdparty/audio_codec_lib/Makefile b/src/thirdparty/audio_codec_lib/Makefile similarity index 100% rename from thirdparty/audio_codec_lib/Makefile rename to src/thirdparty/audio_codec_lib/Makefile diff --git a/thirdparty/audio_codec_lib/ldac/Makefile b/src/thirdparty/audio_codec_lib/ldac/Makefile similarity index 100% rename from thirdparty/audio_codec_lib/ldac/Makefile rename to src/thirdparty/audio_codec_lib/ldac/Makefile diff --git a/thirdparty/audio_codec_lib/ldac/inc/ldacBT.h b/src/thirdparty/audio_codec_lib/ldac/inc/ldacBT.h similarity index 100% rename from thirdparty/audio_codec_lib/ldac/inc/ldacBT.h rename to src/thirdparty/audio_codec_lib/ldac/inc/ldacBT.h diff --git a/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a b/src/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a similarity index 100% rename from thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a rename to src/thirdparty/audio_codec_lib/ldac/lib/ldac_lib.a diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/Makefile b/src/thirdparty/audio_codec_lib/liblhdc-dec/Makefile similarity index 100% rename from thirdparty/audio_codec_lib/liblhdc-dec/Makefile rename to src/thirdparty/audio_codec_lib/liblhdc-dec/Makefile diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/inc/lhdcUtil.h b/src/thirdparty/audio_codec_lib/liblhdc-dec/inc/lhdcUtil.h similarity index 100% rename from thirdparty/audio_codec_lib/liblhdc-dec/inc/lhdcUtil.h rename to src/thirdparty/audio_codec_lib/liblhdc-dec/inc/lhdcUtil.h diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a b/src/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a similarity index 100% rename from thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a rename to src/thirdparty/audio_codec_lib/liblhdc-dec/lib/BEST2300P_LibLHDC_V2_V3_3_1_0_SAVI_KEYPRO_UUID.a diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a b/src/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a similarity index 100% rename from thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a rename to src/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt.a diff --git a/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a b/src/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a similarity index 100% rename from thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a rename to src/thirdparty/audio_codec_lib/liblhdc-dec/lib/liblhdc-dec-best2300p_ibrt_anc.a diff --git a/thirdparty/demo_lib/Makefile b/src/thirdparty/demo_lib/Makefile similarity index 100% rename from thirdparty/demo_lib/Makefile rename to src/thirdparty/demo_lib/Makefile diff --git a/thirdparty/demo_lib/demo_lib.c b/src/thirdparty/demo_lib/demo_lib.c similarity index 100% rename from thirdparty/demo_lib/demo_lib.c rename to src/thirdparty/demo_lib/demo_lib.c diff --git a/thirdparty/demo_lib/demo_lib.h b/src/thirdparty/demo_lib/demo_lib.h similarity index 100% rename from thirdparty/demo_lib/demo_lib.h rename to src/thirdparty/demo_lib/demo_lib.h diff --git a/thirdparty/noise_tracker_lib/Makefile b/src/thirdparty/noise_tracker_lib/Makefile similarity index 100% rename from thirdparty/noise_tracker_lib/Makefile rename to src/thirdparty/noise_tracker_lib/Makefile diff --git a/thirdparty/noise_tracker_lib/noise_tracker.c b/src/thirdparty/noise_tracker_lib/noise_tracker.c similarity index 100% rename from thirdparty/noise_tracker_lib/noise_tracker.c rename to src/thirdparty/noise_tracker_lib/noise_tracker.c diff --git a/thirdparty/noise_tracker_lib/noise_tracker.h b/src/thirdparty/noise_tracker_lib/noise_tracker.h similarity index 100% rename from thirdparty/noise_tracker_lib/noise_tracker.h rename to src/thirdparty/noise_tracker_lib/noise_tracker.h diff --git a/thirdparty/userapi/Makefile b/src/thirdparty/userapi/Makefile similarity index 100% rename from thirdparty/userapi/Makefile rename to src/thirdparty/userapi/Makefile diff --git a/thirdparty/userapi/app_thirdparty.cpp b/src/thirdparty/userapi/app_thirdparty.cpp similarity index 100% rename from thirdparty/userapi/app_thirdparty.cpp rename to src/thirdparty/userapi/app_thirdparty.cpp diff --git a/thirdparty/userapi/app_thirdparty.h b/src/thirdparty/userapi/app_thirdparty.h similarity index 100% rename from thirdparty/userapi/app_thirdparty.h rename to src/thirdparty/userapi/app_thirdparty.h diff --git a/thirdparty/userapi/demo_app/LibDemo.cpp b/src/thirdparty/userapi/demo_app/LibDemo.cpp similarity index 100% rename from thirdparty/userapi/demo_app/LibDemo.cpp rename to src/thirdparty/userapi/demo_app/LibDemo.cpp diff --git a/thirdparty/userapi/demo_app/LibDemo.h b/src/thirdparty/userapi/demo_app/LibDemo.h similarity index 100% rename from thirdparty/userapi/demo_app/LibDemo.h rename to src/thirdparty/userapi/demo_app/LibDemo.h diff --git a/thirdparty/userapi/demo_app/Makefile b/src/thirdparty/userapi/demo_app/Makefile similarity index 100% rename from thirdparty/userapi/demo_app/Makefile rename to src/thirdparty/userapi/demo_app/Makefile diff --git a/thirdparty/userapi/noise_tracker_app/Makefile b/src/thirdparty/userapi/noise_tracker_app/Makefile similarity index 100% rename from thirdparty/userapi/noise_tracker_app/Makefile rename to src/thirdparty/userapi/noise_tracker_app/Makefile diff --git a/thirdparty/userapi/noise_tracker_app/NoiseTrackerDemo.cpp b/src/thirdparty/userapi/noise_tracker_app/NoiseTrackerDemo.cpp similarity index 100% rename from thirdparty/userapi/noise_tracker_app/NoiseTrackerDemo.cpp rename to src/thirdparty/userapi/noise_tracker_app/NoiseTrackerDemo.cpp diff --git a/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.c b/src/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.c similarity index 100% rename from thirdparty/userapi/noise_tracker_app/noise_tracker_callback.c rename to src/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.c diff --git a/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.h b/src/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.h similarity index 100% rename from thirdparty/userapi/noise_tracker_app/noise_tracker_callback.h rename to src/thirdparty/userapi/noise_tracker_app/noise_tracker_callback.h diff --git a/src/utils/CMakeLists.txt b/src/utils/CMakeLists.txt new file mode 100644 index 00000000..67d594e8 --- /dev/null +++ b/src/utils/CMakeLists.txt @@ -0,0 +1,19 @@ +add_subdirectory(boot_struct) +#add_subdirectory(build_info) +add_subdirectory(cqueue) +add_subdirectory(crash_catcher) +add_subdirectory(crc16) +add_subdirectory(crc32) +add_subdirectory(encrypt) +add_subdirectory(heap) +add_subdirectory(hexdump) +add_subdirectory(hwtimer_list) +add_subdirectory(intersyshci) +add_subdirectory(kfifo) +#add_subdirectory(libc) +add_subdirectory(list) +add_subdirectory(lockcqueue) +add_subdirectory(retention_ram) +#add_subdirectory(rom_utils) +#add_subdirectory(sha256) +add_subdirectory(xyzmodem) diff --git a/src/utils/boot_struct/CMakeLists.txt b/src/utils/boot_struct/CMakeLists.txt new file mode 100644 index 00000000..891d2a6b --- /dev/null +++ b/src/utils/boot_struct/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_boot_struct STATIC ${sources} ${headers}) +target_link_libraries(util_boot_struct platform_hal) +target_include_directories(util_boot_struct PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/utils/boot_struct/Makefile b/src/utils/boot_struct/Makefile similarity index 100% rename from utils/boot_struct/Makefile rename to src/utils/boot_struct/Makefile diff --git a/utils/boot_struct/boot_struct.c b/src/utils/boot_struct/boot_struct.c similarity index 100% rename from utils/boot_struct/boot_struct.c rename to src/utils/boot_struct/boot_struct.c diff --git a/utils/boot_struct/norflash_cfg.h b/src/utils/boot_struct/norflash_cfg.h similarity index 100% rename from utils/boot_struct/norflash_cfg.h rename to src/utils/boot_struct/norflash_cfg.h diff --git a/utils/boot_struct/reboot_param.h b/src/utils/boot_struct/reboot_param.h similarity index 100% rename from utils/boot_struct/reboot_param.h rename to src/utils/boot_struct/reboot_param.h diff --git a/utils/boot_struct/tool_msg.h b/src/utils/boot_struct/tool_msg.h similarity index 100% rename from utils/boot_struct/tool_msg.h rename to src/utils/boot_struct/tool_msg.h diff --git a/utils/build_info/build_info.c b/src/utils/build_info/build_info.c similarity index 100% rename from utils/build_info/build_info.c rename to src/utils/build_info/build_info.c diff --git a/src/utils/cqueue/CMakeLists.txt b/src/utils/cqueue/CMakeLists.txt new file mode 100644 index 00000000..38e3640b --- /dev/null +++ b/src/utils/cqueue/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_cqueue STATIC ${sources} ${headers}) +target_link_libraries(util_cqueue platform_cmsis) +target_include_directories(util_cqueue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/utils/cqueue/Makefile b/src/utils/cqueue/Makefile similarity index 100% rename from utils/cqueue/Makefile rename to src/utils/cqueue/Makefile diff --git a/utils/cqueue/cqueue.c b/src/utils/cqueue/cqueue.c similarity index 100% rename from utils/cqueue/cqueue.c rename to src/utils/cqueue/cqueue.c diff --git a/utils/cqueue/cqueue.h b/src/utils/cqueue/cqueue.h similarity index 100% rename from utils/cqueue/cqueue.h rename to src/utils/cqueue/cqueue.h diff --git a/src/utils/crash_catcher/CMakeLists.txt b/src/utils/crash_catcher/CMakeLists.txt new file mode 100644 index 00000000..6f0d2bba --- /dev/null +++ b/src/utils/crash_catcher/CMakeLists.txt @@ -0,0 +1,12 @@ +file (GLOB headers "*.h" "include/*.h") +file (GLOB sources "*.c*") + +set_property(SOURCE CrashCatcher_armv7m.S APPEND PROPERTY COMPILE_OPTIONS "-x" "assembler-with-cpp") +add_library (util_crash_catcher STATIC ${sources} ${headers} CrashCatcher_armv7m.S) +target_link_libraries(util_crash_catcher platform_cmsis utils_xyzmodem) +target_include_directories(util_crash_catcher PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include/) +target_include_directories(util_crash_catcher PRIVATE + ${CMAKE_SOURCE_DIR}/utils/libc/inc + ${CMAKE_SOURCE_DIR}/services/nv_section/log_section/ + ${CMAKE_SOURCE_DIR}/rtos/rtx/TARGET_CORTEX_M/ +) \ No newline at end of file diff --git a/utils/crash_catcher/CrashCatcher.c b/src/utils/crash_catcher/CrashCatcher.c similarity index 100% rename from utils/crash_catcher/CrashCatcher.c rename to src/utils/crash_catcher/CrashCatcher.c diff --git a/utils/crash_catcher/CrashCatcherPriv.h b/src/utils/crash_catcher/CrashCatcherPriv.h similarity index 100% rename from utils/crash_catcher/CrashCatcherPriv.h rename to src/utils/crash_catcher/CrashCatcherPriv.h diff --git a/utils/crash_catcher/CrashCatcher_armv7m.S b/src/utils/crash_catcher/CrashCatcher_armv7m.S similarity index 100% rename from utils/crash_catcher/CrashCatcher_armv7m.S rename to src/utils/crash_catcher/CrashCatcher_armv7m.S diff --git a/utils/crash_catcher/HexDump.c b/src/utils/crash_catcher/HexDump.c similarity index 100% rename from utils/crash_catcher/HexDump.c rename to src/utils/crash_catcher/HexDump.c diff --git a/utils/crash_catcher/Makefile b/src/utils/crash_catcher/Makefile similarity index 100% rename from utils/crash_catcher/Makefile rename to src/utils/crash_catcher/Makefile diff --git a/utils/crash_catcher/include/CrashCatcher.h b/src/utils/crash_catcher/include/CrashCatcher.h similarity index 100% rename from utils/crash_catcher/include/CrashCatcher.h rename to src/utils/crash_catcher/include/CrashCatcher.h diff --git a/utils/crash_catcher/include/CrashCatcherApi.h b/src/utils/crash_catcher/include/CrashCatcherApi.h similarity index 100% rename from utils/crash_catcher/include/CrashCatcherApi.h rename to src/utils/crash_catcher/include/CrashCatcherApi.h diff --git a/utils/crash_catcher/include/FloatMocks.h b/src/utils/crash_catcher/include/FloatMocks.h similarity index 100% rename from utils/crash_catcher/include/FloatMocks.h rename to src/utils/crash_catcher/include/FloatMocks.h diff --git a/src/utils/crc16/CMakeLists.txt b/src/utils/crc16/CMakeLists.txt new file mode 100644 index 00000000..21b52273 --- /dev/null +++ b/src/utils/crc16/CMakeLists.txt @@ -0,0 +1,2 @@ +add_library(util_crc16 STATIC "crc16.c" "crc16.h") +target_include_directories(util_crc16 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/utils/crc16/Makefile b/src/utils/crc16/Makefile similarity index 100% rename from utils/crc16/Makefile rename to src/utils/crc16/Makefile diff --git a/utils/crc16/crc16.c b/src/utils/crc16/crc16.c similarity index 100% rename from utils/crc16/crc16.c rename to src/utils/crc16/crc16.c diff --git a/utils/crc16/crc16.h b/src/utils/crc16/crc16.h similarity index 100% rename from utils/crc16/crc16.h rename to src/utils/crc16/crc16.h diff --git a/src/utils/crc32/CMakeLists.txt b/src/utils/crc32/CMakeLists.txt new file mode 100644 index 00000000..b10afe36 --- /dev/null +++ b/src/utils/crc32/CMakeLists.txt @@ -0,0 +1,12 @@ +set(sources "crc32.c") +if(CRC32_ROM) + set(sources "crc32_rom.c") +endif(CRC32_ROM) + + +add_library (util_crc32 STATIC ${sources} "crc32.h") +target_include_directories(util_crc32 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +if(CRC32_ROM) + target_link_libraries(util_crc32 util_rom_utils) +endif(CRC32_ROM) diff --git a/utils/crc32/Makefile b/src/utils/crc32/Makefile similarity index 100% rename from utils/crc32/Makefile rename to src/utils/crc32/Makefile diff --git a/utils/crc32/crc32.c b/src/utils/crc32/crc32.c similarity index 100% rename from utils/crc32/crc32.c rename to src/utils/crc32/crc32.c diff --git a/utils/crc32/crc32.h b/src/utils/crc32/crc32.h similarity index 100% rename from utils/crc32/crc32.h rename to src/utils/crc32/crc32.h diff --git a/utils/crc32/crc32_rom.c b/src/utils/crc32/crc32_rom.c similarity index 100% rename from utils/crc32/crc32_rom.c rename to src/utils/crc32/crc32_rom.c diff --git a/src/utils/encrypt/CMakeLists.txt b/src/utils/encrypt/CMakeLists.txt new file mode 100644 index 00000000..58bab55e --- /dev/null +++ b/src/utils/encrypt/CMakeLists.txt @@ -0,0 +1,12 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_encrypt STATIC ${sources} ${headers}) +target_link_libraries(util_encrypt apps_common util_cqueue) +target_include_directories(util_encrypt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(util_encrypt PRIVATE + ${CMAKE_SOURCE_DIR}/services/bt_profiles/inc/ + ${CMAKE_SOURCE_DIR}/services/bt_if/inc/ + ${CMAKE_SOURCE_DIR}/services/bt_app/ +) +target_link_libraries(util_encrypt ${CMAKE_CURRENT_SOURCE_DIR}/lib/libcryption.a) \ No newline at end of file diff --git a/utils/encrypt/Makefile b/src/utils/encrypt/Makefile similarity index 100% rename from utils/encrypt/Makefile rename to src/utils/encrypt/Makefile diff --git a/utils/encrypt/_sha256.h b/src/utils/encrypt/_sha256.h similarity index 100% rename from utils/encrypt/_sha256.h rename to src/utils/encrypt/_sha256.h diff --git a/utils/encrypt/aes.h b/src/utils/encrypt/aes.h similarity index 100% rename from utils/encrypt/aes.h rename to src/utils/encrypt/aes.h diff --git a/utils/encrypt/lib/libcryption.a b/src/utils/encrypt/lib/libcryption.a similarity index 100% rename from utils/encrypt/lib/libcryption.a rename to src/utils/encrypt/lib/libcryption.a diff --git a/utils/encrypt/types.h b/src/utils/encrypt/types.h similarity index 100% rename from utils/encrypt/types.h rename to src/utils/encrypt/types.h diff --git a/utils/encrypt/uECC.h b/src/utils/encrypt/uECC.h similarity index 100% rename from utils/encrypt/uECC.h rename to src/utils/encrypt/uECC.h diff --git a/utils/encrypt/uECC_vli.h b/src/utils/encrypt/uECC_vli.h similarity index 100% rename from utils/encrypt/uECC_vli.h rename to src/utils/encrypt/uECC_vli.h diff --git a/src/utils/heap/CMakeLists.txt b/src/utils/heap/CMakeLists.txt new file mode 100644 index 00000000..e139ca4f --- /dev/null +++ b/src/utils/heap/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_heap STATIC ${sources} ${headers}) +target_link_libraries(util_heap platform_cmsis) +target_include_directories(util_heap PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/utils/heap/Makefile b/src/utils/heap/Makefile similarity index 100% rename from utils/heap/Makefile rename to src/utils/heap/Makefile diff --git a/utils/heap/heap_api.c b/src/utils/heap/heap_api.c similarity index 100% rename from utils/heap/heap_api.c rename to src/utils/heap/heap_api.c diff --git a/utils/heap/heap_api.h b/src/utils/heap/heap_api.h similarity index 100% rename from utils/heap/heap_api.h rename to src/utils/heap/heap_api.h diff --git a/utils/heap/med_memory.h b/src/utils/heap/med_memory.h similarity index 100% rename from utils/heap/med_memory.h rename to src/utils/heap/med_memory.h diff --git a/utils/heap/multi_heap.c b/src/utils/heap/multi_heap.c similarity index 100% rename from utils/heap/multi_heap.c rename to src/utils/heap/multi_heap.c diff --git a/utils/heap/multi_heap.h b/src/utils/heap/multi_heap.h similarity index 100% rename from utils/heap/multi_heap.h rename to src/utils/heap/multi_heap.h diff --git a/utils/heap/multi_heap_internal.h b/src/utils/heap/multi_heap_internal.h similarity index 100% rename from utils/heap/multi_heap_internal.h rename to src/utils/heap/multi_heap_internal.h diff --git a/utils/heap/multi_heap_platform.h b/src/utils/heap/multi_heap_platform.h similarity index 100% rename from utils/heap/multi_heap_platform.h rename to src/utils/heap/multi_heap_platform.h diff --git a/utils/heap/pool_api.c b/src/utils/heap/pool_api.c similarity index 100% rename from utils/heap/pool_api.c rename to src/utils/heap/pool_api.c diff --git a/src/utils/hexdump/CMakeLists.txt b/src/utils/hexdump/CMakeLists.txt new file mode 100644 index 00000000..758d7e04 --- /dev/null +++ b/src/utils/hexdump/CMakeLists.txt @@ -0,0 +1,11 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_hexdump STATIC ${sources} ${headers}) + +if(NOT __ARM_EABI__) +target_link_libraries(util_hexdump platform_hal) +endif(NOT __ARM_EABI__) + +target_include_directories(util_hexdump PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(util_hexdump PRIVATE ${CMAKE_SOURCE_DIR}/hal/) \ No newline at end of file diff --git a/utils/hexdump/Makefile b/src/utils/hexdump/Makefile similarity index 100% rename from utils/hexdump/Makefile rename to src/utils/hexdump/Makefile diff --git a/utils/hexdump/hexdump.c b/src/utils/hexdump/hexdump.c similarity index 100% rename from utils/hexdump/hexdump.c rename to src/utils/hexdump/hexdump.c diff --git a/utils/hexdump/hexdump.h b/src/utils/hexdump/hexdump.h similarity index 100% rename from utils/hexdump/hexdump.h rename to src/utils/hexdump/hexdump.h diff --git a/src/utils/hwtimer_list/CMakeLists.txt b/src/utils/hwtimer_list/CMakeLists.txt new file mode 100644 index 00000000..2359d470 --- /dev/null +++ b/src/utils/hwtimer_list/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_hwtimer_list STATIC ${sources} ${headers}) +target_link_libraries(util_hwtimer_list platform_hal platform_cmsis) +target_include_directories(util_hwtimer_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/utils/hwtimer_list/Makefile b/src/utils/hwtimer_list/Makefile similarity index 100% rename from utils/hwtimer_list/Makefile rename to src/utils/hwtimer_list/Makefile diff --git a/utils/hwtimer_list/hwtimer_list.c b/src/utils/hwtimer_list/hwtimer_list.c similarity index 100% rename from utils/hwtimer_list/hwtimer_list.c rename to src/utils/hwtimer_list/hwtimer_list.c diff --git a/utils/hwtimer_list/hwtimer_list.h b/src/utils/hwtimer_list/hwtimer_list.h similarity index 100% rename from utils/hwtimer_list/hwtimer_list.h rename to src/utils/hwtimer_list/hwtimer_list.h diff --git a/src/utils/intersyshci/CMakeLists.txt b/src/utils/intersyshci/CMakeLists.txt new file mode 100644 index 00000000..f995010b --- /dev/null +++ b/src/utils/intersyshci/CMakeLists.txt @@ -0,0 +1,7 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_intersyshci STATIC ${sources} ${headers}) +target_link_libraries(util_intersyshci apps_common util_cqueue platform_drivers_bt services_bt_app) +target_link_libraries(util_intersyshci ${CMAKE_CURRENT_SOURCE_DIR}/lib/libintersyshci_enhanced_stack_RTX.a) +target_include_directories(util_hwtimer_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/utils/intersyshci/Makefile b/src/utils/intersyshci/Makefile similarity index 100% rename from utils/intersyshci/Makefile rename to src/utils/intersyshci/Makefile diff --git a/utils/intersyshci/intersyshci.h b/src/utils/intersyshci/intersyshci.h similarity index 100% rename from utils/intersyshci/intersyshci.h rename to src/utils/intersyshci/intersyshci.h diff --git a/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a b/src/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a similarity index 100% rename from utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a rename to src/utils/intersyshci/lib/libintersyshci_enhanced_stack_RTX.a diff --git a/utils/intersyshci/trans_adapt.h b/src/utils/intersyshci/trans_adapt.h similarity index 100% rename from utils/intersyshci/trans_adapt.h rename to src/utils/intersyshci/trans_adapt.h diff --git a/utils/intersyshci/trans_adapt_v1.h b/src/utils/intersyshci/trans_adapt_v1.h similarity index 100% rename from utils/intersyshci/trans_adapt_v1.h rename to src/utils/intersyshci/trans_adapt_v1.h diff --git a/utils/intersyshci/trans_adapt_v2.h b/src/utils/intersyshci/trans_adapt_v2.h similarity index 100% rename from utils/intersyshci/trans_adapt_v2.h rename to src/utils/intersyshci/trans_adapt_v2.h diff --git a/src/utils/kfifo/CMakeLists.txt b/src/utils/kfifo/CMakeLists.txt new file mode 100644 index 00000000..ac8bc768 --- /dev/null +++ b/src/utils/kfifo/CMakeLists.txt @@ -0,0 +1,26 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_compile_definitions( + TARGET_LPC1768=1 + WORDS_STACK_SIZE=1024 + OS_TIMERSTKSZ=1024 + __CORTEX_M4=1 +) + +add_library (util_kfifo STATIC ${sources} ${headers}) +target_link_libraries(util_kfifo platform_hal) +target_include_directories(util_kfifo PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_include_directories(util_kfifo PRIVATE + ${CMAKE_SOURCE_DIR}/mbed/api/ + ${CMAKE_SOURCE_DIR}/mbed/common/ + ${CMAKE_SOURCE_DIR}/mbed/targets/hal/TARGET_BEST/TARGET_BEST100X/TARGET_MBED_BEST1000/ + ${CMAKE_SOURCE_DIR}/cmsis/inc/ + ${CMAKE_SOURCE_DIR}/mbed/targets/hal/TARGET_BEST/TARGET_BEST100X/ + ${CMAKE_SOURCE_DIR}/mbed/hal/ + ${CMAKE_SOURCE_DIR}/fs/fat/ + ${CMAKE_SOURCE_DIR}/fs/sd/ + ${CMAKE_SOURCE_DIR}/fs/fat/ChaN/ + ${CMAKE_SOURCE_DIR}/rtos/rtos/ + ${CMAKE_SOURCE_DIR}/iabt/inc/ +) \ No newline at end of file diff --git a/utils/kfifo/Makefile b/src/utils/kfifo/Makefile similarity index 100% rename from utils/kfifo/Makefile rename to src/utils/kfifo/Makefile diff --git a/utils/kfifo/kfifo.c b/src/utils/kfifo/kfifo.c similarity index 100% rename from utils/kfifo/kfifo.c rename to src/utils/kfifo/kfifo.c diff --git a/utils/kfifo/kfifo.h b/src/utils/kfifo/kfifo.h similarity index 100% rename from utils/kfifo/kfifo.h rename to src/utils/kfifo/kfifo.h diff --git a/utils/libc/Makefile b/src/utils/libc/Makefile similarity index 100% rename from utils/libc/Makefile rename to src/utils/libc/Makefile diff --git a/utils/libc/inc/assert.h b/src/utils/libc/inc/assert.h similarity index 100% rename from utils/libc/inc/assert.h rename to src/utils/libc/inc/assert.h diff --git a/utils/libc/inc/ctype.h b/src/utils/libc/inc/ctype.h similarity index 100% rename from utils/libc/inc/ctype.h rename to src/utils/libc/inc/ctype.h diff --git a/utils/libc/inc/errno.h b/src/utils/libc/inc/errno.h similarity index 100% rename from utils/libc/inc/errno.h rename to src/utils/libc/inc/errno.h diff --git a/utils/libc/inc/stdarg.h b/src/utils/libc/inc/stdarg.h similarity index 100% rename from utils/libc/inc/stdarg.h rename to src/utils/libc/inc/stdarg.h diff --git a/utils/libc/inc/stdbool.h b/src/utils/libc/inc/stdbool.h similarity index 100% rename from utils/libc/inc/stdbool.h rename to src/utils/libc/inc/stdbool.h diff --git a/utils/libc/inc/stddef.h b/src/utils/libc/inc/stddef.h similarity index 100% rename from utils/libc/inc/stddef.h rename to src/utils/libc/inc/stddef.h diff --git a/utils/libc/inc/stdint.h b/src/utils/libc/inc/stdint.h similarity index 100% rename from utils/libc/inc/stdint.h rename to src/utils/libc/inc/stdint.h diff --git a/utils/libc/inc/stdio.h b/src/utils/libc/inc/stdio.h similarity index 100% rename from utils/libc/inc/stdio.h rename to src/utils/libc/inc/stdio.h diff --git a/utils/libc/inc/stdlib.h b/src/utils/libc/inc/stdlib.h similarity index 100% rename from utils/libc/inc/stdlib.h rename to src/utils/libc/inc/stdlib.h diff --git a/utils/libc/inc/string.h b/src/utils/libc/inc/string.h similarity index 100% rename from utils/libc/inc/string.h rename to src/utils/libc/inc/string.h diff --git a/utils/libc/libc_rom.c b/src/utils/libc/libc_rom.c similarity index 100% rename from utils/libc/libc_rom.c rename to src/utils/libc/libc_rom.c diff --git a/src/utils/list/CMakeLists.txt b/src/utils/list/CMakeLists.txt new file mode 100644 index 00000000..66fcbc7d --- /dev/null +++ b/src/utils/list/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_list STATIC ${sources} ${headers}) +target_include_directories(util_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) +target_link_libraries(util_list rtos) \ No newline at end of file diff --git a/utils/list/Makefile b/src/utils/list/Makefile similarity index 100% rename from utils/list/Makefile rename to src/utils/list/Makefile diff --git a/utils/list/list.c b/src/utils/list/list.c similarity index 100% rename from utils/list/list.c rename to src/utils/list/list.c diff --git a/utils/list/list.h b/src/utils/list/list.h similarity index 100% rename from utils/list/list.h rename to src/utils/list/list.h diff --git a/src/utils/lockcqueue/CMakeLists.txt b/src/utils/lockcqueue/CMakeLists.txt new file mode 100644 index 00000000..c2858f5a --- /dev/null +++ b/src/utils/lockcqueue/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_lockcqueue STATIC ${sources} ${headers}) +target_link_libraries(util_lockcqueue util_cqueue) +target_include_directories(util_lockcqueue PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/utils/lockcqueue/Makefile b/src/utils/lockcqueue/Makefile similarity index 100% rename from utils/lockcqueue/Makefile rename to src/utils/lockcqueue/Makefile diff --git a/utils/lockcqueue/lockcqueue.c b/src/utils/lockcqueue/lockcqueue.c similarity index 100% rename from utils/lockcqueue/lockcqueue.c rename to src/utils/lockcqueue/lockcqueue.c diff --git a/utils/lockcqueue/lockcqueue.h b/src/utils/lockcqueue/lockcqueue.h similarity index 100% rename from utils/lockcqueue/lockcqueue.h rename to src/utils/lockcqueue/lockcqueue.h diff --git a/src/utils/retention_ram/CMakeLists.txt b/src/utils/retention_ram/CMakeLists.txt new file mode 100644 index 00000000..c1b03490 --- /dev/null +++ b/src/utils/retention_ram/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_retention_ram STATIC ${sources} ${headers}) +target_link_libraries(util_retention_ram platform_hal) +target_include_directories(util_retention_ram PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/utils/retention_ram/Makefile b/src/utils/retention_ram/Makefile similarity index 100% rename from utils/retention_ram/Makefile rename to src/utils/retention_ram/Makefile diff --git a/utils/retention_ram/retention_ram.c b/src/utils/retention_ram/retention_ram.c similarity index 100% rename from utils/retention_ram/retention_ram.c rename to src/utils/retention_ram/retention_ram.c diff --git a/utils/retention_ram/retention_ram.h b/src/utils/retention_ram/retention_ram.h similarity index 100% rename from utils/retention_ram/retention_ram.h rename to src/utils/retention_ram/retention_ram.h diff --git a/utils/rom_utils/Makefile b/src/utils/rom_utils/Makefile similarity index 100% rename from utils/rom_utils/Makefile rename to src/utils/rom_utils/Makefile diff --git a/utils/rom_utils/export_fn_rom.h b/src/utils/rom_utils/export_fn_rom.h similarity index 100% rename from utils/rom_utils/export_fn_rom.h rename to src/utils/rom_utils/export_fn_rom.h diff --git a/src/utils/sha256/CMakeLists.txt b/src/utils/sha256/CMakeLists.txt new file mode 100644 index 00000000..09bf8cae --- /dev/null +++ b/src/utils/sha256/CMakeLists.txt @@ -0,0 +1,13 @@ +set(sources "sha256.c") +if(SHA256_ROM) + set(sources "sha256_rom.c") +endif(SHA256_ROM) + +add_library (util_sha256 STATIC ${sources} "sha256.h" "hash-internal.h") +target_include_directories(util_sha256 PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) + +target_link_libraries(util_sha256 platform_cmsis platform_hal) + +if(SHA256_ROM) + target_link_libraries(util_sha256 util_rom_utils) +endif(SHA256_ROM) diff --git a/utils/sha256/Makefile b/src/utils/sha256/Makefile similarity index 100% rename from utils/sha256/Makefile rename to src/utils/sha256/Makefile diff --git a/utils/sha256/hash-internal.h b/src/utils/sha256/hash-internal.h similarity index 100% rename from utils/sha256/hash-internal.h rename to src/utils/sha256/hash-internal.h diff --git a/utils/sha256/sha256.c b/src/utils/sha256/sha256.c similarity index 100% rename from utils/sha256/sha256.c rename to src/utils/sha256/sha256.c diff --git a/utils/sha256/sha256.h b/src/utils/sha256/sha256.h similarity index 100% rename from utils/sha256/sha256.h rename to src/utils/sha256/sha256.h diff --git a/utils/sha256/sha256_rom.c b/src/utils/sha256/sha256_rom.c similarity index 100% rename from utils/sha256/sha256_rom.c rename to src/utils/sha256/sha256_rom.c diff --git a/src/utils/xyzmodem/CMakeLists.txt b/src/utils/xyzmodem/CMakeLists.txt new file mode 100644 index 00000000..95d6ec41 --- /dev/null +++ b/src/utils/xyzmodem/CMakeLists.txt @@ -0,0 +1,6 @@ +file (GLOB headers "*.h") +file (GLOB sources "*.c*") + +add_library (util_xyzmodem STATIC ${sources} ${headers}) +target_link_libraries(util_xyzmodem platform_hal) +target_include_directories(util_xyzmodem PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/utils/xyzmodem/Makefile b/src/utils/xyzmodem/Makefile similarity index 100% rename from utils/xyzmodem/Makefile rename to src/utils/xyzmodem/Makefile diff --git a/utils/xyzmodem/xyzmodem.c b/src/utils/xyzmodem/xyzmodem.c similarity index 100% rename from utils/xyzmodem/xyzmodem.c rename to src/utils/xyzmodem/xyzmodem.c diff --git a/utils/xyzmodem/xyzmodem.h b/src/utils/xyzmodem/xyzmodem.h similarity index 100% rename from utils/xyzmodem/xyzmodem.h rename to src/utils/xyzmodem/xyzmodem.h