diff --git a/plugins/ladspa_effect/calf/CMakeLists.txt b/plugins/ladspa_effect/calf/CMakeLists.txt
index 609d4085a..2a399e98c 100644
--- a/plugins/ladspa_effect/calf/CMakeLists.txt
+++ b/plugins/ladspa_effect/calf/CMakeLists.txt
@@ -1,10 +1,10 @@
-FILE(GLOB SOURCES *.cpp)
+FILE(GLOB SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/*.cpp)
 ADD_LIBRARY(calf MODULE ${SOURCES})
 INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/calf)
 INSTALL(TARGETS calf LIBRARY DESTINATION ${PLUGIN_DIR}/ladspa)
 ADD_DEFINITIONS(-DUSE_LADSPA=1)
 SET_TARGET_PROPERTIES(calf PROPERTIES PREFIX "")
-SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -funroll-loops")
+SET_TARGET_PROPERTIES(calf PROPERTIES COMPILE_FLAGS "-O2 -finline-limit=80 -finline-functions -finline-functions-called-once")
 
 IF(LMMS_BUILD_WIN32)
 	ADD_CUSTOM_COMMAND(TARGET calf POST_BUILD COMMAND ${STRIP} ${CMAKE_CURRENT_BINARY_DIR}/calf.dll)
diff --git a/plugins/ladspa_effect/calf/giface.cpp b/plugins/ladspa_effect/calf/src/giface.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/giface.cpp
rename to plugins/ladspa_effect/calf/src/giface.cpp
diff --git a/plugins/ladspa_effect/calf/modmatrix.cpp b/plugins/ladspa_effect/calf/src/modmatrix.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/modmatrix.cpp
rename to plugins/ladspa_effect/calf/src/modmatrix.cpp
diff --git a/plugins/ladspa_effect/calf/modules.cpp b/plugins/ladspa_effect/calf/src/modules.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/modules.cpp
rename to plugins/ladspa_effect/calf/src/modules.cpp
diff --git a/plugins/ladspa_effect/calf/modules_dsp.cpp b/plugins/ladspa_effect/calf/src/modules_dsp.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/modules_dsp.cpp
rename to plugins/ladspa_effect/calf/src/modules_dsp.cpp
diff --git a/plugins/ladspa_effect/calf/modules_small.cpp b/plugins/ladspa_effect/calf/src/modules_small.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/modules_small.cpp
rename to plugins/ladspa_effect/calf/src/modules_small.cpp
diff --git a/plugins/ladspa_effect/calf/monosynth.cpp b/plugins/ladspa_effect/calf/src/monosynth.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/monosynth.cpp
rename to plugins/ladspa_effect/calf/src/monosynth.cpp
diff --git a/plugins/ladspa_effect/calf/organ.cpp b/plugins/ladspa_effect/calf/src/organ.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/organ.cpp
rename to plugins/ladspa_effect/calf/src/organ.cpp
diff --git a/plugins/ladspa_effect/calf/plugin.cpp b/plugins/ladspa_effect/calf/src/plugin.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/plugin.cpp
rename to plugins/ladspa_effect/calf/src/plugin.cpp
diff --git a/plugins/ladspa_effect/calf/synth.cpp b/plugins/ladspa_effect/calf/src/synth.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/synth.cpp
rename to plugins/ladspa_effect/calf/src/synth.cpp
diff --git a/plugins/ladspa_effect/calf/utils.cpp b/plugins/ladspa_effect/calf/src/utils.cpp
similarity index 100%
rename from plugins/ladspa_effect/calf/utils.cpp
rename to plugins/ladspa_effect/calf/src/utils.cpp