diff --git a/src/LIB/minpack/LICENCE b/src/PHYEX/micro/minpack/LICENCE
similarity index 100%
rename from src/LIB/minpack/LICENCE
rename to src/PHYEX/micro/minpack/LICENCE
diff --git a/src/LIB/minpack/minpack.f90 b/src/PHYEX/micro/minpack/minpack.f90
similarity index 100%
rename from src/LIB/minpack/minpack.f90
rename to src/PHYEX/micro/minpack/minpack.f90
diff --git a/src/PHYEX/micro/lima_bergeron.f90 b/src/PHYEX/micro/mode_lima_bergeron.f90
similarity index 100%
rename from src/PHYEX/micro/lima_bergeron.f90
rename to src/PHYEX/micro/mode_lima_bergeron.f90
diff --git a/src/PHYEX/micro/lima_ccn_activation.f90 b/src/PHYEX/micro/mode_lima_ccn_activation.f90
similarity index 100%
rename from src/PHYEX/micro/lima_ccn_activation.f90
rename to src/PHYEX/micro/mode_lima_ccn_activation.f90
diff --git a/src/PHYEX/micro/lima_ccn_hom_freezing.f90 b/src/PHYEX/micro/mode_lima_ccn_hom_freezing.f90
similarity index 100%
rename from src/PHYEX/micro/lima_ccn_hom_freezing.f90
rename to src/PHYEX/micro/mode_lima_ccn_hom_freezing.f90
diff --git a/src/PHYEX/micro/lima_collisional_ice_breakup.f90 b/src/PHYEX/micro/mode_lima_collisional_ice_breakup.f90
similarity index 100%
rename from src/PHYEX/micro/lima_collisional_ice_breakup.f90
rename to src/PHYEX/micro/mode_lima_collisional_ice_breakup.f90
diff --git a/src/PHYEX/micro/lima_compute_cloud_fractions.f90 b/src/PHYEX/micro/mode_lima_compute_cloud_fractions.f90
similarity index 100%
rename from src/PHYEX/micro/lima_compute_cloud_fractions.f90
rename to src/PHYEX/micro/mode_lima_compute_cloud_fractions.f90
diff --git a/src/PHYEX/micro/lima_conversion_melting_snow.f90 b/src/PHYEX/micro/mode_lima_conversion_melting_snow.f90
similarity index 100%
rename from src/PHYEX/micro/lima_conversion_melting_snow.f90
rename to src/PHYEX/micro/mode_lima_conversion_melting_snow.f90
diff --git a/src/PHYEX/micro/lima_droplets_accretion.f90 b/src/PHYEX/micro/mode_lima_droplets_accretion.f90
similarity index 100%
rename from src/PHYEX/micro/lima_droplets_accretion.f90
rename to src/PHYEX/micro/mode_lima_droplets_accretion.f90
diff --git a/src/PHYEX/micro/lima_droplets_autoconversion.f90 b/src/PHYEX/micro/mode_lima_droplets_autoconversion.f90
similarity index 100%
rename from src/PHYEX/micro/lima_droplets_autoconversion.f90
rename to src/PHYEX/micro/mode_lima_droplets_autoconversion.f90
diff --git a/src/PHYEX/micro/lima_droplets_hom_freezing.f90 b/src/PHYEX/micro/mode_lima_droplets_hom_freezing.f90
similarity index 100%
rename from src/PHYEX/micro/lima_droplets_hom_freezing.f90
rename to src/PHYEX/micro/mode_lima_droplets_hom_freezing.f90
diff --git a/src/PHYEX/micro/lima_droplets_riming_snow.f90 b/src/PHYEX/micro/mode_lima_droplets_riming_snow.f90
similarity index 100%
rename from src/PHYEX/micro/lima_droplets_riming_snow.f90
rename to src/PHYEX/micro/mode_lima_droplets_riming_snow.f90
diff --git a/src/PHYEX/micro/lima_droplets_self_collection.f90 b/src/PHYEX/micro/mode_lima_droplets_self_collection.f90
similarity index 100%
rename from src/PHYEX/micro/lima_droplets_self_collection.f90
rename to src/PHYEX/micro/mode_lima_droplets_self_collection.f90
diff --git a/src/PHYEX/micro/lima_drops_break_up.f90 b/src/PHYEX/micro/mode_lima_drops_break_up.f90
similarity index 100%
rename from src/PHYEX/micro/lima_drops_break_up.f90
rename to src/PHYEX/micro/mode_lima_drops_break_up.f90
diff --git a/src/PHYEX/micro/lima_drops_hom_freezing.f90 b/src/PHYEX/micro/mode_lima_drops_hom_freezing.f90
similarity index 100%
rename from src/PHYEX/micro/lima_drops_hom_freezing.f90
rename to src/PHYEX/micro/mode_lima_drops_hom_freezing.f90
diff --git a/src/PHYEX/micro/lima_drops_self_collection.f90 b/src/PHYEX/micro/mode_lima_drops_self_collection.f90
similarity index 100%
rename from src/PHYEX/micro/lima_drops_self_collection.f90
rename to src/PHYEX/micro/mode_lima_drops_self_collection.f90
diff --git a/src/PHYEX/micro/lima_drops_to_droplets_conv.f90 b/src/PHYEX/micro/mode_lima_drops_to_droplets_conv.f90
similarity index 100%
rename from src/PHYEX/micro/lima_drops_to_droplets_conv.f90
rename to src/PHYEX/micro/mode_lima_drops_to_droplets_conv.f90
diff --git a/src/PHYEX/micro/lima_functions.f90 b/src/PHYEX/micro/mode_lima_functions.f90
similarity index 100%
rename from src/PHYEX/micro/lima_functions.f90
rename to src/PHYEX/micro/mode_lima_functions.f90
diff --git a/src/PHYEX/micro/lima_graupel.f90 b/src/PHYEX/micro/mode_lima_graupel.f90
similarity index 100%
rename from src/PHYEX/micro/lima_graupel.f90
rename to src/PHYEX/micro/mode_lima_graupel.f90
diff --git a/src/PHYEX/micro/lima_graupel_deposition.f90 b/src/PHYEX/micro/mode_lima_graupel_deposition.f90
similarity index 100%
rename from src/PHYEX/micro/lima_graupel_deposition.f90
rename to src/PHYEX/micro/mode_lima_graupel_deposition.f90
diff --git a/src/PHYEX/micro/lima_hail.f90 b/src/PHYEX/micro/mode_lima_hail.f90
similarity index 100%
rename from src/PHYEX/micro/lima_hail.f90
rename to src/PHYEX/micro/mode_lima_hail.f90
diff --git a/src/PHYEX/micro/lima_hail_deposition.f90 b/src/PHYEX/micro/mode_lima_hail_deposition.f90
similarity index 100%
rename from src/PHYEX/micro/lima_hail_deposition.f90
rename to src/PHYEX/micro/mode_lima_hail_deposition.f90
diff --git a/src/PHYEX/micro/lima_ice_aggregation_snow.f90 b/src/PHYEX/micro/mode_lima_ice_aggregation_snow.f90
similarity index 100%
rename from src/PHYEX/micro/lima_ice_aggregation_snow.f90
rename to src/PHYEX/micro/mode_lima_ice_aggregation_snow.f90
diff --git a/src/PHYEX/micro/lima_ice_deposition.f90 b/src/PHYEX/micro/mode_lima_ice_deposition.f90
similarity index 100%
rename from src/PHYEX/micro/lima_ice_deposition.f90
rename to src/PHYEX/micro/mode_lima_ice_deposition.f90
diff --git a/src/PHYEX/micro/lima_ice_melting.f90 b/src/PHYEX/micro/mode_lima_ice_melting.f90
similarity index 100%
rename from src/PHYEX/micro/lima_ice_melting.f90
rename to src/PHYEX/micro/mode_lima_ice_melting.f90
diff --git a/src/PHYEX/micro/lima_init_ccn_activation_spectrum.f90 b/src/PHYEX/micro/mode_lima_init_ccn_activation_spectrum.f90
similarity index 100%
rename from src/PHYEX/micro/lima_init_ccn_activation_spectrum.f90
rename to src/PHYEX/micro/mode_lima_init_ccn_activation_spectrum.f90
diff --git a/src/PHYEX/micro/lima_inst_procs.f90 b/src/PHYEX/micro/mode_lima_inst_procs.f90
similarity index 100%
rename from src/PHYEX/micro/lima_inst_procs.f90
rename to src/PHYEX/micro/mode_lima_inst_procs.f90
diff --git a/src/PHYEX/micro/lima_meyers_nucleation.f90 b/src/PHYEX/micro/mode_lima_meyers_nucleation.f90
similarity index 100%
rename from src/PHYEX/micro/lima_meyers_nucleation.f90
rename to src/PHYEX/micro/mode_lima_meyers_nucleation.f90
diff --git a/src/PHYEX/micro/lima_nucleation_procs.f90 b/src/PHYEX/micro/mode_lima_nucleation_procs.f90
similarity index 100%
rename from src/PHYEX/micro/lima_nucleation_procs.f90
rename to src/PHYEX/micro/mode_lima_nucleation_procs.f90
diff --git a/src/PHYEX/micro/lima_phillips_ifn_nucleation.f90 b/src/PHYEX/micro/mode_lima_phillips_ifn_nucleation.f90
similarity index 100%
rename from src/PHYEX/micro/lima_phillips_ifn_nucleation.f90
rename to src/PHYEX/micro/mode_lima_phillips_ifn_nucleation.f90
diff --git a/src/PHYEX/micro/lima_phillips_integ.f90 b/src/PHYEX/micro/mode_lima_phillips_integ.f90
similarity index 100%
rename from src/PHYEX/micro/lima_phillips_integ.f90
rename to src/PHYEX/micro/mode_lima_phillips_integ.f90
diff --git a/src/PHYEX/micro/lima_phillips_ref_spectrum.f90 b/src/PHYEX/micro/mode_lima_phillips_ref_spectrum.f90
similarity index 100%
rename from src/PHYEX/micro/lima_phillips_ref_spectrum.f90
rename to src/PHYEX/micro/mode_lima_phillips_ref_spectrum.f90
diff --git a/src/PHYEX/micro/lima_rain_accr_snow.f90 b/src/PHYEX/micro/mode_lima_rain_accr_snow.f90
similarity index 100%
rename from src/PHYEX/micro/lima_rain_accr_snow.f90
rename to src/PHYEX/micro/mode_lima_rain_accr_snow.f90
diff --git a/src/PHYEX/micro/lima_rain_evaporation.f90 b/src/PHYEX/micro/mode_lima_rain_evaporation.f90
similarity index 100%
rename from src/PHYEX/micro/lima_rain_evaporation.f90
rename to src/PHYEX/micro/mode_lima_rain_evaporation.f90
diff --git a/src/PHYEX/micro/lima_rain_freezing.f90 b/src/PHYEX/micro/mode_lima_rain_freezing.f90
similarity index 100%
rename from src/PHYEX/micro/lima_rain_freezing.f90
rename to src/PHYEX/micro/mode_lima_rain_freezing.f90
diff --git a/src/PHYEX/micro/lima_raindrop_shattering_freezing.f90 b/src/PHYEX/micro/mode_lima_raindrop_shattering_freezing.f90
similarity index 100%
rename from src/PHYEX/micro/lima_raindrop_shattering_freezing.f90
rename to src/PHYEX/micro/mode_lima_raindrop_shattering_freezing.f90
diff --git a/src/PHYEX/micro/lima_read_xker_gweth.f90 b/src/PHYEX/micro/mode_lima_read_xker_gweth.f90
similarity index 100%
rename from src/PHYEX/micro/lima_read_xker_gweth.f90
rename to src/PHYEX/micro/mode_lima_read_xker_gweth.f90
diff --git a/src/PHYEX/micro/lima_read_xker_raccs.f90 b/src/PHYEX/micro/mode_lima_read_xker_raccs.f90
similarity index 100%
rename from src/PHYEX/micro/lima_read_xker_raccs.f90
rename to src/PHYEX/micro/mode_lima_read_xker_raccs.f90
diff --git a/src/PHYEX/micro/lima_read_xker_rdryg.f90 b/src/PHYEX/micro/mode_lima_read_xker_rdryg.f90
similarity index 100%
rename from src/PHYEX/micro/lima_read_xker_rdryg.f90
rename to src/PHYEX/micro/mode_lima_read_xker_rdryg.f90
diff --git a/src/PHYEX/micro/lima_read_xker_sdryg.f90 b/src/PHYEX/micro/mode_lima_read_xker_sdryg.f90
similarity index 100%
rename from src/PHYEX/micro/lima_read_xker_sdryg.f90
rename to src/PHYEX/micro/mode_lima_read_xker_sdryg.f90
diff --git a/src/PHYEX/micro/lima_read_xker_sweth.f90 b/src/PHYEX/micro/mode_lima_read_xker_sweth.f90
similarity index 100%
rename from src/PHYEX/micro/lima_read_xker_sweth.f90
rename to src/PHYEX/micro/mode_lima_read_xker_sweth.f90
diff --git a/src/PHYEX/micro/lima_sedimentation.f90 b/src/PHYEX/micro/mode_lima_sedimentation.f90
similarity index 100%
rename from src/PHYEX/micro/lima_sedimentation.f90
rename to src/PHYEX/micro/mode_lima_sedimentation.f90
diff --git a/src/PHYEX/micro/lima_snow_deposition.f90 b/src/PHYEX/micro/mode_lima_snow_deposition.f90
similarity index 100%
rename from src/PHYEX/micro/lima_snow_deposition.f90
rename to src/PHYEX/micro/mode_lima_snow_deposition.f90
diff --git a/src/PHYEX/micro/lima_snow_self_collection.f90 b/src/PHYEX/micro/mode_lima_snow_self_collection.f90
similarity index 100%
rename from src/PHYEX/micro/lima_snow_self_collection.f90
rename to src/PHYEX/micro/mode_lima_snow_self_collection.f90
diff --git a/src/PHYEX/micro/lima_tendencies.f90 b/src/PHYEX/micro/mode_lima_tendencies.f90
similarity index 100%
rename from src/PHYEX/micro/lima_tendencies.f90
rename to src/PHYEX/micro/mode_lima_tendencies.f90
diff --git a/src/MNH/nrcolss.f90 b/src/PHYEX/micro/mode_nrcolss.f90
similarity index 100%
rename from src/MNH/nrcolss.f90
rename to src/PHYEX/micro/mode_nrcolss.f90
diff --git a/src/MNH/nscolrg.f90 b/src/PHYEX/micro/mode_nscolrg.f90
similarity index 100%
rename from src/MNH/nscolrg.f90
rename to src/PHYEX/micro/mode_nscolrg.f90
diff --git a/src/MNH/nzcolx.f90 b/src/PHYEX/micro/mode_nzcolx.f90
similarity index 100%
rename from src/MNH/nzcolx.f90
rename to src/PHYEX/micro/mode_nzcolx.f90
diff --git a/src/PHYEX/micro/set_conc_lima.f90 b/src/PHYEX/micro/mode_set_conc_lima.f90
similarity index 100%
rename from src/PHYEX/micro/set_conc_lima.f90
rename to src/PHYEX/micro/mode_set_conc_lima.f90