diff --git a/plugins/ladspa_effect/calf/calf/audio_fx.h b/plugins/ladspa_effect/calf/src/calf/audio_fx.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/audio_fx.h
rename to plugins/ladspa_effect/calf/src/calf/audio_fx.h
diff --git a/plugins/ladspa_effect/calf/calf/biquad.h b/plugins/ladspa_effect/calf/src/calf/biquad.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/biquad.h
rename to plugins/ladspa_effect/calf/src/calf/biquad.h
diff --git a/plugins/ladspa_effect/calf/calf/buffer.h b/plugins/ladspa_effect/calf/src/calf/buffer.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/buffer.h
rename to plugins/ladspa_effect/calf/src/calf/buffer.h
diff --git a/plugins/ladspa_effect/calf/calf/delay.h b/plugins/ladspa_effect/calf/src/calf/delay.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/delay.h
rename to plugins/ladspa_effect/calf/src/calf/delay.h
diff --git a/plugins/ladspa_effect/calf/calf/envelope.h b/plugins/ladspa_effect/calf/src/calf/envelope.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/envelope.h
rename to plugins/ladspa_effect/calf/src/calf/envelope.h
diff --git a/plugins/ladspa_effect/calf/calf/fft.h b/plugins/ladspa_effect/calf/src/calf/fft.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/fft.h
rename to plugins/ladspa_effect/calf/src/calf/fft.h
diff --git a/plugins/ladspa_effect/calf/calf/fixed_point.h b/plugins/ladspa_effect/calf/src/calf/fixed_point.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/fixed_point.h
rename to plugins/ladspa_effect/calf/src/calf/fixed_point.h
diff --git a/plugins/ladspa_effect/calf/calf/giface.h b/plugins/ladspa_effect/calf/src/calf/giface.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/giface.h
rename to plugins/ladspa_effect/calf/src/calf/giface.h
diff --git a/plugins/ladspa_effect/calf/calf/inertia.h b/plugins/ladspa_effect/calf/src/calf/inertia.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/inertia.h
rename to plugins/ladspa_effect/calf/src/calf/inertia.h
diff --git a/plugins/ladspa_effect/calf/calf/ladspa_wrap.h b/plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/ladspa_wrap.h
rename to plugins/ladspa_effect/calf/src/calf/ladspa_wrap.h
diff --git a/plugins/ladspa_effect/calf/calf/loudness.h b/plugins/ladspa_effect/calf/src/calf/loudness.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/loudness.h
rename to plugins/ladspa_effect/calf/src/calf/loudness.h
diff --git a/plugins/ladspa_effect/calf/calf/lv2_external_ui.h b/plugins/ladspa_effect/calf/src/calf/lv2_external_ui.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/lv2_external_ui.h
rename to plugins/ladspa_effect/calf/src/calf/lv2_external_ui.h
diff --git a/plugins/ladspa_effect/calf/calf/lv2helpers.h b/plugins/ladspa_effect/calf/src/calf/lv2helpers.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/lv2helpers.h
rename to plugins/ladspa_effect/calf/src/calf/lv2helpers.h
diff --git a/plugins/ladspa_effect/calf/calf/lv2wrap.h b/plugins/ladspa_effect/calf/src/calf/lv2wrap.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/lv2wrap.h
rename to plugins/ladspa_effect/calf/src/calf/lv2wrap.h
diff --git a/plugins/ladspa_effect/calf/calf/metadata.h b/plugins/ladspa_effect/calf/src/calf/metadata.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/metadata.h
rename to plugins/ladspa_effect/calf/src/calf/metadata.h
diff --git a/plugins/ladspa_effect/calf/calf/modmatrix.h b/plugins/ladspa_effect/calf/src/calf/modmatrix.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/modmatrix.h
rename to plugins/ladspa_effect/calf/src/calf/modmatrix.h
diff --git a/plugins/ladspa_effect/calf/calf/modulelist.h b/plugins/ladspa_effect/calf/src/calf/modulelist.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/modulelist.h
rename to plugins/ladspa_effect/calf/src/calf/modulelist.h
diff --git a/plugins/ladspa_effect/calf/calf/modules.h b/plugins/ladspa_effect/calf/src/calf/modules.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/modules.h
rename to plugins/ladspa_effect/calf/src/calf/modules.h
diff --git a/plugins/ladspa_effect/calf/calf/modules_dev.h b/plugins/ladspa_effect/calf/src/calf/modules_dev.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/modules_dev.h
rename to plugins/ladspa_effect/calf/src/calf/modules_dev.h
diff --git a/plugins/ladspa_effect/calf/calf/modules_synths.h b/plugins/ladspa_effect/calf/src/calf/modules_synths.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/modules_synths.h
rename to plugins/ladspa_effect/calf/src/calf/modules_synths.h
diff --git a/plugins/ladspa_effect/calf/calf/multichorus.h b/plugins/ladspa_effect/calf/src/calf/multichorus.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/multichorus.h
rename to plugins/ladspa_effect/calf/src/calf/multichorus.h
diff --git a/plugins/ladspa_effect/calf/calf/onepole.h b/plugins/ladspa_effect/calf/src/calf/onepole.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/onepole.h
rename to plugins/ladspa_effect/calf/src/calf/onepole.h
diff --git a/plugins/ladspa_effect/calf/calf/organ.h b/plugins/ladspa_effect/calf/src/calf/organ.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/organ.h
rename to plugins/ladspa_effect/calf/src/calf/organ.h
diff --git a/plugins/ladspa_effect/calf/calf/osc.h b/plugins/ladspa_effect/calf/src/calf/osc.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/osc.h
rename to plugins/ladspa_effect/calf/src/calf/osc.h
diff --git a/plugins/ladspa_effect/calf/calf/osctl.h b/plugins/ladspa_effect/calf/src/calf/osctl.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/osctl.h
rename to plugins/ladspa_effect/calf/src/calf/osctl.h
diff --git a/plugins/ladspa_effect/calf/calf/preset.h b/plugins/ladspa_effect/calf/src/calf/preset.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/preset.h
rename to plugins/ladspa_effect/calf/src/calf/preset.h
diff --git a/plugins/ladspa_effect/calf/calf/primitives.h b/plugins/ladspa_effect/calf/src/calf/primitives.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/primitives.h
rename to plugins/ladspa_effect/calf/src/calf/primitives.h
diff --git a/plugins/ladspa_effect/calf/calf/synth.h b/plugins/ladspa_effect/calf/src/calf/synth.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/synth.h
rename to plugins/ladspa_effect/calf/src/calf/synth.h
diff --git a/plugins/ladspa_effect/calf/calf/utils.h b/plugins/ladspa_effect/calf/src/calf/utils.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/utils.h
rename to plugins/ladspa_effect/calf/src/calf/utils.h
diff --git a/plugins/ladspa_effect/calf/calf/waveshaping.h b/plugins/ladspa_effect/calf/src/calf/waveshaping.h
similarity index 100%
rename from plugins/ladspa_effect/calf/calf/waveshaping.h
rename to plugins/ladspa_effect/calf/src/calf/waveshaping.h