diff --git a/cmake/core-files.cmake b/cmake/core-files.cmake
index 2aae6e457..d2244d14a 100644
--- a/cmake/core-files.cmake
+++ b/cmake/core-files.cmake
@@ -484,6 +484,7 @@ set(MBGL_CORE_FILES
     src/mbgl/style/expression/compound_expression.cpp
     src/mbgl/style/expression/dsl.cpp
     src/mbgl/style/expression/equals.cpp
+    src/mbgl/style/expression/expression.cpp
     src/mbgl/style/expression/find_zoom_curve.cpp
     src/mbgl/style/expression/get_covering_stops.cpp
     src/mbgl/style/expression/interpolate.cpp
@@ -499,9 +500,6 @@ set(MBGL_CORE_FILES
     src/mbgl/style/expression/util.hpp
     src/mbgl/style/expression/value.cpp
 
-    # style/function
-    src/mbgl/style/function/expression.cpp
-
     # style/layers
     include/mbgl/style/layers/background_layer.hpp
     include/mbgl/style/layers/circle_layer.hpp
diff --git a/src/mbgl/style/function/expression.cpp b/src/mbgl/style/expression/expression.cpp
similarity index 100%
rename from src/mbgl/style/function/expression.cpp
rename to src/mbgl/style/expression/expression.cpp