diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index 6d938ae0c..9da7eba00 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -77,7 +77,7 @@ else()
     target_link_libraries(reactor-c PUBLIC lf::trace-api-types)
 endif()
 
-include(${LF_ROOT}/version/api/CMakeLists.txt)
+include(${LF_ROOT}/core/version/api/CMakeLists.txt)
 target_link_libraries(reactor-c PUBLIC lf::version-api)
 
 include(${LF_ROOT}/logging/api/CMakeLists.txt)
diff --git a/core/federated/RTI/CMakeLists.txt b/core/federated/RTI/CMakeLists.txt
index 5bfbf0196..6690dafe7 100644
--- a/core/federated/RTI/CMakeLists.txt
+++ b/core/federated/RTI/CMakeLists.txt
@@ -43,7 +43,7 @@ IF(CMAKE_BUILD_TYPE MATCHES DEBUG)
 ENDIF(CMAKE_BUILD_TYPE MATCHES DEBUG)
 target_compile_definitions(${RTI_LIB} PUBLIC LOG_LEVEL=${LOG_LEVEL})
 
-include(${LF_ROOT}/version/api/CMakeLists.txt)
+include(${LF_ROOT}/core/version/api/CMakeLists.txt)
 target_link_libraries(${RTI_LIB} PUBLIC lf::version-api)
 
 include(${LF_ROOT}/logging/api/CMakeLists.txt)
diff --git a/version/api/CMakeLists.txt b/core/version/api/CMakeLists.txt
similarity index 100%
rename from version/api/CMakeLists.txt
rename to core/version/api/CMakeLists.txt
diff --git a/version/api/lf_core_version.h b/core/version/api/lf_core_version.h
similarity index 100%
rename from version/api/lf_core_version.h
rename to core/version/api/lf_core_version.h
diff --git a/lingua-franca-ref.txt b/lingua-franca-ref.txt
index 1f7391f92..bf8549687 100644
--- a/lingua-franca-ref.txt
+++ b/lingua-franca-ref.txt
@@ -1 +1 @@
-master
+c-move-version-folder
\ No newline at end of file
diff --git a/util/tracing/Makefile b/util/tracing/Makefile
index 0cda03c7d..cc2589461 100644
--- a/util/tracing/Makefile
+++ b/util/tracing/Makefile
@@ -12,7 +12,7 @@ CFLAGS=	-I$(REACTOR_C)/include/core/ \
 		-I$(REACTOR_C)/tag/api \
 		-I$(REACTOR_C)/trace/api \
 		-I$(REACTOR_C)/trace/api/types \
-		-I$(REACTOR_C)/version/api \
+		-I$(REACTOR_C)/core/version/api \
 		-I$(REACTOR_C)/logging/api \
 		-I$(REACTOR_C)/trace/impl/include \
 		-DLF_SINGLE_THREADED=1 \
diff --git a/util/tracing/codegen/CMakeLists.txt b/util/tracing/codegen/CMakeLists.txt
index 5866a2ab3..128ce8600 100644
--- a/util/tracing/codegen/CMakeLists.txt
+++ b/util/tracing/codegen/CMakeLists.txt
@@ -3,7 +3,7 @@ project(TracepointToRs LANGUAGES C)
 add_executable(tracepoint-to-rs ${CMAKE_CURRENT_LIST_DIR}/src/tracepoint_to_rs.c)
 set(LF_ROOT ${CMAKE_CURRENT_LIST_DIR}/../../..)
 include(${LF_ROOT}/trace/api/CMakeLists.txt)
-include(${LF_ROOT}/version/api/CMakeLists.txt)
+include(${LF_ROOT}/core/version/api/CMakeLists.txt)
 target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api)
 target_link_libraries(tracepoint-to-rs PUBLIC lf::version-api)
 target_link_libraries(tracepoint-to-rs PUBLIC lf::trace-api-types)