From 0a6e192810ff8bd1bfa653f383dc55039487756c Mon Sep 17 00:00:00 2001
From: Sandesh Venkatesh <sandesh.venkatesh@ittiam.com>
Date: Wed, 5 Mar 2025 10:56:41 +0530
Subject: [PATCH] Renaming all files with "_fx" suffix

---
 Workspace_msvc/lib_com.vcxproj                |  60 ++--
 Workspace_msvc/lib_com.vcxproj.filters        | 180 +++++-----
 Workspace_msvc/lib_dec.vcxproj                |  96 ++---
 Workspace_msvc/lib_dec.vcxproj.filters        | 288 +++++++--------
 Workspace_msvc/lib_enc.vcxproj                | 110 +++---
 Workspace_msvc/lib_enc.vcxproj.filters        | 330 +++++++++---------
 Workspace_msvc/lib_rend.vcxproj               |  76 ++--
 Workspace_msvc/lib_rend.vcxproj.filters       |  83 +++--
 lib_com/{ivas_arith.c => ivas_arith_fx.c}     |   0
 ...er_com.c => ivas_avq_pos_reorder_com_fx.c} |   0
 ...ivas_cov_smooth.c => ivas_cov_smooth_fx.c} |   0
 .../{ivas_dirac_com.c => ivas_dirac_com_fx.c} |   0
 ...ommon.c => ivas_entropy_coder_common_fx.c} |   0
 .../{ivas_fb_mixer.c => ivas_fb_mixer_fx.c}   |   0
 lib_com/{ivas_filters.c => ivas_filters_fx.c} |   0
 lib_com/{ivas_ism_com.c => ivas_ism_com_fx.c} |   0
 lib_com/{ivas_lfe_com.c => ivas_lfe_com_fx.c} |   0
 .../{ivas_masa_com.c => ivas_masa_com_fx.c}   |   0
 lib_com/{ivas_mc_com.c => ivas_mc_com_fx.c}   |   0
 ..._mc_param_com.c => ivas_mc_param_com_fx.c} |   0
 ...ivas_mcmasa_com.c => ivas_mcmasa_com-fx.c} |   0
 lib_com/{ivas_mct_com.c => ivas_mct_com_fx.c} |   0
 ...dct_core_com.c => ivas_mdct_core_com_fx.c} |   0
 ...ivas_mdft_imdft.c => ivas_mdft_imdft_fx.c} |   0
 .../{ivas_omasa_com.c => ivas_omasa_com_fx.c} |   0
 .../{ivas_pca_tools.c => ivas_pca_tools_fx.c} |   0
 ...metadata_com.c => ivas_qmetadata_com_fx.c} |   0
 ...herical_com.c => ivas_qspherical_com_fx.c} |   0
 ...ivas_sba_config.c => ivas_sba_config_fx.c} |   0
 .../{ivas_spar_com.c => ivas_spar_com_fx.c}   |   0
 ...t_util.c => ivas_spar_com_quant_util_fx.c} |   0
 ...reo_dft_com.c => ivas_stereo_dft_com_fx.c} |   0
 ..._com.c => ivas_stereo_mdct_bands_com_fx.c} |   0
 ...com.c => ivas_stereo_mdct_stereo_com_fx.c} |   0
 ...pc_com.c => ivas_stereo_psychlpc_com_fx.c} |   0
 ..._alloc.c => ivas_stereo_td_bit_alloc_fx.c} |   0
 lib_com/{ivas_tools.c => ivas_tools_fx.c}     |   0
 ...ransient_det.c => ivas_transient_det_fx.c} |   0
 ...ernal.c => ivas_binRenderer_internal_fx.c} |   0
 .../{ivas_core_dec.c => ivas_core_dec_fx.c}   |   0
 ...fig.c => ivas_corecoder_dec_reconfig_fx.c} |   0
 ...ix_dec.c => ivas_decision_matrix_dec_fx.c} |   0
 .../{ivas_dirac_dec.c => ivas_dirac_dec_fx.c} |   0
 ...c => ivas_dirac_output_synthesis_cov_fx.c} |   0
 ...py_decoder.c => ivas_entropy_decoder_fx.c} |   0
 lib_dec/{ivas_ism_dec.c => ivas_ism_dec_fx.c} |   0
 ...as_ism_dtx_dec.c => ivas_ism_dtx_dec_fx.c} |   0
 ...adata_dec.c => ivas_ism_metadata_dec_fx.c} |   0
 ...sm_param_dec.c => ivas_ism_param_dec_fx.c} |   0
 ..._ism_renderer.c => ivas_ism_renderer_fx.c} |   0
 lib_dec/{ivas_jbm_dec.c => ivas_jbm_dec_fx.c} |   0
 ...s_custom_dec.c => ivas_ls_custom_dec_fx.c} |   0
 .../{ivas_masa_dec.c => ivas_masa_dec_fx.c}   |   0
 ..._mc_param_dec.c => ivas_mc_param_dec_fx.c} |   0
 ...pmix_dec.c => ivas_mc_paramupmix_dec_fx.c} |   0
 ...ivas_mcmasa_dec.c => ivas_mcmasa_dec_fx.c} |   0
 ..._mct_core_dec.c => ivas_mct_core_dec_fx.c} |   0
 lib_dec/{ivas_mct_dec.c => ivas_mct_dec_fx.c} |   0
 ..._dec_mct_fx.c => ivas_mct_dec_mct_fx_fx.c} |   0
 ...dct_core_dec.c => ivas_mdct_core_dec_fx.c} |   0
 ...renderer.c => ivas_mono_dmx_renderer_fx.c} |   0
 ...al.c => ivas_objectRenderer_internal_fx.c} |   0
 .../{ivas_omasa_dec.c => ivas_omasa_dec_fx.c} |   0
 .../{ivas_osba_dec.c => ivas_osba_dec_fx.c}   |   0
 ...rsion.c => ivas_out_setup_conversion_fx.c} |   0
 ...utput_config.c => ivas_output_config_fx.c} |   0
 .../{ivas_post_proc.c => ivas_post_proc_fx.c} |   0
 ...metadata_dec.c => ivas_qmetadata_dec_fx.c} |   0
 ...herical_dec.c => ivas_qspherical_dec_fx.c} |   0
 ...ange_uni_dec.c => ivas_range_uni_dec_fx.c} |   0
 lib_dec/{ivas_sba_dec.c => ivas_sba_dec_fx.c} |   0
 ...nal.c => ivas_sba_rendering_internal_fx.c} |   0
 ..._spar_decoder.c => ivas_spar_decoder_fx.c} |   0
 ...as_spar_md_dec.c => ivas_spar_md_dec_fx.c} |   0
 ...GR_dec.c => ivas_stereo_adapt_GR_dec_fx.c} |   0
 ...dec_dmx.c => ivas_stereo_dft_dec_dmx_fx.c} |   0
 ...eclvq_dec.c => ivas_stereo_eclvq_dec_fx.c} |   0
 ...reo_esf_dec.c => ivas_stereo_esf_dec_fx.c} |   0
 ...reo_ica_dec.c => ivas_stereo_ica_dec_fx.c} |   0
 ...icbwe_dec.c => ivas_stereo_icbwe_dec_fx.c} |   0
 ...dec.c => ivas_stereo_mdct_stereo_dec_fx.c} |   0
 ...g_dec.c => ivas_stereo_switching_dec_fx.c} |   0
 ...tereo_td_dec.c => ivas_stereo_td_dec_fx.c} |   0
 lib_dec/{ivas_svd_dec.c => ivas_svd_dec_fx.c} |   0
 ..._tcx_core_dec.c => ivas_tcx_core_dec_fx.c} |   0
 ...w_rate_dec.c => ivas_td_low_rate_dec_fx.c} |   0
 lib_enc/{ivas_agc_enc.c => ivas_agc_enc_fx.c} |   0
 .../{ivas_core_enc.c => ivas_core_enc_fx.c}   |   0
 ..._front.c => ivas_core_pre_proc_front_fx.c} |   0
 ...ore_pre_proc.c => ivas_core_pre_proc_fx.c} |   0
 ...fig.c => ivas_corecoder_enc_reconfig_fx.c} |   0
 lib_enc/{ivas_cpe_enc.c => ivas_cpe_enc_fx.c} |   0
 ...ix_enc.c => ivas_decision_matrix_enc_fx.c} |   0
 .../{ivas_dirac_enc.c => ivas_dirac_enc_fx.c} |   0
 ...ov_handler.c => ivas_enc_cov_handler_fx.c} |   0
 lib_enc/{ivas_enc.c => ivas_enc_fx.c}         |   0
 ...ntropy_coder.c => ivas_entropy_coder_fx.c} |   0
 .../{ivas_front_vad.c => ivas_front_vad_fx.c} |   0
 .../{ivas_init_enc.c => ivas_init_enc_fx.c}   |   0
 ...as_ism_dtx_enc.c => ivas_ism_dtx_enc_fx.c} |   0
 lib_enc/{ivas_ism_enc.c => ivas_ism_enc_fx.c} |   0
 ...adata_enc.c => ivas_ism_metadata_enc_fx.c} |   0
 ...sm_param_enc.c => ivas_ism_param_enc_fx.c} |   0
 lib_enc/{ivas_lfe_enc.c => ivas_lfe_enc_fx.c} |   0
 .../{ivas_masa_enc.c => ivas_masa_enc_fx.c}   |   0
 ..._mc_param_enc.c => ivas_mc_param_enc_fx.c} |   0
 ...pmix_enc.c => ivas_mc_paramupmix_enc_fx.c} |   0
 ...ivas_mcmasa_enc.c => ivas_mcmasa_enc_fx.c} |   0
 ..._mct_core_enc.c => ivas_mct_core_enc_fx.c} |   0
 lib_enc/{ivas_mct_enc.c => ivas_mct_enc_fx.c} |   0
 ...as_mct_enc_mct.c => ivas_mct_enc_mct_fx.c} |   0
 ...dct_core_enc.c => ivas_mdct_core_enc_fx.c} |   0
 .../{ivas_omasa_enc.c => ivas_omasa_enc_fx.c} |   0
 .../{ivas_osba_enc.c => ivas_osba_enc_fx.c}   |   0
 lib_enc/{ivas_pca_enc.c => ivas_pca_enc_fx.c} |   0
 ...metadata_enc.c => ivas_qmetadata_enc_fx.c} |   0
 ...herical_enc.c => ivas_qspherical_enc_fx.c} |   0
 ...ange_uni_enc.c => ivas_range_uni_enc_fx.c} |   0
 lib_enc/{ivas_sba_enc.c => ivas_sba_enc_fx.c} |   0
 lib_enc/{ivas_sce_enc.c => ivas_sce_enc_fx.c} |   0
 lib_enc/{ivas_sns_enc.c => ivas_sns_enc_fx.c} |   0
 ..._spar_encoder.c => ivas_spar_encoder_fx.c} |   0
 ...as_spar_md_enc.c => ivas_spar_md_enc_fx.c} |   0
 ...GR_enc.c => ivas_stereo_adapt_GR_enc_fx.c} |   0
 ...assifier.c => ivas_stereo_classifier_fx.c} |   0
 ...reo_cng_enc.c => ivas_stereo_cng_enc_fx.c} |   0
 ...reo_dft_enc.c => ivas_stereo_dft_enc_fx.c} |   0
 ...enc_itd.c => ivas_stereo_dft_enc_itd_fx.c} |   0
 ...t_td_itd.c => ivas_stereo_dft_td_itd_fx.c} |   0
 ...reo_dmx_evs.c => ivas_stereo_dmx_evs_fx.c} |   0
 ...eclvq_enc.c => ivas_stereo_eclvq_enc_fx.c} |   0
 ...reo_ica_enc.c => ivas_stereo_ica_enc_fx.c} |   0
 ...icbwe_enc.c => ivas_stereo_icbwe_enc_fx.c} |   0
 ...e_enc.c => ivas_stereo_mdct_core_enc_fx.c} |   0
 ...gf_enc.c => ivas_stereo_mdct_igf_enc_fx.c} |   0
 ...enc.c => ivas_stereo_mdct_stereo_enc_fx.c} |   0
 ...g_enc.c => ivas_stereo_switching_enc_fx.c} |   0
 ...nalysis.c => ivas_stereo_td_analysis_fx.c} |   0
 ...tereo_td_enc.c => ivas_stereo_td_enc_fx.c} |   0
 ..._tcx_core_enc.c => ivas_tcx_core_enc_fx.c} |   0
 ...w_rate_enc.c => ivas_td_low_rate_enc_fx.c} |   0
 ...ivas_allrad_dec.c => ivas_allrad_dec_fx.c} |   0
 lib_rend/{ivas_crend.c => ivas_crend_fx.c}    |   0
 .../{ivas_dirac_ana.c => ivas_dirac_ana_fx.c} |   0
 ...=> ivas_dirac_dec_binaural_functions_fx.c} |   0
 ...ecorr_dec.c => ivas_dirac_decorr_dec_fx.c} |   0
 ...nsets_dec.c => ivas_dirac_onsets_dec_fx.c} |   0
 ...c => ivas_dirac_output_synthesis_dec_fx.c} |   0
 ...ivas_dirac_rend.c => ivas_dirac_rend_fx.c} |   0
 lib_rend/{ivas_efap.c => ivas_efap_fx.c}      |   0
 lib_rend/{ivas_hrtf.c => ivas_hrtf_fx.c}      |   0
 .../{ivas_limiter.c => ivas_limiter_fx.c}     |   0
 ...ivas_masa_merge.c => ivas_masa_merge_fx.c} |   0
 ...ivas_mcmasa_ana.c => ivas_mcmasa_ana_fx.c} |   0
 ...ectRenderer.c => ivas_objectRenderer_fx.c} |   0
 ...Filt.c => ivas_objectRenderer_hrFilt_fx.c} |   0
 ...rer_mix.c => ivas_objectRenderer_mix_fx.c} |   0
 ...rer_sfx.c => ivas_objectRenderer_sfx_fx.c} |   0
 ...ces.c => ivas_objectRenderer_sources_fx.c} |   0
 ...rer_vec.c => ivas_objectRenderer_vec_fx.c} |   0
 .../{ivas_omasa_ana.c => ivas_omasa_ana_fx.c} |   0
 ...ivas_orient_trk.c => ivas_orient_trk_fx.c} |   0
 ...as_reflections.c => ivas_reflections_fx.c} |   0
 ...ender_config.c => ivas_render_config_fx.c} |   0
 ...lay_line.c => ivas_reverb_delay_line_fx.c} |   0
 ...t_filter.c => ivas_reverb_fft_filter_fx.c} |   0
 ...esign.c => ivas_reverb_filter_design_fx.c} |   0
 lib_rend/{ivas_reverb.c => ivas_reverb_fx.c}  |   0
 ...r_filter.c => ivas_reverb_iir_filter_fx.c} |   0
 ..._reverb_utils.c => ivas_reverb_utils_fx.c} |   0
 ...rer.c => ivas_rom_TdBinauralRenderer_fx.c} |   0
 ...derer.c => ivas_rom_binauralRenderer_fx.c} |   0
 ...ad.c => ivas_rom_binaural_crend_head_fx.c} |   0
 .../{ivas_rom_rend.c => ivas_rom_rend_fx.c}   |   0
 .../{ivas_rotation.c => ivas_rotation_fx.c}   |   0
 ...ba_rendering.c => ivas_sba_rendering_fx.c} |   0
 .../{ivas_shoebox.c => ivas_shoebox_fx.c}     |   0
 .../{ivas_td_decorr.c => ivas_td_decorr_fx.c} |   0
 lib_rend/{ivas_vbap.c => ivas_vbap_fx.c}      |   0
 179 files changed, 610 insertions(+), 613 deletions(-)
 rename lib_com/{ivas_arith.c => ivas_arith_fx.c} (100%)
 rename lib_com/{ivas_avq_pos_reorder_com.c => ivas_avq_pos_reorder_com_fx.c} (100%)
 rename lib_com/{ivas_cov_smooth.c => ivas_cov_smooth_fx.c} (100%)
 rename lib_com/{ivas_dirac_com.c => ivas_dirac_com_fx.c} (100%)
 rename lib_com/{ivas_entropy_coder_common.c => ivas_entropy_coder_common_fx.c} (100%)
 rename lib_com/{ivas_fb_mixer.c => ivas_fb_mixer_fx.c} (100%)
 rename lib_com/{ivas_filters.c => ivas_filters_fx.c} (100%)
 rename lib_com/{ivas_ism_com.c => ivas_ism_com_fx.c} (100%)
 rename lib_com/{ivas_lfe_com.c => ivas_lfe_com_fx.c} (100%)
 rename lib_com/{ivas_masa_com.c => ivas_masa_com_fx.c} (100%)
 rename lib_com/{ivas_mc_com.c => ivas_mc_com_fx.c} (100%)
 rename lib_com/{ivas_mc_param_com.c => ivas_mc_param_com_fx.c} (100%)
 rename lib_com/{ivas_mcmasa_com.c => ivas_mcmasa_com-fx.c} (100%)
 rename lib_com/{ivas_mct_com.c => ivas_mct_com_fx.c} (100%)
 rename lib_com/{ivas_mdct_core_com.c => ivas_mdct_core_com_fx.c} (100%)
 rename lib_com/{ivas_mdft_imdft.c => ivas_mdft_imdft_fx.c} (100%)
 rename lib_com/{ivas_omasa_com.c => ivas_omasa_com_fx.c} (100%)
 rename lib_com/{ivas_pca_tools.c => ivas_pca_tools_fx.c} (100%)
 rename lib_com/{ivas_qmetadata_com.c => ivas_qmetadata_com_fx.c} (100%)
 rename lib_com/{ivas_qspherical_com.c => ivas_qspherical_com_fx.c} (100%)
 rename lib_com/{ivas_sba_config.c => ivas_sba_config_fx.c} (100%)
 rename lib_com/{ivas_spar_com.c => ivas_spar_com_fx.c} (100%)
 rename lib_com/{ivas_spar_com_quant_util.c => ivas_spar_com_quant_util_fx.c} (100%)
 rename lib_com/{ivas_stereo_dft_com.c => ivas_stereo_dft_com_fx.c} (100%)
 rename lib_com/{ivas_stereo_mdct_bands_com.c => ivas_stereo_mdct_bands_com_fx.c} (100%)
 rename lib_com/{ivas_stereo_mdct_stereo_com.c => ivas_stereo_mdct_stereo_com_fx.c} (100%)
 rename lib_com/{ivas_stereo_psychlpc_com.c => ivas_stereo_psychlpc_com_fx.c} (100%)
 rename lib_com/{ivas_stereo_td_bit_alloc.c => ivas_stereo_td_bit_alloc_fx.c} (100%)
 rename lib_com/{ivas_tools.c => ivas_tools_fx.c} (100%)
 rename lib_com/{ivas_transient_det.c => ivas_transient_det_fx.c} (100%)
 rename lib_dec/{ivas_binRenderer_internal.c => ivas_binRenderer_internal_fx.c} (100%)
 rename lib_dec/{ivas_core_dec.c => ivas_core_dec_fx.c} (100%)
 rename lib_dec/{ivas_corecoder_dec_reconfig.c => ivas_corecoder_dec_reconfig_fx.c} (100%)
 rename lib_dec/{ivas_decision_matrix_dec.c => ivas_decision_matrix_dec_fx.c} (100%)
 rename lib_dec/{ivas_dirac_dec.c => ivas_dirac_dec_fx.c} (100%)
 rename lib_dec/{ivas_dirac_output_synthesis_cov.c => ivas_dirac_output_synthesis_cov_fx.c} (100%)
 rename lib_dec/{ivas_entropy_decoder.c => ivas_entropy_decoder_fx.c} (100%)
 rename lib_dec/{ivas_ism_dec.c => ivas_ism_dec_fx.c} (100%)
 rename lib_dec/{ivas_ism_dtx_dec.c => ivas_ism_dtx_dec_fx.c} (100%)
 rename lib_dec/{ivas_ism_metadata_dec.c => ivas_ism_metadata_dec_fx.c} (100%)
 rename lib_dec/{ivas_ism_param_dec.c => ivas_ism_param_dec_fx.c} (100%)
 rename lib_dec/{ivas_ism_renderer.c => ivas_ism_renderer_fx.c} (100%)
 rename lib_dec/{ivas_jbm_dec.c => ivas_jbm_dec_fx.c} (100%)
 rename lib_dec/{ivas_ls_custom_dec.c => ivas_ls_custom_dec_fx.c} (100%)
 rename lib_dec/{ivas_masa_dec.c => ivas_masa_dec_fx.c} (100%)
 rename lib_dec/{ivas_mc_param_dec.c => ivas_mc_param_dec_fx.c} (100%)
 rename lib_dec/{ivas_mc_paramupmix_dec.c => ivas_mc_paramupmix_dec_fx.c} (100%)
 rename lib_dec/{ivas_mcmasa_dec.c => ivas_mcmasa_dec_fx.c} (100%)
 rename lib_dec/{ivas_mct_core_dec.c => ivas_mct_core_dec_fx.c} (100%)
 rename lib_dec/{ivas_mct_dec.c => ivas_mct_dec_fx.c} (100%)
 rename lib_dec/{ivas_mct_dec_mct_fx.c => ivas_mct_dec_mct_fx_fx.c} (100%)
 rename lib_dec/{ivas_mdct_core_dec.c => ivas_mdct_core_dec_fx.c} (100%)
 rename lib_dec/{ivas_mono_dmx_renderer.c => ivas_mono_dmx_renderer_fx.c} (100%)
 rename lib_dec/{ivas_objectRenderer_internal.c => ivas_objectRenderer_internal_fx.c} (100%)
 rename lib_dec/{ivas_omasa_dec.c => ivas_omasa_dec_fx.c} (100%)
 rename lib_dec/{ivas_osba_dec.c => ivas_osba_dec_fx.c} (100%)
 rename lib_dec/{ivas_out_setup_conversion.c => ivas_out_setup_conversion_fx.c} (100%)
 rename lib_dec/{ivas_output_config.c => ivas_output_config_fx.c} (100%)
 rename lib_dec/{ivas_post_proc.c => ivas_post_proc_fx.c} (100%)
 rename lib_dec/{ivas_qmetadata_dec.c => ivas_qmetadata_dec_fx.c} (100%)
 rename lib_dec/{ivas_qspherical_dec.c => ivas_qspherical_dec_fx.c} (100%)
 rename lib_dec/{ivas_range_uni_dec.c => ivas_range_uni_dec_fx.c} (100%)
 rename lib_dec/{ivas_sba_dec.c => ivas_sba_dec_fx.c} (100%)
 rename lib_dec/{ivas_sba_rendering_internal.c => ivas_sba_rendering_internal_fx.c} (100%)
 rename lib_dec/{ivas_spar_decoder.c => ivas_spar_decoder_fx.c} (100%)
 rename lib_dec/{ivas_spar_md_dec.c => ivas_spar_md_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_adapt_GR_dec.c => ivas_stereo_adapt_GR_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_dft_dec_dmx.c => ivas_stereo_dft_dec_dmx_fx.c} (100%)
 rename lib_dec/{ivas_stereo_eclvq_dec.c => ivas_stereo_eclvq_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_esf_dec.c => ivas_stereo_esf_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_ica_dec.c => ivas_stereo_ica_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_icbwe_dec.c => ivas_stereo_icbwe_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_mdct_stereo_dec.c => ivas_stereo_mdct_stereo_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_switching_dec.c => ivas_stereo_switching_dec_fx.c} (100%)
 rename lib_dec/{ivas_stereo_td_dec.c => ivas_stereo_td_dec_fx.c} (100%)
 rename lib_dec/{ivas_svd_dec.c => ivas_svd_dec_fx.c} (100%)
 rename lib_dec/{ivas_tcx_core_dec.c => ivas_tcx_core_dec_fx.c} (100%)
 rename lib_dec/{ivas_td_low_rate_dec.c => ivas_td_low_rate_dec_fx.c} (100%)
 rename lib_enc/{ivas_agc_enc.c => ivas_agc_enc_fx.c} (100%)
 rename lib_enc/{ivas_core_enc.c => ivas_core_enc_fx.c} (100%)
 rename lib_enc/{ivas_core_pre_proc_front.c => ivas_core_pre_proc_front_fx.c} (100%)
 rename lib_enc/{ivas_core_pre_proc.c => ivas_core_pre_proc_fx.c} (100%)
 rename lib_enc/{ivas_corecoder_enc_reconfig.c => ivas_corecoder_enc_reconfig_fx.c} (100%)
 rename lib_enc/{ivas_cpe_enc.c => ivas_cpe_enc_fx.c} (100%)
 rename lib_enc/{ivas_decision_matrix_enc.c => ivas_decision_matrix_enc_fx.c} (100%)
 rename lib_enc/{ivas_dirac_enc.c => ivas_dirac_enc_fx.c} (100%)
 rename lib_enc/{ivas_enc_cov_handler.c => ivas_enc_cov_handler_fx.c} (100%)
 rename lib_enc/{ivas_enc.c => ivas_enc_fx.c} (100%)
 rename lib_enc/{ivas_entropy_coder.c => ivas_entropy_coder_fx.c} (100%)
 rename lib_enc/{ivas_front_vad.c => ivas_front_vad_fx.c} (100%)
 rename lib_enc/{ivas_init_enc.c => ivas_init_enc_fx.c} (100%)
 rename lib_enc/{ivas_ism_dtx_enc.c => ivas_ism_dtx_enc_fx.c} (100%)
 rename lib_enc/{ivas_ism_enc.c => ivas_ism_enc_fx.c} (100%)
 rename lib_enc/{ivas_ism_metadata_enc.c => ivas_ism_metadata_enc_fx.c} (100%)
 rename lib_enc/{ivas_ism_param_enc.c => ivas_ism_param_enc_fx.c} (100%)
 rename lib_enc/{ivas_lfe_enc.c => ivas_lfe_enc_fx.c} (100%)
 rename lib_enc/{ivas_masa_enc.c => ivas_masa_enc_fx.c} (100%)
 rename lib_enc/{ivas_mc_param_enc.c => ivas_mc_param_enc_fx.c} (100%)
 rename lib_enc/{ivas_mc_paramupmix_enc.c => ivas_mc_paramupmix_enc_fx.c} (100%)
 rename lib_enc/{ivas_mcmasa_enc.c => ivas_mcmasa_enc_fx.c} (100%)
 rename lib_enc/{ivas_mct_core_enc.c => ivas_mct_core_enc_fx.c} (100%)
 rename lib_enc/{ivas_mct_enc.c => ivas_mct_enc_fx.c} (100%)
 rename lib_enc/{ivas_mct_enc_mct.c => ivas_mct_enc_mct_fx.c} (100%)
 rename lib_enc/{ivas_mdct_core_enc.c => ivas_mdct_core_enc_fx.c} (100%)
 rename lib_enc/{ivas_omasa_enc.c => ivas_omasa_enc_fx.c} (100%)
 rename lib_enc/{ivas_osba_enc.c => ivas_osba_enc_fx.c} (100%)
 rename lib_enc/{ivas_pca_enc.c => ivas_pca_enc_fx.c} (100%)
 rename lib_enc/{ivas_qmetadata_enc.c => ivas_qmetadata_enc_fx.c} (100%)
 rename lib_enc/{ivas_qspherical_enc.c => ivas_qspherical_enc_fx.c} (100%)
 rename lib_enc/{ivas_range_uni_enc.c => ivas_range_uni_enc_fx.c} (100%)
 rename lib_enc/{ivas_sba_enc.c => ivas_sba_enc_fx.c} (100%)
 rename lib_enc/{ivas_sce_enc.c => ivas_sce_enc_fx.c} (100%)
 rename lib_enc/{ivas_sns_enc.c => ivas_sns_enc_fx.c} (100%)
 rename lib_enc/{ivas_spar_encoder.c => ivas_spar_encoder_fx.c} (100%)
 rename lib_enc/{ivas_spar_md_enc.c => ivas_spar_md_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_adapt_GR_enc.c => ivas_stereo_adapt_GR_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_classifier.c => ivas_stereo_classifier_fx.c} (100%)
 rename lib_enc/{ivas_stereo_cng_enc.c => ivas_stereo_cng_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_dft_enc.c => ivas_stereo_dft_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_dft_enc_itd.c => ivas_stereo_dft_enc_itd_fx.c} (100%)
 rename lib_enc/{ivas_stereo_dft_td_itd.c => ivas_stereo_dft_td_itd_fx.c} (100%)
 rename lib_enc/{ivas_stereo_dmx_evs.c => ivas_stereo_dmx_evs_fx.c} (100%)
 rename lib_enc/{ivas_stereo_eclvq_enc.c => ivas_stereo_eclvq_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_ica_enc.c => ivas_stereo_ica_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_icbwe_enc.c => ivas_stereo_icbwe_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_mdct_core_enc.c => ivas_stereo_mdct_core_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_mdct_igf_enc.c => ivas_stereo_mdct_igf_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_mdct_stereo_enc.c => ivas_stereo_mdct_stereo_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_switching_enc.c => ivas_stereo_switching_enc_fx.c} (100%)
 rename lib_enc/{ivas_stereo_td_analysis.c => ivas_stereo_td_analysis_fx.c} (100%)
 rename lib_enc/{ivas_stereo_td_enc.c => ivas_stereo_td_enc_fx.c} (100%)
 rename lib_enc/{ivas_tcx_core_enc.c => ivas_tcx_core_enc_fx.c} (100%)
 rename lib_enc/{ivas_td_low_rate_enc.c => ivas_td_low_rate_enc_fx.c} (100%)
 rename lib_rend/{ivas_allrad_dec.c => ivas_allrad_dec_fx.c} (100%)
 rename lib_rend/{ivas_crend.c => ivas_crend_fx.c} (100%)
 rename lib_rend/{ivas_dirac_ana.c => ivas_dirac_ana_fx.c} (100%)
 rename lib_rend/{ivas_dirac_dec_binaural_functions.c => ivas_dirac_dec_binaural_functions_fx.c} (100%)
 rename lib_rend/{ivas_dirac_decorr_dec.c => ivas_dirac_decorr_dec_fx.c} (100%)
 rename lib_rend/{ivas_dirac_onsets_dec.c => ivas_dirac_onsets_dec_fx.c} (100%)
 rename lib_rend/{ivas_dirac_output_synthesis_dec.c => ivas_dirac_output_synthesis_dec_fx.c} (100%)
 rename lib_rend/{ivas_dirac_rend.c => ivas_dirac_rend_fx.c} (100%)
 rename lib_rend/{ivas_efap.c => ivas_efap_fx.c} (100%)
 rename lib_rend/{ivas_hrtf.c => ivas_hrtf_fx.c} (100%)
 rename lib_rend/{ivas_limiter.c => ivas_limiter_fx.c} (100%)
 rename lib_rend/{ivas_masa_merge.c => ivas_masa_merge_fx.c} (100%)
 rename lib_rend/{ivas_mcmasa_ana.c => ivas_mcmasa_ana_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer.c => ivas_objectRenderer_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer_hrFilt.c => ivas_objectRenderer_hrFilt_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer_mix.c => ivas_objectRenderer_mix_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer_sfx.c => ivas_objectRenderer_sfx_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer_sources.c => ivas_objectRenderer_sources_fx.c} (100%)
 rename lib_rend/{ivas_objectRenderer_vec.c => ivas_objectRenderer_vec_fx.c} (100%)
 rename lib_rend/{ivas_omasa_ana.c => ivas_omasa_ana_fx.c} (100%)
 rename lib_rend/{ivas_orient_trk.c => ivas_orient_trk_fx.c} (100%)
 rename lib_rend/{ivas_reflections.c => ivas_reflections_fx.c} (100%)
 rename lib_rend/{ivas_render_config.c => ivas_render_config_fx.c} (100%)
 rename lib_rend/{ivas_reverb_delay_line.c => ivas_reverb_delay_line_fx.c} (100%)
 rename lib_rend/{ivas_reverb_fft_filter.c => ivas_reverb_fft_filter_fx.c} (100%)
 rename lib_rend/{ivas_reverb_filter_design.c => ivas_reverb_filter_design_fx.c} (100%)
 rename lib_rend/{ivas_reverb.c => ivas_reverb_fx.c} (100%)
 rename lib_rend/{ivas_reverb_iir_filter.c => ivas_reverb_iir_filter_fx.c} (100%)
 rename lib_rend/{ivas_reverb_utils.c => ivas_reverb_utils_fx.c} (100%)
 rename lib_rend/{ivas_rom_TdBinauralRenderer.c => ivas_rom_TdBinauralRenderer_fx.c} (100%)
 rename lib_rend/{ivas_rom_binauralRenderer.c => ivas_rom_binauralRenderer_fx.c} (100%)
 rename lib_rend/{ivas_rom_binaural_crend_head.c => ivas_rom_binaural_crend_head_fx.c} (100%)
 rename lib_rend/{ivas_rom_rend.c => ivas_rom_rend_fx.c} (100%)
 rename lib_rend/{ivas_rotation.c => ivas_rotation_fx.c} (100%)
 rename lib_rend/{ivas_sba_rendering.c => ivas_sba_rendering_fx.c} (100%)
 rename lib_rend/{ivas_shoebox.c => ivas_shoebox_fx.c} (100%)
 rename lib_rend/{ivas_td_decorr.c => ivas_td_decorr_fx.c} (100%)
 rename lib_rend/{ivas_vbap.c => ivas_vbap_fx.c} (100%)

diff --git a/Workspace_msvc/lib_com.vcxproj b/Workspace_msvc/lib_com.vcxproj
index c88725ef0..8c42f19ca 100644
--- a/Workspace_msvc/lib_com.vcxproj
+++ b/Workspace_msvc/lib_com.vcxproj
@@ -200,42 +200,42 @@
     <ClCompile Include="..\lib_com\int_lsp.c" />
     <ClCompile Include="..\lib_com\isf_dec_amr_wb_fx.c" />
     <ClCompile Include="..\lib_com\ivas_agc_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_arith.c" />
-    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c" />
-    <ClCompile Include="..\lib_com\ivas_cov_smooth.c" />
-    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c" />
-    <ClCompile Include="..\lib_com\ivas_fb_mixer.c" />
-    <ClCompile Include="..\lib_com\ivas_filters.c" />
-    <ClCompile Include="..\lib_com\ivas_ism_com.c" />
-    <ClCompile Include="..\lib_com\ivas_lfe_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_dirac_com.c" />
-    <ClCompile Include="..\lib_com\ivas_masa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mct_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mc_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mc_param_com.c" />
-    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c" />
+    <ClCompile Include="..\lib_com\ivas_arith_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_filters_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c" />
+    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_mdct_imdct_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c" />
-    <ClCompile Include="..\lib_com\ivas_omasa_com.c" />
-    <ClCompile Include="..\lib_com\ivas_pca_tools.c" />
-    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c" />
-    <ClCompile Include="..\lib_com\ivas_qspherical_com.c" />
+    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_rom_com.c" />
     <ClCompile Include="..\lib_com\ivas_rom_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_sba_config.c" />
+    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c" />
     <ClCompile Include="..\lib_com\ivas_sns_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_spar_com.c" />
-    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c" />
+    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_stereo_eclvq_com_fx.c" />
     <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c" />
-    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c" />
-    <ClCompile Include="..\lib_com\ivas_tools.c" />
-    <ClCompile Include="..\lib_com\ivas_transient_det.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_tools_fx.c" />
+    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c" />
     <ClCompile Include="..\lib_com\lag_wind.c" />
     <ClCompile Include="..\lib_com\lerp.c" />
     <ClCompile Include="..\lib_com\limit_t0.c" />
diff --git a/Workspace_msvc/lib_com.vcxproj.filters b/Workspace_msvc/lib_com.vcxproj.filters
index c58edbff6..8f2be8853 100644
--- a/Workspace_msvc/lib_com.vcxproj.filters
+++ b/Workspace_msvc/lib_com.vcxproj.filters
@@ -1,81 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\lib_com\ivas_qmetadata_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_qspherical_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_sba_config.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mcmasa_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mc_param_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_dft_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_filters.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_cov_smooth.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_entropy_coder_common.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_fb_mixer.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_arith.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_transient_det.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdft_imdft.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_pca_tools.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_spar_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_ism_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_omasa_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_lfe_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_com\enh64.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
@@ -469,18 +394,6 @@
     <ClCompile Include="..\lib_com\ivas_agc_com_fx.c">
       <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_dirac_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_masa_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mct_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_mdct_core_com.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_com\ivas_rom_com.c">
       <Filter>common_ivas_c</Filter>
     </ClCompile>
@@ -493,9 +406,6 @@
     <ClCompile Include="..\lib_com\ivas_stereo_ica_com_fx.c">
       <Filter>common_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_com\ivas_tools.c">
-      <Filter>common_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_com\lag_wind.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
@@ -544,6 +454,96 @@
     <ClCompile Include="..\lib_com\parameter_bitmaping_fx.c">
       <Filter>common_all_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_arith_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_avq_pos_reorder_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_cov_smooth_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_entropy_coder_common_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_dirac_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_fb_mixer_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_filters_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_ism_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_lfe_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_masa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mc_param_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mcmasa_com-fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mct_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mdct_core_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_mdft_imdft_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_omasa_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_pca_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_qmetadata_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_qspherical_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_sba_config_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_spar_com_quant_util_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_dft_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_bands_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_mdct_stereo_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_psychlpc_com_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_stereo_td_bit_alloc_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_transient_det_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_com\ivas_tools_fx.c">
+      <Filter>common_ivas_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_com\basop_proto_func.h">
diff --git a/Workspace_msvc/lib_dec.vcxproj b/Workspace_msvc/lib_dec.vcxproj
index b3a847791..2d06d29aa 100644
--- a/Workspace_msvc/lib_dec.vcxproj
+++ b/Workspace_msvc/lib_dec.vcxproj
@@ -210,69 +210,69 @@
     <ClCompile Include="..\lib_dec\init_dec_fx.c" />
     <ClCompile Include="..\lib_dec\inov_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c" />
-    <ClCompile Include="..\lib_dec\ivas_core_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c" />
-    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c" />
+    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_init_dec.c" />
     <ClCompile Include="..\lib_dec\ivas_init_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_masa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c" />
-    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c" />
-    <ClCompile Include="..\lib_dec\ivas_osba_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_output_config.c" />
-    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c" />
+    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_masa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_osba_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_omasa_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_output_config_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_pca_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_post_proc.c" />
-    <ClCompile Include="..\lib_dec\ivas_range_uni_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_qspherical_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_post_proc_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_range_uni_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_qspherical_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_rom_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_sba_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal.c" />
+    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sce_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_decoder.c" />
-    <ClCompile Include="..\lib_dec\ivas_spar_md_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_spar_decoder_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_spar_md_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_cng_dec.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec_fx.c" />
     <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec_fx.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_svd_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c" />
-    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_svd_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec_fx.c" />
+    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec_fx.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4sb.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4_circularbuffer.c" />
     <ClCompile Include="..\lib_dec\jbm_jb4_inputbuffer.c" />
diff --git a/Workspace_msvc/lib_dec.vcxproj.filters b/Workspace_msvc/lib_dec.vcxproj.filters
index c4e148b89..8a4fc4605 100644
--- a/Workspace_msvc/lib_dec.vcxproj.filters
+++ b/Workspace_msvc/lib_dec.vcxproj.filters
@@ -71,195 +71,51 @@
     <ClCompile Include="..\lib_dec\ivas_agc_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_core_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_cpe_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_dirac_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_entropy_decoder.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_init_dec.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_init_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ism_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ism_param_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ism_renderer.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_jbm_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_lfe_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_lfe_plc_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_masa_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mc_param_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mct_core_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mct_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_omasa_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_osba_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_output_config.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_pca_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_post_proc.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_qspherical_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_range_uni_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_rom_dec.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_sba_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_sba_dirac_stereo_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_sce_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_sns_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_spar_decoder.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_spar_md_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_stereo_cng_dec.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_stereo_dft_plc_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ivas_stereo_mdct_core_dec_fx.c">
       <Filter>decoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_svd_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec.c">
-      <Filter>decoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_dec\ACcontextMapping_dec_fx.c">
       <Filter>decoder_all_c</Filter>
     </ClCompile>
@@ -518,6 +374,150 @@
     <ClCompile Include="..\lib_dec\vlpc_2st_dec_fx.c">
       <Filter>decoder_all_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_binRenderer_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_corecoder_dec_reconfig_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_decision_matrix_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_dirac_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_dirac_output_synthesis_cov_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_entropy_decoder_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_dtx_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_metadata_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_param_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ism_renderer_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_jbm_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_ls_custom_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_masa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mc_param_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mc_paramupmix_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mcmasa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mct_dec_mct_fx_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mdct_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_mono_dmx_renderer_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_objectRenderer_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_omasa_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_osba_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_out_setup_conversion_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_output_config_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_post_proc_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_qmetadata_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_qspherical_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_range_uni_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sba_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_sba_rendering_internal_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_spar_decoder_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_spar_md_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_adapt_GR_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_dft_dec_dmx_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_eclvq_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_esf_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_ica_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_icbwe_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_mdct_stereo_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_switching_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_stereo_td_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_svd_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_tcx_core_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_dec\ivas_td_low_rate_dec_fx.c">
+      <Filter>decoder_ivas_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_dec\lib_dec.h" />
diff --git a/Workspace_msvc/lib_enc.vcxproj b/Workspace_msvc/lib_enc.vcxproj
index 86e56d42a..86dcef905 100644
--- a/Workspace_msvc/lib_enc.vcxproj
+++ b/Workspace_msvc/lib_enc.vcxproj
@@ -215,64 +215,64 @@
     <ClCompile Include="..\lib_enc\init_enc_fx.c" />
     <ClCompile Include="..\lib_enc\inov_enc_fx.c" />
     <ClCompile Include="..\lib_enc\isf_enc_amr_wb_fx.c" />
-    <ClCompile Include="..\lib_enc\ivas_agc_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c" />
-    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c" />
-    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_osba_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_pca_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c" />
+    <ClCompile Include="..\lib_enc\ivas_agc_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_entropy_coder_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_lfe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mc_param_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_osba_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_omasa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_pca_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_range_uni_enc_fx.c" />
     <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c" />
-    <ClCompile Include="..\lib_enc\ivas_spar_encoder.c" />
-    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_classifier.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c" />
+    <ClCompile Include="..\lib_enc\ivas_spar_encoder_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_spar_md_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_classifier_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c" />
     <ClCompile Include="..\lib_enc\cod4t64_fast.c" />
     <ClCompile Include="..\lib_enc\igf_enc.c" />
     <ClCompile Include="..\lib_enc\igf_scf_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_cpe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_dirac_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_init_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_param_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_masa_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c" />
-    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_qspherical_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_sba_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_sce_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_front_vad.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c" />
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c" />
+    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_dirac_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_init_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_param_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_masa_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_qspherical_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_sba_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_sce_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_front_vad_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc_fx.c" />
+    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc_fx.c" />
     <ClCompile Include="..\lib_enc\lead_indexing_fx.c" />
     <ClCompile Include="..\lib_enc\lib_enc.c" />
     <ClCompile Include="..\lib_enc\long_enr_fx.c" />
@@ -319,7 +319,7 @@
     <ClCompile Include="..\lib_enc\swb_bwe_enc_lr_fx.c" />
     <ClCompile Include="..\lib_enc\nelp_enc_fx.c" />
     <ClCompile Include="..\lib_enc\rom_enc.c" />
-    <ClCompile Include="..\lib_enc\ivas_sns_enc.c" />
+    <ClCompile Include="..\lib_enc\ivas_sns_enc_fx.c" />
     <ClCompile Include="..\lib_enc\swb_pre_proc_fx.c" />
     <ClCompile Include="..\lib_enc\swb_tbe_enc_fx.c" />
     <ClCompile Include="..\lib_enc\tcq_core_enc_fx.c" />
diff --git a/Workspace_msvc/lib_enc.vcxproj.filters b/Workspace_msvc/lib_enc.vcxproj.filters
index 406c01b86..899097163 100644
--- a/Workspace_msvc/lib_enc.vcxproj.filters
+++ b/Workspace_msvc/lib_enc.vcxproj.filters
@@ -107,174 +107,9 @@
     <ClCompile Include="..\lib_enc\voiced_enc_fx.c">
       <Filter>encoder_evs_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_core_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_cpe_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_dirac_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_entropy_coder.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_front_vad.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_init_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_ism_param_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_lfe_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_masa_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mc_param_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_core_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_omasa_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_osba_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_pca_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_qspherical_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_range_uni_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_enc\ivas_rom_enc_fx.c">
       <Filter>encoder_ivas_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sba_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sce_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_sns_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_spar_encoder.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_spar_md_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_classifier.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
-    <ClCompile Include="..\lib_enc\ivas_agc_enc.c">
-      <Filter>encoder_ivas_c</Filter>
-    </ClCompile>
     <ClCompile Include="..\lib_enc\ACcontextMapping_enc_fx.c">
       <Filter>encoder_all_c</Filter>
     </ClCompile>
@@ -602,6 +437,171 @@
     <ClCompile Include="..\lib_enc\waveadjust_fec_cod_fx.c">
       <Filter>encoder_all_c</Filter>
     </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_agc_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_core_pre_proc_front_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_corecoder_enc_reconfig_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_cpe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_decision_matrix_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_dirac_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_enc_cov_handler_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_entropy_coder_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_front_vad_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_init_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_ism_dtx_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_ism_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_ism_metadata_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_ism_param_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_lfe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_masa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mc_param_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mc_paramupmix_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mcmasa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mct_enc_mct_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_mdct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_omasa_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_osba_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_pca_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_qmetadata_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_qspherical_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_range_uni_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_sba_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_sce_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_sns_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_spar_encoder_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_spar_md_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_adapt_GR_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_classifier_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_cng_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_enc_itd_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dft_td_itd_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_dmx_evs_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_eclvq_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_ica_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_icbwe_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_igf_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_mdct_stereo_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_switching_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_analysis_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_stereo_td_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_tcx_core_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
+    <ClCompile Include="..\lib_enc\ivas_td_low_rate_enc_fx.c">
+      <Filter>encoder_ivas_c</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\lib_enc\lib_enc.h" />
diff --git a/Workspace_msvc/lib_rend.vcxproj b/Workspace_msvc/lib_rend.vcxproj
index fa11b23be..1ffab139a 100644
--- a/Workspace_msvc/lib_rend.vcxproj
+++ b/Workspace_msvc/lib_rend.vcxproj
@@ -136,46 +136,46 @@
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_hrtf.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_rend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_hrtf_fx.c" />
     <ClCompile Include="..\lib_rend\ivas_output_init_fx.c" />
-    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c" />
-    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c" />
-    <ClCompile Include="..\lib_rend\ivas_crend.c" />
-    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_efap.c" />
-    <ClCompile Include="..\lib_rend\ivas_limiter.c" />
-    <ClCompile Include="..\lib_rend\ivas_masa_merge.c" />
-    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c" />
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c" />
-    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c" />
-    <ClCompile Include="..\lib_rend\ivas_orient_trk.c" />
+    <ClCompile Include="..\lib_rend\ivas_sba_rendering_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_allrad_dec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_crend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_dirac_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_efap_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_limiter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_masa_merge_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_omasa_ana_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_orient_trk_fx.c" />
     <ClCompile Include="..\lib_rend\ivas_output_init.c" />
-    <ClCompile Include="..\lib_rend\ivas_reflections.c" />
-    <ClCompile Include="..\lib_rend\ivas_render_config.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter.c" />
-    <ClCompile Include="..\lib_rend\ivas_reverb_utils.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c" />
-    <ClCompile Include="..\lib_rend\ivas_rotation.c" />
-    <ClCompile Include="..\lib_rend\ivas_rom_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_shoebox.c" />
-    <ClCompile Include="..\lib_rend\ivas_td_decorr.c" />
-    <ClCompile Include="..\lib_rend\ivas_vbap.c" />
+    <ClCompile Include="..\lib_rend\ivas_reflections_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_render_config_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_reverb_utils_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rotation_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c" />
+    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c" />
     <ClCompile Include="..\lib_rend\lib_rend.c" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Workspace_msvc/lib_rend.vcxproj.filters b/Workspace_msvc/lib_rend.vcxproj.filters
index 01f3dfb74..47b4fee01 100644
--- a/Workspace_msvc/lib_rend.vcxproj.filters
+++ b/Workspace_msvc/lib_rend.vcxproj.filters
@@ -2,124 +2,124 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\lib_rend\lib_rend.c" />
-    <ClCompile Include="..\lib_rend\ivas_allrad_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_output_init.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_crend.c">
+    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_allrad_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions.c">
+    <ClCompile Include="..\lib_rend\ivas_crend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_dec_binaural_functions_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_decorr_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_dirac_rend.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_onsets_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_efap.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_output_synthesis_dec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_hrtf.c">
+    <ClCompile Include="..\lib_rend\ivas_dirac_rend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_limiter.c">
+    <ClCompile Include="..\lib_rend\ivas_efap_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_masa_merge.c">
+    <ClCompile Include="..\lib_rend\ivas_hrtf_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_limiter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_masa_merge_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt.c">
+    <ClCompile Include="..\lib_rend\ivas_mcmasa_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_hrFilt_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_mix_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sfx_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_omasa_ana.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_sources_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_orient_trk.c">
+    <ClCompile Include="..\lib_rend\ivas_objectRenderer_vec_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_output_init.c">
+    <ClCompile Include="..\lib_rend\ivas_omasa_ana_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_render_config.c">
+    <ClCompile Include="..\lib_rend\ivas_orient_trk_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb.c">
+    <ClCompile Include="..\lib_rend\ivas_reflections_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line.c">
+    <ClCompile Include="..\lib_rend\ivas_render_config_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_delay_line_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_fft_filter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reverb_utils.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_filter_design_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_iir_filter_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_reverb_utils_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_rend.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_binaural_crend_head_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_binauralRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_rotation.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_rend_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_sba_rendering.c">
+    <ClCompile Include="..\lib_rend\ivas_rom_TdBinauralRenderer_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_shoebox.c">
+    <ClCompile Include="..\lib_rend\ivas_rotation_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_reflections.c">
+    <ClCompile Include="..\lib_rend\ivas_sba_rendering_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_vbap.c">
+    <ClCompile Include="..\lib_rend\ivas_shoebox_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_td_decorr.c">
+    <ClCompile Include="..\lib_rend\ivas_td_decorr_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
-    <ClCompile Include="..\lib_rend\ivas_output_init_fx.c">
+    <ClCompile Include="..\lib_rend\ivas_vbap_fx.c">
       <Filter>rend_c</Filter>
     </ClCompile>
   </ItemGroup>
@@ -143,9 +143,6 @@
     <ClInclude Include="..\lib_rend\ivas_rom_TdBinauralRenderer.h">
       <Filter>rend_h</Filter>
     </ClInclude>
-    <ClInclude Include="..\lib_rend\ivas_lcld_prot.h">
-      <Filter>rend_h</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="rend_h">
diff --git a/lib_com/ivas_arith.c b/lib_com/ivas_arith_fx.c
similarity index 100%
rename from lib_com/ivas_arith.c
rename to lib_com/ivas_arith_fx.c
diff --git a/lib_com/ivas_avq_pos_reorder_com.c b/lib_com/ivas_avq_pos_reorder_com_fx.c
similarity index 100%
rename from lib_com/ivas_avq_pos_reorder_com.c
rename to lib_com/ivas_avq_pos_reorder_com_fx.c
diff --git a/lib_com/ivas_cov_smooth.c b/lib_com/ivas_cov_smooth_fx.c
similarity index 100%
rename from lib_com/ivas_cov_smooth.c
rename to lib_com/ivas_cov_smooth_fx.c
diff --git a/lib_com/ivas_dirac_com.c b/lib_com/ivas_dirac_com_fx.c
similarity index 100%
rename from lib_com/ivas_dirac_com.c
rename to lib_com/ivas_dirac_com_fx.c
diff --git a/lib_com/ivas_entropy_coder_common.c b/lib_com/ivas_entropy_coder_common_fx.c
similarity index 100%
rename from lib_com/ivas_entropy_coder_common.c
rename to lib_com/ivas_entropy_coder_common_fx.c
diff --git a/lib_com/ivas_fb_mixer.c b/lib_com/ivas_fb_mixer_fx.c
similarity index 100%
rename from lib_com/ivas_fb_mixer.c
rename to lib_com/ivas_fb_mixer_fx.c
diff --git a/lib_com/ivas_filters.c b/lib_com/ivas_filters_fx.c
similarity index 100%
rename from lib_com/ivas_filters.c
rename to lib_com/ivas_filters_fx.c
diff --git a/lib_com/ivas_ism_com.c b/lib_com/ivas_ism_com_fx.c
similarity index 100%
rename from lib_com/ivas_ism_com.c
rename to lib_com/ivas_ism_com_fx.c
diff --git a/lib_com/ivas_lfe_com.c b/lib_com/ivas_lfe_com_fx.c
similarity index 100%
rename from lib_com/ivas_lfe_com.c
rename to lib_com/ivas_lfe_com_fx.c
diff --git a/lib_com/ivas_masa_com.c b/lib_com/ivas_masa_com_fx.c
similarity index 100%
rename from lib_com/ivas_masa_com.c
rename to lib_com/ivas_masa_com_fx.c
diff --git a/lib_com/ivas_mc_com.c b/lib_com/ivas_mc_com_fx.c
similarity index 100%
rename from lib_com/ivas_mc_com.c
rename to lib_com/ivas_mc_com_fx.c
diff --git a/lib_com/ivas_mc_param_com.c b/lib_com/ivas_mc_param_com_fx.c
similarity index 100%
rename from lib_com/ivas_mc_param_com.c
rename to lib_com/ivas_mc_param_com_fx.c
diff --git a/lib_com/ivas_mcmasa_com.c b/lib_com/ivas_mcmasa_com-fx.c
similarity index 100%
rename from lib_com/ivas_mcmasa_com.c
rename to lib_com/ivas_mcmasa_com-fx.c
diff --git a/lib_com/ivas_mct_com.c b/lib_com/ivas_mct_com_fx.c
similarity index 100%
rename from lib_com/ivas_mct_com.c
rename to lib_com/ivas_mct_com_fx.c
diff --git a/lib_com/ivas_mdct_core_com.c b/lib_com/ivas_mdct_core_com_fx.c
similarity index 100%
rename from lib_com/ivas_mdct_core_com.c
rename to lib_com/ivas_mdct_core_com_fx.c
diff --git a/lib_com/ivas_mdft_imdft.c b/lib_com/ivas_mdft_imdft_fx.c
similarity index 100%
rename from lib_com/ivas_mdft_imdft.c
rename to lib_com/ivas_mdft_imdft_fx.c
diff --git a/lib_com/ivas_omasa_com.c b/lib_com/ivas_omasa_com_fx.c
similarity index 100%
rename from lib_com/ivas_omasa_com.c
rename to lib_com/ivas_omasa_com_fx.c
diff --git a/lib_com/ivas_pca_tools.c b/lib_com/ivas_pca_tools_fx.c
similarity index 100%
rename from lib_com/ivas_pca_tools.c
rename to lib_com/ivas_pca_tools_fx.c
diff --git a/lib_com/ivas_qmetadata_com.c b/lib_com/ivas_qmetadata_com_fx.c
similarity index 100%
rename from lib_com/ivas_qmetadata_com.c
rename to lib_com/ivas_qmetadata_com_fx.c
diff --git a/lib_com/ivas_qspherical_com.c b/lib_com/ivas_qspherical_com_fx.c
similarity index 100%
rename from lib_com/ivas_qspherical_com.c
rename to lib_com/ivas_qspherical_com_fx.c
diff --git a/lib_com/ivas_sba_config.c b/lib_com/ivas_sba_config_fx.c
similarity index 100%
rename from lib_com/ivas_sba_config.c
rename to lib_com/ivas_sba_config_fx.c
diff --git a/lib_com/ivas_spar_com.c b/lib_com/ivas_spar_com_fx.c
similarity index 100%
rename from lib_com/ivas_spar_com.c
rename to lib_com/ivas_spar_com_fx.c
diff --git a/lib_com/ivas_spar_com_quant_util.c b/lib_com/ivas_spar_com_quant_util_fx.c
similarity index 100%
rename from lib_com/ivas_spar_com_quant_util.c
rename to lib_com/ivas_spar_com_quant_util_fx.c
diff --git a/lib_com/ivas_stereo_dft_com.c b/lib_com/ivas_stereo_dft_com_fx.c
similarity index 100%
rename from lib_com/ivas_stereo_dft_com.c
rename to lib_com/ivas_stereo_dft_com_fx.c
diff --git a/lib_com/ivas_stereo_mdct_bands_com.c b/lib_com/ivas_stereo_mdct_bands_com_fx.c
similarity index 100%
rename from lib_com/ivas_stereo_mdct_bands_com.c
rename to lib_com/ivas_stereo_mdct_bands_com_fx.c
diff --git a/lib_com/ivas_stereo_mdct_stereo_com.c b/lib_com/ivas_stereo_mdct_stereo_com_fx.c
similarity index 100%
rename from lib_com/ivas_stereo_mdct_stereo_com.c
rename to lib_com/ivas_stereo_mdct_stereo_com_fx.c
diff --git a/lib_com/ivas_stereo_psychlpc_com.c b/lib_com/ivas_stereo_psychlpc_com_fx.c
similarity index 100%
rename from lib_com/ivas_stereo_psychlpc_com.c
rename to lib_com/ivas_stereo_psychlpc_com_fx.c
diff --git a/lib_com/ivas_stereo_td_bit_alloc.c b/lib_com/ivas_stereo_td_bit_alloc_fx.c
similarity index 100%
rename from lib_com/ivas_stereo_td_bit_alloc.c
rename to lib_com/ivas_stereo_td_bit_alloc_fx.c
diff --git a/lib_com/ivas_tools.c b/lib_com/ivas_tools_fx.c
similarity index 100%
rename from lib_com/ivas_tools.c
rename to lib_com/ivas_tools_fx.c
diff --git a/lib_com/ivas_transient_det.c b/lib_com/ivas_transient_det_fx.c
similarity index 100%
rename from lib_com/ivas_transient_det.c
rename to lib_com/ivas_transient_det_fx.c
diff --git a/lib_dec/ivas_binRenderer_internal.c b/lib_dec/ivas_binRenderer_internal_fx.c
similarity index 100%
rename from lib_dec/ivas_binRenderer_internal.c
rename to lib_dec/ivas_binRenderer_internal_fx.c
diff --git a/lib_dec/ivas_core_dec.c b/lib_dec/ivas_core_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_core_dec.c
rename to lib_dec/ivas_core_dec_fx.c
diff --git a/lib_dec/ivas_corecoder_dec_reconfig.c b/lib_dec/ivas_corecoder_dec_reconfig_fx.c
similarity index 100%
rename from lib_dec/ivas_corecoder_dec_reconfig.c
rename to lib_dec/ivas_corecoder_dec_reconfig_fx.c
diff --git a/lib_dec/ivas_decision_matrix_dec.c b/lib_dec/ivas_decision_matrix_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_decision_matrix_dec.c
rename to lib_dec/ivas_decision_matrix_dec_fx.c
diff --git a/lib_dec/ivas_dirac_dec.c b/lib_dec/ivas_dirac_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_dirac_dec.c
rename to lib_dec/ivas_dirac_dec_fx.c
diff --git a/lib_dec/ivas_dirac_output_synthesis_cov.c b/lib_dec/ivas_dirac_output_synthesis_cov_fx.c
similarity index 100%
rename from lib_dec/ivas_dirac_output_synthesis_cov.c
rename to lib_dec/ivas_dirac_output_synthesis_cov_fx.c
diff --git a/lib_dec/ivas_entropy_decoder.c b/lib_dec/ivas_entropy_decoder_fx.c
similarity index 100%
rename from lib_dec/ivas_entropy_decoder.c
rename to lib_dec/ivas_entropy_decoder_fx.c
diff --git a/lib_dec/ivas_ism_dec.c b/lib_dec/ivas_ism_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_ism_dec.c
rename to lib_dec/ivas_ism_dec_fx.c
diff --git a/lib_dec/ivas_ism_dtx_dec.c b/lib_dec/ivas_ism_dtx_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_ism_dtx_dec.c
rename to lib_dec/ivas_ism_dtx_dec_fx.c
diff --git a/lib_dec/ivas_ism_metadata_dec.c b/lib_dec/ivas_ism_metadata_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_ism_metadata_dec.c
rename to lib_dec/ivas_ism_metadata_dec_fx.c
diff --git a/lib_dec/ivas_ism_param_dec.c b/lib_dec/ivas_ism_param_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_ism_param_dec.c
rename to lib_dec/ivas_ism_param_dec_fx.c
diff --git a/lib_dec/ivas_ism_renderer.c b/lib_dec/ivas_ism_renderer_fx.c
similarity index 100%
rename from lib_dec/ivas_ism_renderer.c
rename to lib_dec/ivas_ism_renderer_fx.c
diff --git a/lib_dec/ivas_jbm_dec.c b/lib_dec/ivas_jbm_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_jbm_dec.c
rename to lib_dec/ivas_jbm_dec_fx.c
diff --git a/lib_dec/ivas_ls_custom_dec.c b/lib_dec/ivas_ls_custom_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_ls_custom_dec.c
rename to lib_dec/ivas_ls_custom_dec_fx.c
diff --git a/lib_dec/ivas_masa_dec.c b/lib_dec/ivas_masa_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_masa_dec.c
rename to lib_dec/ivas_masa_dec_fx.c
diff --git a/lib_dec/ivas_mc_param_dec.c b/lib_dec/ivas_mc_param_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mc_param_dec.c
rename to lib_dec/ivas_mc_param_dec_fx.c
diff --git a/lib_dec/ivas_mc_paramupmix_dec.c b/lib_dec/ivas_mc_paramupmix_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mc_paramupmix_dec.c
rename to lib_dec/ivas_mc_paramupmix_dec_fx.c
diff --git a/lib_dec/ivas_mcmasa_dec.c b/lib_dec/ivas_mcmasa_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mcmasa_dec.c
rename to lib_dec/ivas_mcmasa_dec_fx.c
diff --git a/lib_dec/ivas_mct_core_dec.c b/lib_dec/ivas_mct_core_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mct_core_dec.c
rename to lib_dec/ivas_mct_core_dec_fx.c
diff --git a/lib_dec/ivas_mct_dec.c b/lib_dec/ivas_mct_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mct_dec.c
rename to lib_dec/ivas_mct_dec_fx.c
diff --git a/lib_dec/ivas_mct_dec_mct_fx.c b/lib_dec/ivas_mct_dec_mct_fx_fx.c
similarity index 100%
rename from lib_dec/ivas_mct_dec_mct_fx.c
rename to lib_dec/ivas_mct_dec_mct_fx_fx.c
diff --git a/lib_dec/ivas_mdct_core_dec.c b/lib_dec/ivas_mdct_core_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_mdct_core_dec.c
rename to lib_dec/ivas_mdct_core_dec_fx.c
diff --git a/lib_dec/ivas_mono_dmx_renderer.c b/lib_dec/ivas_mono_dmx_renderer_fx.c
similarity index 100%
rename from lib_dec/ivas_mono_dmx_renderer.c
rename to lib_dec/ivas_mono_dmx_renderer_fx.c
diff --git a/lib_dec/ivas_objectRenderer_internal.c b/lib_dec/ivas_objectRenderer_internal_fx.c
similarity index 100%
rename from lib_dec/ivas_objectRenderer_internal.c
rename to lib_dec/ivas_objectRenderer_internal_fx.c
diff --git a/lib_dec/ivas_omasa_dec.c b/lib_dec/ivas_omasa_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_omasa_dec.c
rename to lib_dec/ivas_omasa_dec_fx.c
diff --git a/lib_dec/ivas_osba_dec.c b/lib_dec/ivas_osba_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_osba_dec.c
rename to lib_dec/ivas_osba_dec_fx.c
diff --git a/lib_dec/ivas_out_setup_conversion.c b/lib_dec/ivas_out_setup_conversion_fx.c
similarity index 100%
rename from lib_dec/ivas_out_setup_conversion.c
rename to lib_dec/ivas_out_setup_conversion_fx.c
diff --git a/lib_dec/ivas_output_config.c b/lib_dec/ivas_output_config_fx.c
similarity index 100%
rename from lib_dec/ivas_output_config.c
rename to lib_dec/ivas_output_config_fx.c
diff --git a/lib_dec/ivas_post_proc.c b/lib_dec/ivas_post_proc_fx.c
similarity index 100%
rename from lib_dec/ivas_post_proc.c
rename to lib_dec/ivas_post_proc_fx.c
diff --git a/lib_dec/ivas_qmetadata_dec.c b/lib_dec/ivas_qmetadata_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_qmetadata_dec.c
rename to lib_dec/ivas_qmetadata_dec_fx.c
diff --git a/lib_dec/ivas_qspherical_dec.c b/lib_dec/ivas_qspherical_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_qspherical_dec.c
rename to lib_dec/ivas_qspherical_dec_fx.c
diff --git a/lib_dec/ivas_range_uni_dec.c b/lib_dec/ivas_range_uni_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_range_uni_dec.c
rename to lib_dec/ivas_range_uni_dec_fx.c
diff --git a/lib_dec/ivas_sba_dec.c b/lib_dec/ivas_sba_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_sba_dec.c
rename to lib_dec/ivas_sba_dec_fx.c
diff --git a/lib_dec/ivas_sba_rendering_internal.c b/lib_dec/ivas_sba_rendering_internal_fx.c
similarity index 100%
rename from lib_dec/ivas_sba_rendering_internal.c
rename to lib_dec/ivas_sba_rendering_internal_fx.c
diff --git a/lib_dec/ivas_spar_decoder.c b/lib_dec/ivas_spar_decoder_fx.c
similarity index 100%
rename from lib_dec/ivas_spar_decoder.c
rename to lib_dec/ivas_spar_decoder_fx.c
diff --git a/lib_dec/ivas_spar_md_dec.c b/lib_dec/ivas_spar_md_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_spar_md_dec.c
rename to lib_dec/ivas_spar_md_dec_fx.c
diff --git a/lib_dec/ivas_stereo_adapt_GR_dec.c b/lib_dec/ivas_stereo_adapt_GR_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_adapt_GR_dec.c
rename to lib_dec/ivas_stereo_adapt_GR_dec_fx.c
diff --git a/lib_dec/ivas_stereo_dft_dec_dmx.c b/lib_dec/ivas_stereo_dft_dec_dmx_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_dft_dec_dmx.c
rename to lib_dec/ivas_stereo_dft_dec_dmx_fx.c
diff --git a/lib_dec/ivas_stereo_eclvq_dec.c b/lib_dec/ivas_stereo_eclvq_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_eclvq_dec.c
rename to lib_dec/ivas_stereo_eclvq_dec_fx.c
diff --git a/lib_dec/ivas_stereo_esf_dec.c b/lib_dec/ivas_stereo_esf_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_esf_dec.c
rename to lib_dec/ivas_stereo_esf_dec_fx.c
diff --git a/lib_dec/ivas_stereo_ica_dec.c b/lib_dec/ivas_stereo_ica_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_ica_dec.c
rename to lib_dec/ivas_stereo_ica_dec_fx.c
diff --git a/lib_dec/ivas_stereo_icbwe_dec.c b/lib_dec/ivas_stereo_icbwe_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_icbwe_dec.c
rename to lib_dec/ivas_stereo_icbwe_dec_fx.c
diff --git a/lib_dec/ivas_stereo_mdct_stereo_dec.c b/lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_mdct_stereo_dec.c
rename to lib_dec/ivas_stereo_mdct_stereo_dec_fx.c
diff --git a/lib_dec/ivas_stereo_switching_dec.c b/lib_dec/ivas_stereo_switching_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_switching_dec.c
rename to lib_dec/ivas_stereo_switching_dec_fx.c
diff --git a/lib_dec/ivas_stereo_td_dec.c b/lib_dec/ivas_stereo_td_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_stereo_td_dec.c
rename to lib_dec/ivas_stereo_td_dec_fx.c
diff --git a/lib_dec/ivas_svd_dec.c b/lib_dec/ivas_svd_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_svd_dec.c
rename to lib_dec/ivas_svd_dec_fx.c
diff --git a/lib_dec/ivas_tcx_core_dec.c b/lib_dec/ivas_tcx_core_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_tcx_core_dec.c
rename to lib_dec/ivas_tcx_core_dec_fx.c
diff --git a/lib_dec/ivas_td_low_rate_dec.c b/lib_dec/ivas_td_low_rate_dec_fx.c
similarity index 100%
rename from lib_dec/ivas_td_low_rate_dec.c
rename to lib_dec/ivas_td_low_rate_dec_fx.c
diff --git a/lib_enc/ivas_agc_enc.c b/lib_enc/ivas_agc_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_agc_enc.c
rename to lib_enc/ivas_agc_enc_fx.c
diff --git a/lib_enc/ivas_core_enc.c b/lib_enc/ivas_core_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_core_enc.c
rename to lib_enc/ivas_core_enc_fx.c
diff --git a/lib_enc/ivas_core_pre_proc_front.c b/lib_enc/ivas_core_pre_proc_front_fx.c
similarity index 100%
rename from lib_enc/ivas_core_pre_proc_front.c
rename to lib_enc/ivas_core_pre_proc_front_fx.c
diff --git a/lib_enc/ivas_core_pre_proc.c b/lib_enc/ivas_core_pre_proc_fx.c
similarity index 100%
rename from lib_enc/ivas_core_pre_proc.c
rename to lib_enc/ivas_core_pre_proc_fx.c
diff --git a/lib_enc/ivas_corecoder_enc_reconfig.c b/lib_enc/ivas_corecoder_enc_reconfig_fx.c
similarity index 100%
rename from lib_enc/ivas_corecoder_enc_reconfig.c
rename to lib_enc/ivas_corecoder_enc_reconfig_fx.c
diff --git a/lib_enc/ivas_cpe_enc.c b/lib_enc/ivas_cpe_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_cpe_enc.c
rename to lib_enc/ivas_cpe_enc_fx.c
diff --git a/lib_enc/ivas_decision_matrix_enc.c b/lib_enc/ivas_decision_matrix_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_decision_matrix_enc.c
rename to lib_enc/ivas_decision_matrix_enc_fx.c
diff --git a/lib_enc/ivas_dirac_enc.c b/lib_enc/ivas_dirac_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_dirac_enc.c
rename to lib_enc/ivas_dirac_enc_fx.c
diff --git a/lib_enc/ivas_enc_cov_handler.c b/lib_enc/ivas_enc_cov_handler_fx.c
similarity index 100%
rename from lib_enc/ivas_enc_cov_handler.c
rename to lib_enc/ivas_enc_cov_handler_fx.c
diff --git a/lib_enc/ivas_enc.c b/lib_enc/ivas_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_enc.c
rename to lib_enc/ivas_enc_fx.c
diff --git a/lib_enc/ivas_entropy_coder.c b/lib_enc/ivas_entropy_coder_fx.c
similarity index 100%
rename from lib_enc/ivas_entropy_coder.c
rename to lib_enc/ivas_entropy_coder_fx.c
diff --git a/lib_enc/ivas_front_vad.c b/lib_enc/ivas_front_vad_fx.c
similarity index 100%
rename from lib_enc/ivas_front_vad.c
rename to lib_enc/ivas_front_vad_fx.c
diff --git a/lib_enc/ivas_init_enc.c b/lib_enc/ivas_init_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_init_enc.c
rename to lib_enc/ivas_init_enc_fx.c
diff --git a/lib_enc/ivas_ism_dtx_enc.c b/lib_enc/ivas_ism_dtx_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_ism_dtx_enc.c
rename to lib_enc/ivas_ism_dtx_enc_fx.c
diff --git a/lib_enc/ivas_ism_enc.c b/lib_enc/ivas_ism_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_ism_enc.c
rename to lib_enc/ivas_ism_enc_fx.c
diff --git a/lib_enc/ivas_ism_metadata_enc.c b/lib_enc/ivas_ism_metadata_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_ism_metadata_enc.c
rename to lib_enc/ivas_ism_metadata_enc_fx.c
diff --git a/lib_enc/ivas_ism_param_enc.c b/lib_enc/ivas_ism_param_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_ism_param_enc.c
rename to lib_enc/ivas_ism_param_enc_fx.c
diff --git a/lib_enc/ivas_lfe_enc.c b/lib_enc/ivas_lfe_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_lfe_enc.c
rename to lib_enc/ivas_lfe_enc_fx.c
diff --git a/lib_enc/ivas_masa_enc.c b/lib_enc/ivas_masa_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_masa_enc.c
rename to lib_enc/ivas_masa_enc_fx.c
diff --git a/lib_enc/ivas_mc_param_enc.c b/lib_enc/ivas_mc_param_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mc_param_enc.c
rename to lib_enc/ivas_mc_param_enc_fx.c
diff --git a/lib_enc/ivas_mc_paramupmix_enc.c b/lib_enc/ivas_mc_paramupmix_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mc_paramupmix_enc.c
rename to lib_enc/ivas_mc_paramupmix_enc_fx.c
diff --git a/lib_enc/ivas_mcmasa_enc.c b/lib_enc/ivas_mcmasa_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mcmasa_enc.c
rename to lib_enc/ivas_mcmasa_enc_fx.c
diff --git a/lib_enc/ivas_mct_core_enc.c b/lib_enc/ivas_mct_core_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mct_core_enc.c
rename to lib_enc/ivas_mct_core_enc_fx.c
diff --git a/lib_enc/ivas_mct_enc.c b/lib_enc/ivas_mct_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mct_enc.c
rename to lib_enc/ivas_mct_enc_fx.c
diff --git a/lib_enc/ivas_mct_enc_mct.c b/lib_enc/ivas_mct_enc_mct_fx.c
similarity index 100%
rename from lib_enc/ivas_mct_enc_mct.c
rename to lib_enc/ivas_mct_enc_mct_fx.c
diff --git a/lib_enc/ivas_mdct_core_enc.c b/lib_enc/ivas_mdct_core_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_mdct_core_enc.c
rename to lib_enc/ivas_mdct_core_enc_fx.c
diff --git a/lib_enc/ivas_omasa_enc.c b/lib_enc/ivas_omasa_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_omasa_enc.c
rename to lib_enc/ivas_omasa_enc_fx.c
diff --git a/lib_enc/ivas_osba_enc.c b/lib_enc/ivas_osba_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_osba_enc.c
rename to lib_enc/ivas_osba_enc_fx.c
diff --git a/lib_enc/ivas_pca_enc.c b/lib_enc/ivas_pca_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_pca_enc.c
rename to lib_enc/ivas_pca_enc_fx.c
diff --git a/lib_enc/ivas_qmetadata_enc.c b/lib_enc/ivas_qmetadata_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_qmetadata_enc.c
rename to lib_enc/ivas_qmetadata_enc_fx.c
diff --git a/lib_enc/ivas_qspherical_enc.c b/lib_enc/ivas_qspherical_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_qspherical_enc.c
rename to lib_enc/ivas_qspherical_enc_fx.c
diff --git a/lib_enc/ivas_range_uni_enc.c b/lib_enc/ivas_range_uni_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_range_uni_enc.c
rename to lib_enc/ivas_range_uni_enc_fx.c
diff --git a/lib_enc/ivas_sba_enc.c b/lib_enc/ivas_sba_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_sba_enc.c
rename to lib_enc/ivas_sba_enc_fx.c
diff --git a/lib_enc/ivas_sce_enc.c b/lib_enc/ivas_sce_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_sce_enc.c
rename to lib_enc/ivas_sce_enc_fx.c
diff --git a/lib_enc/ivas_sns_enc.c b/lib_enc/ivas_sns_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_sns_enc.c
rename to lib_enc/ivas_sns_enc_fx.c
diff --git a/lib_enc/ivas_spar_encoder.c b/lib_enc/ivas_spar_encoder_fx.c
similarity index 100%
rename from lib_enc/ivas_spar_encoder.c
rename to lib_enc/ivas_spar_encoder_fx.c
diff --git a/lib_enc/ivas_spar_md_enc.c b/lib_enc/ivas_spar_md_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_spar_md_enc.c
rename to lib_enc/ivas_spar_md_enc_fx.c
diff --git a/lib_enc/ivas_stereo_adapt_GR_enc.c b/lib_enc/ivas_stereo_adapt_GR_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_adapt_GR_enc.c
rename to lib_enc/ivas_stereo_adapt_GR_enc_fx.c
diff --git a/lib_enc/ivas_stereo_classifier.c b/lib_enc/ivas_stereo_classifier_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_classifier.c
rename to lib_enc/ivas_stereo_classifier_fx.c
diff --git a/lib_enc/ivas_stereo_cng_enc.c b/lib_enc/ivas_stereo_cng_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_cng_enc.c
rename to lib_enc/ivas_stereo_cng_enc_fx.c
diff --git a/lib_enc/ivas_stereo_dft_enc.c b/lib_enc/ivas_stereo_dft_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_dft_enc.c
rename to lib_enc/ivas_stereo_dft_enc_fx.c
diff --git a/lib_enc/ivas_stereo_dft_enc_itd.c b/lib_enc/ivas_stereo_dft_enc_itd_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_dft_enc_itd.c
rename to lib_enc/ivas_stereo_dft_enc_itd_fx.c
diff --git a/lib_enc/ivas_stereo_dft_td_itd.c b/lib_enc/ivas_stereo_dft_td_itd_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_dft_td_itd.c
rename to lib_enc/ivas_stereo_dft_td_itd_fx.c
diff --git a/lib_enc/ivas_stereo_dmx_evs.c b/lib_enc/ivas_stereo_dmx_evs_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_dmx_evs.c
rename to lib_enc/ivas_stereo_dmx_evs_fx.c
diff --git a/lib_enc/ivas_stereo_eclvq_enc.c b/lib_enc/ivas_stereo_eclvq_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_eclvq_enc.c
rename to lib_enc/ivas_stereo_eclvq_enc_fx.c
diff --git a/lib_enc/ivas_stereo_ica_enc.c b/lib_enc/ivas_stereo_ica_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_ica_enc.c
rename to lib_enc/ivas_stereo_ica_enc_fx.c
diff --git a/lib_enc/ivas_stereo_icbwe_enc.c b/lib_enc/ivas_stereo_icbwe_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_icbwe_enc.c
rename to lib_enc/ivas_stereo_icbwe_enc_fx.c
diff --git a/lib_enc/ivas_stereo_mdct_core_enc.c b/lib_enc/ivas_stereo_mdct_core_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_mdct_core_enc.c
rename to lib_enc/ivas_stereo_mdct_core_enc_fx.c
diff --git a/lib_enc/ivas_stereo_mdct_igf_enc.c b/lib_enc/ivas_stereo_mdct_igf_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_mdct_igf_enc.c
rename to lib_enc/ivas_stereo_mdct_igf_enc_fx.c
diff --git a/lib_enc/ivas_stereo_mdct_stereo_enc.c b/lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_mdct_stereo_enc.c
rename to lib_enc/ivas_stereo_mdct_stereo_enc_fx.c
diff --git a/lib_enc/ivas_stereo_switching_enc.c b/lib_enc/ivas_stereo_switching_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_switching_enc.c
rename to lib_enc/ivas_stereo_switching_enc_fx.c
diff --git a/lib_enc/ivas_stereo_td_analysis.c b/lib_enc/ivas_stereo_td_analysis_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_td_analysis.c
rename to lib_enc/ivas_stereo_td_analysis_fx.c
diff --git a/lib_enc/ivas_stereo_td_enc.c b/lib_enc/ivas_stereo_td_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_stereo_td_enc.c
rename to lib_enc/ivas_stereo_td_enc_fx.c
diff --git a/lib_enc/ivas_tcx_core_enc.c b/lib_enc/ivas_tcx_core_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_tcx_core_enc.c
rename to lib_enc/ivas_tcx_core_enc_fx.c
diff --git a/lib_enc/ivas_td_low_rate_enc.c b/lib_enc/ivas_td_low_rate_enc_fx.c
similarity index 100%
rename from lib_enc/ivas_td_low_rate_enc.c
rename to lib_enc/ivas_td_low_rate_enc_fx.c
diff --git a/lib_rend/ivas_allrad_dec.c b/lib_rend/ivas_allrad_dec_fx.c
similarity index 100%
rename from lib_rend/ivas_allrad_dec.c
rename to lib_rend/ivas_allrad_dec_fx.c
diff --git a/lib_rend/ivas_crend.c b/lib_rend/ivas_crend_fx.c
similarity index 100%
rename from lib_rend/ivas_crend.c
rename to lib_rend/ivas_crend_fx.c
diff --git a/lib_rend/ivas_dirac_ana.c b/lib_rend/ivas_dirac_ana_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_ana.c
rename to lib_rend/ivas_dirac_ana_fx.c
diff --git a/lib_rend/ivas_dirac_dec_binaural_functions.c b/lib_rend/ivas_dirac_dec_binaural_functions_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_dec_binaural_functions.c
rename to lib_rend/ivas_dirac_dec_binaural_functions_fx.c
diff --git a/lib_rend/ivas_dirac_decorr_dec.c b/lib_rend/ivas_dirac_decorr_dec_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_decorr_dec.c
rename to lib_rend/ivas_dirac_decorr_dec_fx.c
diff --git a/lib_rend/ivas_dirac_onsets_dec.c b/lib_rend/ivas_dirac_onsets_dec_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_onsets_dec.c
rename to lib_rend/ivas_dirac_onsets_dec_fx.c
diff --git a/lib_rend/ivas_dirac_output_synthesis_dec.c b/lib_rend/ivas_dirac_output_synthesis_dec_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_output_synthesis_dec.c
rename to lib_rend/ivas_dirac_output_synthesis_dec_fx.c
diff --git a/lib_rend/ivas_dirac_rend.c b/lib_rend/ivas_dirac_rend_fx.c
similarity index 100%
rename from lib_rend/ivas_dirac_rend.c
rename to lib_rend/ivas_dirac_rend_fx.c
diff --git a/lib_rend/ivas_efap.c b/lib_rend/ivas_efap_fx.c
similarity index 100%
rename from lib_rend/ivas_efap.c
rename to lib_rend/ivas_efap_fx.c
diff --git a/lib_rend/ivas_hrtf.c b/lib_rend/ivas_hrtf_fx.c
similarity index 100%
rename from lib_rend/ivas_hrtf.c
rename to lib_rend/ivas_hrtf_fx.c
diff --git a/lib_rend/ivas_limiter.c b/lib_rend/ivas_limiter_fx.c
similarity index 100%
rename from lib_rend/ivas_limiter.c
rename to lib_rend/ivas_limiter_fx.c
diff --git a/lib_rend/ivas_masa_merge.c b/lib_rend/ivas_masa_merge_fx.c
similarity index 100%
rename from lib_rend/ivas_masa_merge.c
rename to lib_rend/ivas_masa_merge_fx.c
diff --git a/lib_rend/ivas_mcmasa_ana.c b/lib_rend/ivas_mcmasa_ana_fx.c
similarity index 100%
rename from lib_rend/ivas_mcmasa_ana.c
rename to lib_rend/ivas_mcmasa_ana_fx.c
diff --git a/lib_rend/ivas_objectRenderer.c b/lib_rend/ivas_objectRenderer_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer.c
rename to lib_rend/ivas_objectRenderer_fx.c
diff --git a/lib_rend/ivas_objectRenderer_hrFilt.c b/lib_rend/ivas_objectRenderer_hrFilt_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer_hrFilt.c
rename to lib_rend/ivas_objectRenderer_hrFilt_fx.c
diff --git a/lib_rend/ivas_objectRenderer_mix.c b/lib_rend/ivas_objectRenderer_mix_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer_mix.c
rename to lib_rend/ivas_objectRenderer_mix_fx.c
diff --git a/lib_rend/ivas_objectRenderer_sfx.c b/lib_rend/ivas_objectRenderer_sfx_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer_sfx.c
rename to lib_rend/ivas_objectRenderer_sfx_fx.c
diff --git a/lib_rend/ivas_objectRenderer_sources.c b/lib_rend/ivas_objectRenderer_sources_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer_sources.c
rename to lib_rend/ivas_objectRenderer_sources_fx.c
diff --git a/lib_rend/ivas_objectRenderer_vec.c b/lib_rend/ivas_objectRenderer_vec_fx.c
similarity index 100%
rename from lib_rend/ivas_objectRenderer_vec.c
rename to lib_rend/ivas_objectRenderer_vec_fx.c
diff --git a/lib_rend/ivas_omasa_ana.c b/lib_rend/ivas_omasa_ana_fx.c
similarity index 100%
rename from lib_rend/ivas_omasa_ana.c
rename to lib_rend/ivas_omasa_ana_fx.c
diff --git a/lib_rend/ivas_orient_trk.c b/lib_rend/ivas_orient_trk_fx.c
similarity index 100%
rename from lib_rend/ivas_orient_trk.c
rename to lib_rend/ivas_orient_trk_fx.c
diff --git a/lib_rend/ivas_reflections.c b/lib_rend/ivas_reflections_fx.c
similarity index 100%
rename from lib_rend/ivas_reflections.c
rename to lib_rend/ivas_reflections_fx.c
diff --git a/lib_rend/ivas_render_config.c b/lib_rend/ivas_render_config_fx.c
similarity index 100%
rename from lib_rend/ivas_render_config.c
rename to lib_rend/ivas_render_config_fx.c
diff --git a/lib_rend/ivas_reverb_delay_line.c b/lib_rend/ivas_reverb_delay_line_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb_delay_line.c
rename to lib_rend/ivas_reverb_delay_line_fx.c
diff --git a/lib_rend/ivas_reverb_fft_filter.c b/lib_rend/ivas_reverb_fft_filter_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb_fft_filter.c
rename to lib_rend/ivas_reverb_fft_filter_fx.c
diff --git a/lib_rend/ivas_reverb_filter_design.c b/lib_rend/ivas_reverb_filter_design_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb_filter_design.c
rename to lib_rend/ivas_reverb_filter_design_fx.c
diff --git a/lib_rend/ivas_reverb.c b/lib_rend/ivas_reverb_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb.c
rename to lib_rend/ivas_reverb_fx.c
diff --git a/lib_rend/ivas_reverb_iir_filter.c b/lib_rend/ivas_reverb_iir_filter_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb_iir_filter.c
rename to lib_rend/ivas_reverb_iir_filter_fx.c
diff --git a/lib_rend/ivas_reverb_utils.c b/lib_rend/ivas_reverb_utils_fx.c
similarity index 100%
rename from lib_rend/ivas_reverb_utils.c
rename to lib_rend/ivas_reverb_utils_fx.c
diff --git a/lib_rend/ivas_rom_TdBinauralRenderer.c b/lib_rend/ivas_rom_TdBinauralRenderer_fx.c
similarity index 100%
rename from lib_rend/ivas_rom_TdBinauralRenderer.c
rename to lib_rend/ivas_rom_TdBinauralRenderer_fx.c
diff --git a/lib_rend/ivas_rom_binauralRenderer.c b/lib_rend/ivas_rom_binauralRenderer_fx.c
similarity index 100%
rename from lib_rend/ivas_rom_binauralRenderer.c
rename to lib_rend/ivas_rom_binauralRenderer_fx.c
diff --git a/lib_rend/ivas_rom_binaural_crend_head.c b/lib_rend/ivas_rom_binaural_crend_head_fx.c
similarity index 100%
rename from lib_rend/ivas_rom_binaural_crend_head.c
rename to lib_rend/ivas_rom_binaural_crend_head_fx.c
diff --git a/lib_rend/ivas_rom_rend.c b/lib_rend/ivas_rom_rend_fx.c
similarity index 100%
rename from lib_rend/ivas_rom_rend.c
rename to lib_rend/ivas_rom_rend_fx.c
diff --git a/lib_rend/ivas_rotation.c b/lib_rend/ivas_rotation_fx.c
similarity index 100%
rename from lib_rend/ivas_rotation.c
rename to lib_rend/ivas_rotation_fx.c
diff --git a/lib_rend/ivas_sba_rendering.c b/lib_rend/ivas_sba_rendering_fx.c
similarity index 100%
rename from lib_rend/ivas_sba_rendering.c
rename to lib_rend/ivas_sba_rendering_fx.c
diff --git a/lib_rend/ivas_shoebox.c b/lib_rend/ivas_shoebox_fx.c
similarity index 100%
rename from lib_rend/ivas_shoebox.c
rename to lib_rend/ivas_shoebox_fx.c
diff --git a/lib_rend/ivas_td_decorr.c b/lib_rend/ivas_td_decorr_fx.c
similarity index 100%
rename from lib_rend/ivas_td_decorr.c
rename to lib_rend/ivas_td_decorr_fx.c
diff --git a/lib_rend/ivas_vbap.c b/lib_rend/ivas_vbap_fx.c
similarity index 100%
rename from lib_rend/ivas_vbap.c
rename to lib_rend/ivas_vbap_fx.c
-- 
GitLab