diff --git a/CMakeLists.txt b/CMakeLists.txt
index 00149b8d0..38cc2e386 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,6 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
 endif()
 
 add_subdirectory(src/core)
-add_subdirectory(src/core_c)
 add_subdirectory(src/core_c_demo)
 add_subdirectory(src/musikcube)
 add_subdirectory(src/musikcubed)
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a5fa5ecdd..86d464339 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -1,4 +1,6 @@
 set(CORE_SOURCES
+  ./c_context.cpp
+  ./c_interface_wrappers.cpp
   ./debug.cpp
   ./audio/Buffer.cpp
   ./audio/Crossfader.cpp
@@ -70,6 +72,8 @@ include_directories(
   ../3rdparty/include/sqlite
 )
 
+add_definitions(-DMCSDK_DEFINE_EXPORTS)
+
 add_library(musikcore SHARED ${CORE_SOURCES})
 
 set_target_properties(musikcore PROPERTIES
diff --git a/src/core_c/context.cpp b/src/core/c_context.cpp
similarity index 100%
rename from src/core_c/context.cpp
rename to src/core/c_context.cpp
diff --git a/src/core_c/interface_wrappers.cpp b/src/core/c_interface_wrappers.cpp
similarity index 100%
rename from src/core_c/interface_wrappers.cpp
rename to src/core/c_interface_wrappers.cpp
diff --git a/src/core_c/musikcore_c.h b/src/core/musikcore_c.h
similarity index 100%
rename from src/core_c/musikcore_c.h
rename to src/core/musikcore_c.h
diff --git a/src/core_c/CMakeLists.txt b/src/core_c/CMakeLists.txt
deleted file mode 100644
index f1ed31348..000000000
--- a/src/core_c/CMakeLists.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-set(CORE_C_SOURCES
-  context.cpp
-  interface_wrappers.cpp
-)
-
-include_directories(
-  .
-  ..
-)
-
-add_definitions(-DMCSDK_DEFINE_EXPORTS)
-
-add_library(musikcore_c SHARED ${CORE_C_SOURCES})
-
-set_target_properties(musikcore_c PROPERTIES
-  LIBRARY_OUTPUT_DIRECTORY ${musikcube_SOURCE_DIR}/bin)
-
-target_link_libraries(musikcore_c ${musikcube_LINK_LIBS} musikcore)
diff --git a/src/core_c_demo/CMakeLists.txt b/src/core_c_demo/CMakeLists.txt
index 2f2e4a7bc..88b421851 100644
--- a/src/core_c_demo/CMakeLists.txt
+++ b/src/core_c_demo/CMakeLists.txt
@@ -11,9 +11,4 @@ add_executable(core_c_demo ${CORE_C_DEMO_SRCS})
 
 set_target_properties(core_c_demo PROPERTIES LINK_FLAGS "-Wl,-rpath,./")
 
-if (${LINK_STATICALLY} MATCHES "true")
-    find_library(EVLIB NAMES libev.a ev)
-    target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} ${EVLIB} musikcore musikcore_c)
-else()
-	target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore musikcore_c ev)
-endif()
+target_link_libraries(core_c_demo ${musikcube_LINK_LIBS} musikcore)
diff --git a/src/core_c_demo/main.c b/src/core_c_demo/main.c
index d936f707b..0a924fe77 100644
--- a/src/core_c_demo/main.c
+++ b/src/core_c_demo/main.c
@@ -1,7 +1,7 @@
 
 #include <stdio.h>
 #include <unistd.h>
-#include <core_c/musikcore_c.h>
+#include <core/musikcore_c.h>
 
 #define INPUT_FILE "/home/clangen/in.opus"
 #define OUTPUT_FILE "/home/clangen/out.flac"