diff --git a/BUCK b/BUCK
index 94175002..63015d1d 100644
--- a/BUCK
+++ b/BUCK
@@ -21,9 +21,9 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
 
 yoga_cxx_library(
     name = "yoga",
-    srcs = glob(["yoga/*.cpp"]),
+    srcs = glob(["yoga/**/*.cpp"]),
     header_namespace = "",
-    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = COMPILER_FLAGS,
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
@@ -35,9 +35,9 @@ yoga_cxx_library(
 
 yoga_cxx_library(
     name = "yogaForDebug",
-    srcs = glob(["yoga/*.cpp"]),
+    srcs = glob(["yoga/**/*.cpp"]),
     header_namespace = "",
-    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = TEST_COMPILER_FLAGS,
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
diff --git a/tests/EventsTest.cpp b/tests/EventsTest.cpp
index 09a67d27..d4645a3b 100644
--- a/tests/EventsTest.cpp
+++ b/tests/EventsTest.cpp
@@ -6,7 +6,7 @@
  */
 #include <gtest/gtest.h>
 #include <yoga/Yoga.h>
-#include <yoga/events.h>
+#include <yoga/event/event.h>
 #include <yoga/YGNode.h>
 #include <yoga/testutil/testutil.h>
 
diff --git a/testutil/testutil.cpp b/testutil/testutil.cpp
index f4174b40..bce5e168 100644
--- a/testutil/testutil.cpp
+++ b/testutil/testutil.cpp
@@ -7,7 +7,7 @@
 #include "testutil.h"
 
 #include <yoga/YGNode.h>
-#include <yoga/events.h>
+#include <yoga/event/event.h>
 
 #include <utility>
 
diff --git a/testutil/testutil.h b/testutil/testutil.h
index e97bd025..ef4a33da 100644
--- a/testutil/testutil.h
+++ b/testutil/testutil.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include <yoga/events.h>
+#include <yoga/event/event.h>
 
 #include <functional>
 
diff --git a/yoga/Yoga.cpp b/yoga/Yoga.cpp
index 5f6fa875..a34c791e 100644
--- a/yoga/Yoga.cpp
+++ b/yoga/Yoga.cpp
@@ -13,7 +13,7 @@
 #include "YGNode.h"
 #include "YGNodePrint.h"
 #include "Yoga-internal.h"
-#include "events.h"
+#include "event/event.h"
 #include "instrumentation.h"
 #ifdef _MSC_VER
 #include <float.h>
diff --git a/yoga/events.cpp b/yoga/event/event.cpp
similarity index 98%
rename from yoga/events.cpp
rename to yoga/event/event.cpp
index 41528e9c..bde5fca8 100644
--- a/yoga/events.cpp
+++ b/yoga/event/event.cpp
@@ -4,7 +4,7 @@
  * This source code is licensed under the MIT license found in the LICENSE
  * file in the root directory of this source tree.
  */
-#include "events.h"
+#include "event.h"
 #include <memory>
 #include <stdexcept>
 
diff --git a/yoga/events.h b/yoga/event/event.h
similarity index 100%
rename from yoga/events.h
rename to yoga/event/event.h