diff --git a/submodules/AccountContext/BUCK b/submodules/AccountContext/BUCK
index e51b9d54b5..6e3d486461 100644
--- a/submodules/AccountContext/BUCK
+++ b/submodules/AccountContext/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AccountContext",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramAudio:TelegramAudio",
diff --git a/submodules/ActionSheetPeerItem/BUCK b/submodules/ActionSheetPeerItem/BUCK
index 936ed9ab5a..c3def05de4 100644
--- a/submodules/ActionSheetPeerItem/BUCK
+++ b/submodules/ActionSheetPeerItem/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ActionSheetPeerItem",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/AvatarNode",
diff --git a/submodules/ActivityIndicator/BUCK b/submodules/ActivityIndicator/BUCK
index 95c864b5b1..8dfa305875 100644
--- a/submodules/ActivityIndicator/BUCK
+++ b/submodules/ActivityIndicator/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ActivityIndicator",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramPresentationData",
diff --git a/submodules/AlertUI/BUCK b/submodules/AlertUI/BUCK
index b3c31cecb7..bdbc5a1a6e 100644
--- a/submodules/AlertUI/BUCK
+++ b/submodules/AlertUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AlertUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic",
diff --git a/submodules/AnimationUI/BUCK b/submodules/AnimationUI/BUCK
index 601bdfe3d0..b2ac31610c 100644
--- a/submodules/AnimationUI/BUCK
+++ b/submodules/AnimationUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AnimationUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/AuthorizationUI/BUCK b/submodules/AuthorizationUI/BUCK
index fe71558b72..b0cf635904 100644
--- a/submodules/AuthorizationUI/BUCK
+++ b/submodules/AuthorizationUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AuthorizationUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
diff --git a/submodules/AvatarNode/BUCK b/submodules/AvatarNode/BUCK
index d73806bdb1..66d6862bdc 100644
--- a/submodules/AvatarNode/BUCK
+++ b/submodules/AvatarNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "AvatarNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
diff --git a/submodules/BotPaymentsUI/BUCK b/submodules/BotPaymentsUI/BUCK
index 6a1fa831de..59f1dcf093 100644
--- a/submodules/BotPaymentsUI/BUCK
+++ b/submodules/BotPaymentsUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "BotPaymentsUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/CallListUI/BUCK b/submodules/CallListUI/BUCK
index befe9de3b6..2b1ad4d35a 100644
--- a/submodules/CallListUI/BUCK
+++ b/submodules/CallListUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "CallListUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/ChatListSearchItemHeader/BUCK b/submodules/ChatListSearchItemHeader/BUCK
index 7785b366ea..8145315e82 100644
--- a/submodules/ChatListSearchItemHeader/BUCK
+++ b/submodules/ChatListSearchItemHeader/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ChatListSearchItemHeader",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/ChatListSearchItemNode/BUCK b/submodules/ChatListSearchItemNode/BUCK
index 6a47191e3b..1eaa21d1ae 100644
--- a/submodules/ChatListSearchItemNode/BUCK
+++ b/submodules/ChatListSearchItemNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ChatListSearchItemNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/ChatListSearchRecentPeersNode/BUCK b/submodules/ChatListSearchRecentPeersNode/BUCK
index 796b9fd499..d650881f2a 100644
--- a/submodules/ChatListSearchRecentPeersNode/BUCK
+++ b/submodules/ChatListSearchRecentPeersNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ChatListSearchRecentPeersNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/ChatListUI/BUCK b/submodules/ChatListUI/BUCK
index 3c9a58b514..f1bafb2e72 100644
--- a/submodules/ChatListUI/BUCK
+++ b/submodules/ChatListUI/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ChatListUI",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/ChatTitleActivityNode/BUCK b/submodules/ChatTitleActivityNode/BUCK
index 3f8d136666..d8a669a8f3 100644
--- a/submodules/ChatTitleActivityNode/BUCK
+++ b/submodules/ChatTitleActivityNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ChatTitleActivityNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/DeviceAccess/BUCK b/submodules/DeviceAccess/BUCK
index 338c5617de..d74e86ec9c 100644
--- a/submodules/DeviceAccess/BUCK
+++ b/submodules/DeviceAccess/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "DeviceAccess",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/DeviceLocationManager/BUCK b/submodules/DeviceLocationManager/BUCK
index 46d95a6f88..a9f7473e71 100644
--- a/submodules/DeviceLocationManager/BUCK
+++ b/submodules/DeviceLocationManager/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "DeviceLocationManager",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic",
diff --git a/submodules/Emoji/BUCK b/submodules/Emoji/BUCK
index 3842502ed0..35e87da39c 100644
--- a/submodules/Emoji/BUCK
+++ b/submodules/Emoji/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "Emoji",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/Geocoding/BUCK b/submodules/Geocoding/BUCK
index 12b222d7f0..3c03b57353 100644
--- a/submodules/Geocoding/BUCK
+++ b/submodules/Geocoding/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "Geocoding",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/HexColor/BUCK b/submodules/HexColor/BUCK
index 9753c4f5b6..1a0fd3ba2a 100644
--- a/submodules/HexColor/BUCK
+++ b/submodules/HexColor/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "HexColor",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/HockeySDK-iOS/BUCK b/submodules/HockeySDK-iOS/BUCK
index 875c744d1e..46eb139de8 100644
--- a/submodules/HockeySDK-iOS/BUCK
+++ b/submodules/HockeySDK-iOS/BUCK
@@ -55,4 +55,4 @@ static_library(
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
     ],
-)
\ No newline at end of file
+)
diff --git a/submodules/ImageBlur/BUCK b/submodules/ImageBlur/BUCK
index 8c43d100bd..48d65a2fb9 100644
--- a/submodules/ImageBlur/BUCK
+++ b/submodules/ImageBlur/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ImageBlur",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
         "Sources/*.m",
     ]),
     headers = glob([
diff --git a/submodules/ImageCompression/BUCK b/submodules/ImageCompression/BUCK
index 305b778170..04b38610bc 100644
--- a/submodules/ImageCompression/BUCK
+++ b/submodules/ImageCompression/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ImageCompression",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/ImageTransparency/BUCK b/submodules/ImageTransparency/BUCK
index 2f88df0925..28d47290df 100644
--- a/submodules/ImageTransparency/BUCK
+++ b/submodules/ImageTransparency/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ImageTransparency",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/Display:Display#shared",
diff --git a/submodules/InstantPageCache/BUCK b/submodules/InstantPageCache/BUCK
index d1a506c7f0..6136310edf 100644
--- a/submodules/InstantPageCache/BUCK
+++ b/submodules/InstantPageCache/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "InstantPageCache",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/LegacyComponents/BUCK b/submodules/LegacyComponents/BUCK
index ce5591c36f..cb6988336a 100644
--- a/submodules/LegacyComponents/BUCK
+++ b/submodules/LegacyComponents/BUCK
@@ -363,4 +363,4 @@ static_library(
         "$SDKROOT/System/Library/Frameworks/UIKit.framework",
         "$SDKROOT/System/Library/Frameworks/Vision.framework",
     ],
-)
\ No newline at end of file
+)
diff --git a/submodules/LegacyDataImport/BUCK b/submodules/LegacyDataImport/BUCK
index 3a53e75b7d..fbc31668c3 100644
--- a/submodules/LegacyDataImport/BUCK
+++ b/submodules/LegacyDataImport/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LegacyDataImport",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
         "Sources/*.m",
     ]),
     headers = glob([
diff --git a/submodules/LightweightAccountData/BUCK b/submodules/LightweightAccountData/BUCK
index 3869439c88..d74ce3fa82 100644
--- a/submodules/LightweightAccountData/BUCK
+++ b/submodules/LightweightAccountData/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LightweightAccountData",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/LiveLocationManager/BUCK b/submodules/LiveLocationManager/BUCK
index cdbc094a1d..d01b28a3da 100644
--- a/submodules/LiveLocationManager/BUCK
+++ b/submodules/LiveLocationManager/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LiveLocationManager",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic",
diff --git a/submodules/LiveLocationPositionNode/BUCK b/submodules/LiveLocationPositionNode/BUCK
index 9126a65800..847f6998fe 100644
--- a/submodules/LiveLocationPositionNode/BUCK
+++ b/submodules/LiveLocationPositionNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LiveLocationPositionNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
diff --git a/submodules/LiveLocationTimerNode/BUCK b/submodules/LiveLocationTimerNode/BUCK
index 62d854c775..90f16ad856 100644
--- a/submodules/LiveLocationTimerNode/BUCK
+++ b/submodules/LiveLocationTimerNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LiveLocationTimerNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
diff --git a/submodules/LocalAuth/BUCK b/submodules/LocalAuth/BUCK
index 1b842b5960..7d9d8d639b 100644
--- a/submodules/LocalAuth/BUCK
+++ b/submodules/LocalAuth/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LocalAuth",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/LocalMediaResources/BUCK b/submodules/LocalMediaResources/BUCK
index cc1b92c582..57447594a6 100644
--- a/submodules/LocalMediaResources/BUCK
+++ b/submodules/LocalMediaResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LocalMediaResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/LocalizedPeerData/BUCK b/submodules/LocalizedPeerData/BUCK
index d8ca39410e..0f60eef373 100644
--- a/submodules/LocalizedPeerData/BUCK
+++ b/submodules/LocalizedPeerData/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "LocalizedPeerData",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/TelegramCore:TelegramCore#dynamic",
diff --git a/submodules/MapResourceToAvatarSizes/BUCK b/submodules/MapResourceToAvatarSizes/BUCK
index 3bc7ba9f9c..731d4c57cd 100644
--- a/submodules/MapResourceToAvatarSizes/BUCK
+++ b/submodules/MapResourceToAvatarSizes/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "MapResourceToAvatarSizes",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/MediaPlayer/BUCK b/submodules/MediaPlayer/BUCK
index 4a563946d4..f63bd09635 100644
--- a/submodules/MediaPlayer/BUCK
+++ b/submodules/MediaPlayer/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "UniversalMediaPlayer",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
         "Sources/*.m",
     ]),
     headers = glob([
diff --git a/submodules/MediaResources/BUCK b/submodules/MediaResources/BUCK
index 6b5acbd4ce..241434ac98 100644
--- a/submodules/MediaResources/BUCK
+++ b/submodules/MediaResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "MediaResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/MergeLists/BUCK b/submodules/MergeLists/BUCK
index d380710cc0..813a560b49 100644
--- a/submodules/MergeLists/BUCK
+++ b/submodules/MergeLists/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "MergeLists",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/MosaicLayout/BUCK b/submodules/MosaicLayout/BUCK
index 2914f25f74..e28de70b95 100644
--- a/submodules/MosaicLayout/BUCK
+++ b/submodules/MosaicLayout/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "MosaicLayout",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/MusicAlbumArtResources/BUCK b/submodules/MusicAlbumArtResources/BUCK
index bfeb4f226d..a629cbb528 100644
--- a/submodules/MusicAlbumArtResources/BUCK
+++ b/submodules/MusicAlbumArtResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "MusicAlbumArtResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/Opus/BUCK b/submodules/Opus/BUCK
index 681710b9ed..13c082a367 100644
--- a/submodules/Opus/BUCK
+++ b/submodules/Opus/BUCK
@@ -30,7 +30,7 @@ apple_library(
 static_library(
     name = "opus",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     exported_headers = glob([
         "Sources/**/*.h",
diff --git a/submodules/Pdf/BUCK b/submodules/Pdf/BUCK
index d1b5e5eabb..ee8b2ebc72 100644
--- a/submodules/Pdf/BUCK
+++ b/submodules/Pdf/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "Pdf",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/Display:Display#shared",
diff --git a/submodules/PeerPresenceStatusManager/BUCK b/submodules/PeerPresenceStatusManager/BUCK
index 100cea932f..aab8a8561d 100644
--- a/submodules/PeerPresenceStatusManager/BUCK
+++ b/submodules/PeerPresenceStatusManager/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "PeerPresenceStatusManager",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/PersistentStringHash/BUCK b/submodules/PersistentStringHash/BUCK
index 2346b332d3..1774e12b5b 100644
--- a/submodules/PersistentStringHash/BUCK
+++ b/submodules/PersistentStringHash/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "PersistentStringHash",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/PhotoResources/BUCK b/submodules/PhotoResources/BUCK
index fd873255ce..2829be9f45 100644
--- a/submodules/PhotoResources/BUCK
+++ b/submodules/PhotoResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "PhotoResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/PlatformRestrictionMatching/BUCK b/submodules/PlatformRestrictionMatching/BUCK
index 0f7e74075f..be71f01fa0 100644
--- a/submodules/PlatformRestrictionMatching/BUCK
+++ b/submodules/PlatformRestrictionMatching/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "PlatformRestrictionMatching",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/TelegramCore:TelegramCore#dynamic",
diff --git a/submodules/QrCode/BUCK b/submodules/QrCode/BUCK
index e1bccc580c..1661dd7beb 100644
--- a/submodules/QrCode/BUCK
+++ b/submodules/QrCode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "QrCode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/RadialStatusNode/BUCK b/submodules/RadialStatusNode/BUCK
index d041769254..b1172e1bd2 100644
--- a/submodules/RadialStatusNode/BUCK
+++ b/submodules/RadialStatusNode/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "RadialStatusNode",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/Display:Display#dynamic",
diff --git a/submodules/SaveToCameraRoll/BUCK b/submodules/SaveToCameraRoll/BUCK
index bace5e0e7a..8ddc060d1c 100644
--- a/submodules/SaveToCameraRoll/BUCK
+++ b/submodules/SaveToCameraRoll/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "SaveToCameraRoll",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/ScreenCaptureDetection/BUCK b/submodules/ScreenCaptureDetection/BUCK
index d3e7dedcdd..240df6beea 100644
--- a/submodules/ScreenCaptureDetection/BUCK
+++ b/submodules/ScreenCaptureDetection/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ScreenCaptureDetection",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
diff --git a/submodules/ShareItems/BUCK b/submodules/ShareItems/BUCK
index dd8fac4a33..de8969d544 100644
--- a/submodules/ShareItems/BUCK
+++ b/submodules/ShareItems/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "ShareItems",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
         "Sources/*.m",
     ]),
     headers = glob([
diff --git a/submodules/StickerResources/BUCK b/submodules/StickerResources/BUCK
index 10cc8c7b93..77687ed03d 100644
--- a/submodules/StickerResources/BUCK
+++ b/submodules/StickerResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "StickerResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/TelegramApi/BUCK b/submodules/TelegramApi/BUCK
index 1767145ae5..443fad348e 100644
--- a/submodules/TelegramApi/BUCK
+++ b/submodules/TelegramApi/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramApi",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     ],
diff --git a/submodules/TelegramAudio/BUCK b/submodules/TelegramAudio/BUCK
index 7739d8184a..45103e009a 100644
--- a/submodules/TelegramAudio/BUCK
+++ b/submodules/TelegramAudio/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramAudio",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#dynamic",
diff --git a/submodules/TelegramNotices/BUCK b/submodules/TelegramNotices/BUCK
index a1c1b07e2d..7341e6b408 100644
--- a/submodules/TelegramNotices/BUCK
+++ b/submodules/TelegramNotices/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramNotices",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/Postbox:Postbox#shared",
diff --git a/submodules/TelegramPermissions/BUCK b/submodules/TelegramPermissions/BUCK
index baa022d392..c0082babff 100644
--- a/submodules/TelegramPermissions/BUCK
+++ b/submodules/TelegramPermissions/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramPermissions",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/Postbox:Postbox#shared",
diff --git a/submodules/TelegramStringFormatting/BUCK b/submodules/TelegramStringFormatting/BUCK
index a1b6605c78..c66bbb9674 100644
--- a/submodules/TelegramStringFormatting/BUCK
+++ b/submodules/TelegramStringFormatting/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramStringFormatting",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/TelegramUIPreferences/BUCK b/submodules/TelegramUIPreferences/BUCK
index 33629dcfe5..8bb03414dc 100644
--- a/submodules/TelegramUIPreferences/BUCK
+++ b/submodules/TelegramUIPreferences/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramUIPreferences",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/TelegramUniversalVideoContent/BUCK b/submodules/TelegramUniversalVideoContent/BUCK
index b18b78638e..1af4dece2a 100644
--- a/submodules/TelegramUniversalVideoContent/BUCK
+++ b/submodules/TelegramUniversalVideoContent/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TelegramUniversalVideoContent",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
diff --git a/submodules/TemporaryCachedPeerDataManager/BUCK b/submodules/TemporaryCachedPeerDataManager/BUCK
index 0f5ae88b5d..373333ce0f 100644
--- a/submodules/TemporaryCachedPeerDataManager/BUCK
+++ b/submodules/TemporaryCachedPeerDataManager/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TemporaryCachedPeerDataManager",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/TelegramStringFormatting:TelegramStringFormatting",
diff --git a/submodules/TextFormat/BUCK b/submodules/TextFormat/BUCK
index 1106d477ca..e5adc07eab 100644
--- a/submodules/TextFormat/BUCK
+++ b/submodules/TextFormat/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TextFormat",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
         "//submodules/TelegramCore:TelegramCore#dynamic",
diff --git a/submodules/TinyThumbnail/BUCK b/submodules/TinyThumbnail/BUCK
index a0d1aacf81..e472166ecd 100644
--- a/submodules/TinyThumbnail/BUCK
+++ b/submodules/TinyThumbnail/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "TinyThumbnail",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/Tuples/BUCK b/submodules/Tuples/BUCK
index 304d64d6db..b2ffac741a 100644
--- a/submodules/Tuples/BUCK
+++ b/submodules/Tuples/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "Tuples",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/UrlEscaping/BUCK b/submodules/UrlEscaping/BUCK
index 3eed4f12c1..541c96168a 100644
--- a/submodules/UrlEscaping/BUCK
+++ b/submodules/UrlEscaping/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "UrlEscaping",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",
diff --git a/submodules/UrlHandling/BUCK b/submodules/UrlHandling/BUCK
index d749f46cda..49ac625612 100644
--- a/submodules/UrlHandling/BUCK
+++ b/submodules/UrlHandling/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "UrlHandling",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
diff --git a/submodules/WallpaperResources/BUCK b/submodules/WallpaperResources/BUCK
index 4033829aac..13352b1536 100644
--- a/submodules/WallpaperResources/BUCK
+++ b/submodules/WallpaperResources/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "WallpaperResources",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     deps = [
     	"//submodules/TelegramCore:TelegramCore#shared",
diff --git a/submodules/WebsiteType/BUCK b/submodules/WebsiteType/BUCK
index bdd4c6a9a2..cc609e752b 100644
--- a/submodules/WebsiteType/BUCK
+++ b/submodules/WebsiteType/BUCK
@@ -3,7 +3,7 @@ load("//Config:buck_rule_macros.bzl", "static_library")
 static_library(
     name = "WebsiteType",
     srcs = glob([
-        "Sources/*.swift",
+        "Sources/**/*.swift",
     ]),
     frameworks = [
         "$SDKROOT/System/Library/Frameworks/Foundation.framework",