diff --git a/Telegram/BUILD b/Telegram/BUILD
index 361d602ad8..20c6375775 100644
--- a/Telegram/BUILD
+++ b/Telegram/BUILD
@@ -124,6 +124,8 @@ swift_library(
         "//submodules/SyncCore:SyncCore",
         "//submodules/TelegramCore:TelegramCore",
         "//submodules/AccountContext:AccountContext",
+        "//submodules/lottie-ios:Lottie",
+        "//submodules/ChatListUI:ChatListUI",
     ],
 )
 
diff --git a/Wallet/BUILD b/Wallet/BUILD
index 00f4365394..a924e4a93e 100644
--- a/Wallet/BUILD
+++ b/Wallet/BUILD
@@ -87,7 +87,7 @@ swift_library(
         "//submodules/rlottie:RLottieBinding",
         "//submodules/AnimatedStickerNode:AnimatedStickerNode",
         "//submodules/WalletUI:WalletUI",
-        "//submodules/ffmpeg:FFMpeg",
+        "//submodules/FFMpegBinding:FFMpegBinding",
     ],
 )
 
diff --git a/build-system/unique_directories.bzl b/build-system/unique_directories.bzl
new file mode 100644
index 0000000000..a2ff428504
--- /dev/null
+++ b/build-system/unique_directories.bzl
@@ -0,0 +1,10 @@
+
+def unique_directories(paths):
+    result = []
+    for path in paths:
+        index = path.rfind("/")
+        if index != -1:
+            directory = path[:index]
+            if not directory in result:
+                result.append(directory)
+    return result
diff --git a/submodules/AppBundle/BUILD b/submodules/AppBundle/BUILD
index 80183e0f6b..92d153bd64 100644
--- a/submodules/AppBundle/BUILD
+++ b/submodules/AppBundle/BUILD
@@ -4,14 +4,18 @@ objc_library(
     module_name = "AppBundle",
     enable_modules = True,
     srcs = glob([
-        "Source/AppBundle/*.m",
+        "Sources/**/*.m",
+        "Sources/**/*.h",
     ]),
     hdrs = glob([
-        "Source/AppBundle/*.h",
+        "PublicHeaders/**/*.h",
     ]),
+    includes = [
+       "PublicHeaders", 
+    ],
     sdk_frameworks = [
-      "Foundation",
-      "UIKit",
+        "Foundation",
+        "UIKit",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/AppBundle/Source/AppBundle/AppBundle.h b/submodules/AppBundle/PublicHeaders/AppBundle/AppBundle.h
similarity index 53%
rename from submodules/AppBundle/Source/AppBundle/AppBundle.h
rename to submodules/AppBundle/PublicHeaders/AppBundle/AppBundle.h
index b78e84bc8d..d00fe35efa 100644
--- a/submodules/AppBundle/Source/AppBundle/AppBundle.h
+++ b/submodules/AppBundle/PublicHeaders/AppBundle/AppBundle.h
@@ -1,12 +1,6 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-//! Project version number for AppBundle.
-FOUNDATION_EXPORT double AppBundleVersionNumber;
-
-//! Project version string for AppBundle.
-FOUNDATION_EXPORT const unsigned char AppBundleVersionString[];
-
 NSBundle * _Nonnull getAppBundle(void);
 
 @interface UIImage (AppBundle)
diff --git a/submodules/AppBundle/Source/AppBundle/AppBundle.m b/submodules/AppBundle/Sources/AppBundle/AppBundle.m
similarity index 96%
rename from submodules/AppBundle/Source/AppBundle/AppBundle.m
rename to submodules/AppBundle/Sources/AppBundle/AppBundle.m
index 8103a03e40..66f5e08fc8 100644
--- a/submodules/AppBundle/Source/AppBundle/AppBundle.m
+++ b/submodules/AppBundle/Sources/AppBundle/AppBundle.m
@@ -1,4 +1,4 @@
-#import "AppBundle.h"
+#import <AppBundle/AppBundle.h>
 
 NSBundle * _Nonnull getAppBundle() {
     NSBundle *bundle = [NSBundle mainBundle];
diff --git a/submodules/FFMpegBinding/BUILD b/submodules/FFMpegBinding/BUILD
new file mode 100644
index 0000000000..094b363bd2
--- /dev/null
+++ b/submodules/FFMpegBinding/BUILD
@@ -0,0 +1,22 @@
+
+objc_library(
+    name = "FFMpegBinding",
+    module_name = "FFMpegBinding",
+    enable_modules = True,
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "Public/**/*.h",
+    ]),
+    includes = [
+        "Public",
+    ],
+    deps = [
+        "//submodules/ffmpeg:ffmpeg",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodec.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodec.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodec.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodec.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodecContext.h
similarity index 89%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodecContext.h
index 3bc227a3aa..92a2c78481 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.h
+++ b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVCodecContext.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#import <FFMpeg/FFMpegAVSampleFormat.h>
+#import <FFMpegBinding/FFMpegAVSampleFormat.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFormatContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFormatContext.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFormatContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFormatContext.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFrame.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFrame.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFrame.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVFrame.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVIOContext.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVIOContext.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVIOContext.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVIOContext.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVSampleFormat.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVSampleFormat.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVSampleFormat.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegAVSampleFormat.h
diff --git a/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegBinding.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegBinding.h
new file mode 100644
index 0000000000..565c6c170a
--- /dev/null
+++ b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegBinding.h
@@ -0,0 +1,12 @@
+#import <UIKit/UIKit.h>
+
+#import <FFMpegBinding/FFMpegGlobals.h>
+#import <FFMpegBinding/FFMpegAVCodecContext.h>
+#import <FFMpegBinding/FFMpegAVIOContext.h>
+#import <FFMpegBinding/FFMpegAVFormatContext.h>
+#import <FFMpegBinding/FFMpegAVSampleFormat.h>
+#import <FFMpegBinding/FFMpegSWResample.h>
+#import <FFMpegBinding/FFMpegAVFrame.h>
+#import <FFMpegBinding/FFMpegPacket.h>
+#import <FFMpegBinding/FFMpegAVCodec.h>
+#import <FFMpegBinding/FFMpegRemuxer.h>
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegGlobals.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegGlobals.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegGlobals.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegGlobals.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegPacket.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegPacket.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegPacket.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegPacket.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegRemuxer.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegRemuxer.h
similarity index 100%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegRemuxer.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegRemuxer.h
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.h b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegSWResample.h
similarity index 92%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.h
rename to submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegSWResample.h
index 2228f2bd8c..3b56a9c8ad 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.h
+++ b/submodules/FFMpegBinding/Public/FFMpegBinding/FFMpegSWResample.h
@@ -1,6 +1,6 @@
 #import <Foundation/Foundation.h>
 
-#import <FFMpeg/FFMpegAVSampleFormat.h>
+#import <FFMpegBinding/FFMpegAVSampleFormat.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodec.m b/submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
similarity index 93%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodec.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
index 86cab534a2..857462cfec 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodec.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegAVCodec.m
@@ -1,4 +1,4 @@
-#import "FFMpegAVCodec.h"
+#import <FFMpegBinding/FFMpegAVCodec.h>
 
 #import "libavcodec/avcodec.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
similarity index 89%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
index 5d7ff9f9f6..5f63c84f80 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVCodecContext.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegAVCodecContext.m
@@ -1,7 +1,7 @@
-#import "FFMpegAVCodecContext.h"
+#import <FFMpegBinding/FFMpegAVCodecContext.h>
 
-#import "FFMpegAVFrame.h"
-#import "FFMpegAVCodec.h"
+#import <FFMpegBinding/FFMpegAVFrame.h>
+#import <FFMpegBinding/FFMpegAVCodec.h>
 
 #import "libavcodec/avcodec.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFormatContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
similarity index 96%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFormatContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
index 45b732b4ec..5d91d6b080 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFormatContext.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegAVFormatContext.m
@@ -1,8 +1,8 @@
-#import "FFMpegAVFormatContext.h"
+#import <FFMpegBinding/FFMpegAVFormatContext.h>
 
-#import "FFMpegAVIOContext.h"
-#import "FFMpegPacket.h"
-#import "FFMpegAVCodecContext.h"
+#import <FFMpegBinding/FFMpegAVIOContext.h>
+#import <FFMpegBinding/FFMpegPacket.h>
+#import <FFMpegBinding/FFMpegAVCodecContext.h>
 
 #import "libavformat/avformat.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFrame.m b/submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
similarity index 95%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFrame.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
index fd1fcb203a..2598869967 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVFrame.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegAVFrame.m
@@ -1,4 +1,4 @@
-#import "FFMpegAVFrame.h"
+#import <FFMpegBinding/FFMpegAVFrame.h>
 
 #import "libavformat/avformat.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVIOContext.m b/submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
similarity index 96%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegAVIOContext.m
rename to submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
index cdc46664f0..8f76b54667 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegAVIOContext.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegAVIOContext.m
@@ -1,4 +1,4 @@
-#import "FFMpegAVIOContext.h"
+#import <FFMpegBinding/FFMpegAVIOContext.h>
 
 #import "libavformat/avformat.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegGlobals.m b/submodules/FFMpegBinding/Sources/FFMpegGlobals.m
similarity index 84%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegGlobals.m
rename to submodules/FFMpegBinding/Sources/FFMpegGlobals.m
index c507fff969..8729f8a3a9 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegGlobals.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegGlobals.m
@@ -1,4 +1,4 @@
-#import "FFMpegGlobals.h"
+#import <FFMpegBinding/FFMpegGlobals.h>
 
 #import "libavformat/avformat.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegPacket.m b/submodules/FFMpegBinding/Sources/FFMpegPacket.m
similarity index 91%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegPacket.m
rename to submodules/FFMpegBinding/Sources/FFMpegPacket.m
index 902348ea8d..bf647d2370 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegPacket.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegPacket.m
@@ -1,6 +1,6 @@
-#import "FFMpegPacket.h"
+#import <FFMpegBinding/FFMpegPacket.h>
 
-#import "FFMpegAVCodecContext.h"
+#import <FFMpegBinding/FFMpegAVCodecContext.h>
 
 #import "libavformat/avformat.h"
 
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegRemuxer.m b/submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
similarity index 99%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegRemuxer.m
rename to submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
index c3adbf8f66..c137b4828b 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegRemuxer.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegRemuxer.m
@@ -1,6 +1,6 @@
-#import "FFMpegRemuxer.h"
+#import <FFMpegBinding/FFMpegRemuxer.h>
 
-#import "FFMpegAVIOContext.h"
+#import <FFMpegBinding/FFMpegAVIOContext.h>
 
 #include "libavutil/timestamp.h"
 #include "libavformat/avformat.h"
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.m b/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
similarity index 97%
rename from submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.m
rename to submodules/FFMpegBinding/Sources/FFMpegSWResample.m
index 6faf60755f..3afe624447 100644
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpegSWResample.m
+++ b/submodules/FFMpegBinding/Sources/FFMpegSWResample.m
@@ -1,6 +1,6 @@
-#import "FFMpegSWResample.h"
+#import <FFMpegBinding/FFMpegSWResample.h>
 
-#import "FFMpegAVFrame.h"
+#import <FFMpegBinding/FFMpegAVFrame.h>
 
 #import "libavcodec/avcodec.h"
 #import "libswresample/swresample.h"
diff --git a/submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h b/submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h
index 1a06dcc567..55830298bc 100644
--- a/submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h
+++ b/submodules/FastBlur/PublicHeaders/FastBlur/FastBlur.h
@@ -3,6 +3,8 @@
 
 #import <Foundation/Foundation.h>
 
+#import <FastBlur/ApplyScreenshotEffect.h>
+
 void imageFastBlur(int imageWidth, int imageHeight, int imageStride, void * _Nonnull pixels);
 void telegramFastBlurMore(int imageWidth, int imageHeight, int imageStride, void * _Nonnull pixels);
 void stickerThumbnailAlphaBlur(int imageWidth, int imageHeight, int imageStride, void * _Nonnull pixels);
diff --git a/submodules/FastBlur/PublicHeaders/FastBlur/ImageBlur.h b/submodules/FastBlur/PublicHeaders/FastBlur/ImageBlur.h
deleted file mode 100644
index c70dd7a483..0000000000
--- a/submodules/FastBlur/PublicHeaders/FastBlur/ImageBlur.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for ImageBlur.
-FOUNDATION_EXPORT double ImageBlurVersionNumber;
-
-//! Project version string for ImageBlur.
-FOUNDATION_EXPORT const unsigned char ImageBlurVersionString[];
-
-#import <ImageBlur/FastBlur.h>
-#import <ImageBlur/ApplyScreenshotEffect.h>
-
-
diff --git a/submodules/LegacyComponents/BUILD b/submodules/LegacyComponents/BUILD
new file mode 100644
index 0000000000..938af834f7
--- /dev/null
+++ b/submodules/LegacyComponents/BUILD
@@ -0,0 +1,44 @@
+
+filegroup(
+    name = "LegacyComponentsResources",
+    srcs = glob([
+        "LegacyComponentsResources.bundle/**/*",
+    ], exclude = ["Resources/LegacyComponentsResources.bundle/**/.*"]),
+)
+
+objc_library(
+    name = "LegacyComponents",
+    enable_modules = True,
+    module_name = "LegacyComponents",
+    srcs = glob([
+        "Sources/*.m",
+        "Sources/*.mm",
+        "Sources/*.c",
+        "Sources/*.cpp",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    copts = [
+        "-Isubmodules/LegacyComponents/PublicHeaders/LegacyComponents",
+    ],
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/SSignalKit/SSignalKit:SSignalKit",
+        "//submodules/AppBundle:AppBundle",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKIt",
+        "QuickLook",
+        "CoreMotion",
+    ],
+    weak_sdk_frameworks = [
+        "Vision",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/LegacyComponents/LegacyComponents/Info.plist b/submodules/LegacyComponents/LegacyComponents/Info.plist
deleted file mode 100644
index fbe1e6b314..0000000000
--- a/submodules/LegacyComponents/LegacyComponents/Info.plist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>en</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-	<key>NSPrincipalClass</key>
-	<string></string>
-</dict>
-</plist>
diff --git a/submodules/LegacyComponents/LegacyComponents/ASActor.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASActor.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASActor.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASActor.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ASHandle.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASHandle.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASHandle.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASHandle.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ASQueue.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASQueue.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASQueue.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASQueue.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ASWatcher.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASWatcher.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASWatcher.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/ASWatcher.h
diff --git a/submodules/LegacyComponents/LegacyComponents/AVURLAsset+TGMediaItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/AVURLAsset+TGMediaItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/AVURLAsset+TGMediaItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/AVURLAsset+TGMediaItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ActionStage.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/ActionStage.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ActionStage.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/ActionStage.h
diff --git a/submodules/LegacyComponents/LegacyComponents/Freedom.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/Freedom.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Freedom.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/Freedom.h
diff --git a/submodules/LegacyComponents/LegacyComponents/FreedomUIKit.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/FreedomUIKit.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/FreedomUIKit.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/FreedomUIKit.h
diff --git a/submodules/LegacyComponents/LegacyComponents/HPGrowingTextView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPGrowingTextView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/HPGrowingTextView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPGrowingTextView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/HPTextViewInternal.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/HPTextViewInternal.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/HPTextViewInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/JNWSpringAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/JNWSpringAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/JNWSpringAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/JNWSpringAnimation.h
diff --git a/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponents.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponents.h
new file mode 100644
index 0000000000..d584d8d03e
--- /dev/null
+++ b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponents.h
@@ -0,0 +1,309 @@
+#import <Foundation/Foundation.h>
+#import <UIKit/UIKit.h>
+
+#import <LegacyComponents/ASActor.h>
+#import <LegacyComponents/ASHandle.h>
+#import <LegacyComponents/ASQueue.h>
+#import <LegacyComponents/ASWatcher.h>
+#import <LegacyComponents/AVURLAsset+TGMediaItem.h>
+#import <LegacyComponents/ActionStage.h>
+#import <LegacyComponents/Freedom.h>
+#import <LegacyComponents/FreedomUIKit.h>
+#import <LegacyComponents/HPGrowingTextView.h>
+#import <LegacyComponents/HPTextViewInternal.h>
+#import <LegacyComponents/JNWSpringAnimation.h>
+#import <LegacyComponents/LegacyComponents.h>
+#import <LegacyComponents/LegacyComponentsAccessChecker.h>
+#import <LegacyComponents/LegacyComponentsContext.h>
+#import <LegacyComponents/LegacyComponentsGlobals.h>
+#import <LegacyComponents/LegacyHTTPRequestOperation.h>
+#import <LegacyComponents/NSInputStream+TL.h>
+#import <LegacyComponents/NSObject+TGLock.h>
+#import <LegacyComponents/PGCamera.h>
+#import <LegacyComponents/PGCameraCaptureSession.h>
+#import <LegacyComponents/PGCameraDeviceAngleSampler.h>
+#import <LegacyComponents/PGCameraMomentSegment.h>
+#import <LegacyComponents/PGCameraMomentSession.h>
+#import <LegacyComponents/PGCameraMovieWriter.h>
+#import <LegacyComponents/PGCameraShotMetadata.h>
+#import <LegacyComponents/PGCameraVolumeButtonHandler.h>
+#import <LegacyComponents/PGPhotoEditorValues.h>
+#import <LegacyComponents/POPAnimatableProperty.h>
+#import <LegacyComponents/POPAnimation.h>
+#import <LegacyComponents/POPAnimationEvent.h>
+#import <LegacyComponents/POPAnimationTracer.h>
+#import <LegacyComponents/POPBasicAnimation.h>
+#import <LegacyComponents/POPCustomAnimation.h>
+#import <LegacyComponents/POPDecayAnimation.h>
+#import <LegacyComponents/POPGeometry.h>
+#import <LegacyComponents/POPPropertyAnimation.h>
+#import <LegacyComponents/POPSpringAnimation.h>
+#import <LegacyComponents/PSCoding.h>
+#import <LegacyComponents/PSData.h>
+#import <LegacyComponents/PSKeyValueCoder.h>
+#import <LegacyComponents/PSKeyValueDecoder.h>
+#import <LegacyComponents/PSKeyValueEncoder.h>
+#import <LegacyComponents/PSKeyValueReader.h>
+#import <LegacyComponents/PSKeyValueStore.h>
+#import <LegacyComponents/PSKeyValueWriter.h>
+#import <LegacyComponents/PSLMDBKeyValueCursor.h>
+#import <LegacyComponents/PSLMDBKeyValueReaderWriter.h>
+#import <LegacyComponents/PSLMDBKeyValueStore.h>
+#import <LegacyComponents/PSLMDBTable.h>
+#import <LegacyComponents/RMPhoneFormat.h>
+#import <LegacyComponents/SGraphListNode.h>
+#import <LegacyComponents/SGraphNode.h>
+#import <LegacyComponents/SGraphObjectNode.h>
+#import <LegacyComponents/TGActionMediaAttachment.h>
+#import <LegacyComponents/TGAlphacode.h>
+#import <LegacyComponents/TGAnimationBlockDelegate.h>
+#import <LegacyComponents/TGAttachmentCameraView.h>
+#import <LegacyComponents/TGAttachmentCarouselItemView.h>
+#import <LegacyComponents/TGAudioMediaAttachment.h>
+#import <LegacyComponents/TGAudioWaveform.h>
+#import <LegacyComponents/TGAuthorSignatureMediaAttachment.h>
+#import <LegacyComponents/TGBackdropView.h>
+#import <LegacyComponents/TGBotComandInfo.h>
+#import <LegacyComponents/TGBotContextResultAttachment.h>
+#import <LegacyComponents/TGBotInfo.h>
+#import <LegacyComponents/TGBotReplyMarkup.h>
+#import <LegacyComponents/TGBotReplyMarkupButton.h>
+#import <LegacyComponents/TGBotReplyMarkupRow.h>
+#import <LegacyComponents/TGCache.h>
+#import <LegacyComponents/TGCameraCapturedPhoto.h>
+#import <LegacyComponents/TGCameraCapturedVideo.h>
+#import <LegacyComponents/TGCameraController.h>
+#import <LegacyComponents/TGCameraFlashActiveView.h>
+#import <LegacyComponents/TGCameraFlashControl.h>
+#import <LegacyComponents/TGCameraFlipButton.h>
+#import <LegacyComponents/TGCameraInterfaceAssets.h>
+#import <LegacyComponents/TGCameraMainPhoneView.h>
+#import <LegacyComponents/TGCameraMainTabletView.h>
+#import <LegacyComponents/TGCameraMainView.h>
+#import <LegacyComponents/TGCameraModeControl.h>
+#import <LegacyComponents/TGCameraPhotoPreviewController.h>
+#import <LegacyComponents/TGCameraPreviewView.h>
+#import <LegacyComponents/TGCameraSegmentsView.h>
+#import <LegacyComponents/TGCameraShutterButton.h>
+#import <LegacyComponents/TGCameraTimeCodeView.h>
+#import <LegacyComponents/TGCameraZoomView.h>
+#import <LegacyComponents/TGChannelAdminRights.h>
+#import <LegacyComponents/TGChannelBannedRights.h>
+#import <LegacyComponents/TGCheckButtonView.h>
+#import <LegacyComponents/TGClipboardGalleryMixin.h>
+#import <LegacyComponents/TGClipboardGalleryPhotoItem.h>
+#import <LegacyComponents/TGClipboardMenu.h>
+#import <LegacyComponents/TGContactMediaAttachment.h>
+#import <LegacyComponents/TGConversation.h>
+#import <LegacyComponents/TGDataResource.h>
+#import <LegacyComponents/TGDatabaseMessageDraft.h>
+#import <LegacyComponents/TGDateUtils.h>
+#import <LegacyComponents/TGDocumentAttributeAnimated.h>
+#import <LegacyComponents/TGDocumentAttributeAudio.h>
+#import <LegacyComponents/TGDocumentAttributeFilename.h>
+#import <LegacyComponents/TGDocumentAttributeImageSize.h>
+#import <LegacyComponents/TGDocumentAttributeSticker.h>
+#import <LegacyComponents/TGDocumentAttributeVideo.h>
+#import <LegacyComponents/TGDocumentMediaAttachment.h>
+#import <LegacyComponents/TGDoubleTapGestureRecognizer.h>
+#import <LegacyComponents/TGEmbedPIPButton.h>
+#import <LegacyComponents/TGEmbedPIPPullArrowView.h>
+#import <LegacyComponents/TGEmbedPlayerControls.h>
+#import <LegacyComponents/TGEmbedPlayerState.h>
+#import <LegacyComponents/TGEmbedPlayerView.h>
+#import <LegacyComponents/TGFont.h>
+#import <LegacyComponents/TGForwardedMessageMediaAttachment.h>
+#import <LegacyComponents/TGFullscreenContainerView.h>
+#import <LegacyComponents/TGGameMediaAttachment.h>
+#import <LegacyComponents/TGGifConverter.h>
+#import <LegacyComponents/TGGradientLabel.h>
+#import <LegacyComponents/TGHacks.h>
+#import <LegacyComponents/TGIconSwitchView.h>
+#import <LegacyComponents/TGImageBlur.h>
+#import <LegacyComponents/TGImageDataSource.h>
+#import <LegacyComponents/TGImageInfo.h>
+#import <LegacyComponents/TGImageLuminanceMap.h>
+#import <LegacyComponents/TGImageManager.h>
+#import <LegacyComponents/TGImageManagerTask.h>
+#import <LegacyComponents/TGImageMediaAttachment.h>
+#import <LegacyComponents/TGImagePickerController.h>
+#import <LegacyComponents/TGImageUtils.h>
+#import <LegacyComponents/TGImageView.h>
+#import <LegacyComponents/TGInputTextTag.h>
+#import <LegacyComponents/TGInstantPage.h>
+#import <LegacyComponents/TGInvoiceMediaAttachment.h>
+#import <LegacyComponents/TGItemMenuSheetPreviewView.h>
+#import <LegacyComponents/TGItemPreviewController.h>
+#import <LegacyComponents/TGItemPreviewView.h>
+#import <LegacyComponents/TGKeyCommand.h>
+#import <LegacyComponents/TGKeyCommandController.h>
+#import <LegacyComponents/TGLabel.h>
+#import <LegacyComponents/TGLegacyCameraController.h>
+#import <LegacyComponents/TGLetteredAvatarView.h>
+#import <LegacyComponents/TGListsTableView.h>
+#import <LegacyComponents/TGLiveUploadInterface.h>
+#import <LegacyComponents/TGLocalMessageMetaMediaAttachment.h>
+#import <LegacyComponents/TGLocalization.h>
+#import <LegacyComponents/TGLocationLiveElapsedView.h>
+#import <LegacyComponents/TGLocationLiveSessionItemView.h>
+#import <LegacyComponents/TGLocationMapViewController.h>
+#import <LegacyComponents/TGLocationMediaAttachment.h>
+#import <LegacyComponents/TGLocationPickerController.h>
+#import <LegacyComponents/TGLocationPulseView.h>
+#import <LegacyComponents/TGLocationVenue.h>
+#import <LegacyComponents/TGLocationViewController.h>
+#import <LegacyComponents/TGLocationWavesView.h>
+#import <LegacyComponents/TGMediaAsset.h>
+#import <LegacyComponents/TGMediaAssetFetchResult.h>
+#import <LegacyComponents/TGMediaAssetFetchResultChange.h>
+#import <LegacyComponents/TGMediaAssetGroup.h>
+#import <LegacyComponents/TGMediaAssetImageSignals.h>
+#import <LegacyComponents/TGMediaAssetMoment.h>
+#import <LegacyComponents/TGMediaAssetMomentList.h>
+#import <LegacyComponents/TGMediaAssetsController.h>
+#import <LegacyComponents/TGMediaAssetsLibrary.h>
+#import <LegacyComponents/TGMediaAssetsModernLibrary.h>
+#import <LegacyComponents/TGMediaAssetsUtils.h>
+#import <LegacyComponents/TGMediaAttachment.h>
+#import <LegacyComponents/TGMediaAvatarEditorTransition.h>
+#import <LegacyComponents/TGMediaAvatarMenuMixin.h>
+#import <LegacyComponents/TGMediaEditingContext.h>
+#import <LegacyComponents/TGMediaOriginInfo.h>
+#import <LegacyComponents/TGMediaPickerGalleryInterfaceView.h>
+#import <LegacyComponents/TGMediaPickerGalleryModel.h>
+#import <LegacyComponents/TGMediaSelectionContext.h>
+#import <LegacyComponents/TGMediaVideoConverter.h>
+#import <LegacyComponents/TGMemoryImageCache.h>
+#import <LegacyComponents/TGMenuSheetButtonItemView.h>
+#import <LegacyComponents/TGMenuSheetCollectionView.h>
+#import <LegacyComponents/TGMenuSheetController.h>
+#import <LegacyComponents/TGMenuSheetItemView.h>
+#import <LegacyComponents/TGMenuSheetTitleItemView.h>
+#import <LegacyComponents/TGMenuSheetView.h>
+#import <LegacyComponents/TGMenuView.h>
+#import <LegacyComponents/TGMessage.h>
+#import <LegacyComponents/TGMessageEntitiesAttachment.h>
+#import <LegacyComponents/TGMessageEntity.h>
+#import <LegacyComponents/TGMessageEntityBold.h>
+#import <LegacyComponents/TGMessageEntityBotCommand.h>
+#import <LegacyComponents/TGMessageEntityCashtag.h>
+#import <LegacyComponents/TGMessageEntityCode.h>
+#import <LegacyComponents/TGMessageEntityEmail.h>
+#import <LegacyComponents/TGMessageEntityHashtag.h>
+#import <LegacyComponents/TGMessageEntityItalic.h>
+#import <LegacyComponents/TGMessageEntityMention.h>
+#import <LegacyComponents/TGMessageEntityMentionName.h>
+#import <LegacyComponents/TGMessageEntityPhone.h>
+#import <LegacyComponents/TGMessageEntityPre.h>
+#import <LegacyComponents/TGMessageEntityTextUrl.h>
+#import <LegacyComponents/TGMessageEntityUrl.h>
+#import <LegacyComponents/TGMessageGroup.h>
+#import <LegacyComponents/TGMessageHole.h>
+#import <LegacyComponents/TGMessageImageViewOverlayView.h>
+#import <LegacyComponents/TGMessageViewCountContentProperty.h>
+#import <LegacyComponents/TGModernBackToolbarButton.h>
+#import <LegacyComponents/TGModernButton.h>
+#import <LegacyComponents/TGModernCache.h>
+#import <LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h>
+#import <LegacyComponents/TGModernConversationAssociatedInputPanel.h>
+#import <LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h>
+#import <LegacyComponents/TGModernConversationInputMicButton.h>
+#import <LegacyComponents/TGModernConversationMentionsAssociatedPanel.h>
+#import <LegacyComponents/TGModernConversationTitleActivityIndicator.h>
+#import <LegacyComponents/TGModernGalleryContainerView.h>
+#import <LegacyComponents/TGModernGalleryController.h>
+#import <LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h>
+#import <LegacyComponents/TGModernGalleryDefaultFooterView.h>
+#import <LegacyComponents/TGModernGalleryDefaultHeaderView.h>
+#import <LegacyComponents/TGModernGalleryDefaultInterfaceView.h>
+#import <LegacyComponents/TGModernGalleryEditableItem.h>
+#import <LegacyComponents/TGModernGalleryEditableItemView.h>
+#import <LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h>
+#import <LegacyComponents/TGModernGalleryImageItem.h>
+#import <LegacyComponents/TGModernGalleryImageItemContainerView.h>
+#import <LegacyComponents/TGModernGalleryImageItemImageView.h>
+#import <LegacyComponents/TGModernGalleryImageItemView.h>
+#import <LegacyComponents/TGModernGalleryInterfaceView.h>
+#import <LegacyComponents/TGModernGalleryItem.h>
+#import <LegacyComponents/TGModernGalleryItemView.h>
+#import <LegacyComponents/TGModernGalleryModel.h>
+#import <LegacyComponents/TGModernGalleryScrollView.h>
+#import <LegacyComponents/TGModernGallerySelectableItem.h>
+#import <LegacyComponents/TGModernGalleryTransitionView.h>
+#import <LegacyComponents/TGModernGalleryVideoView.h>
+#import <LegacyComponents/TGModernGalleryView.h>
+#import <LegacyComponents/TGModernGalleryZoomableItemView.h>
+#import <LegacyComponents/TGModernGalleryZoomableItemViewContent.h>
+#import <LegacyComponents/TGModernGalleryZoomableScrollView.h>
+#import <LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h>
+#import <LegacyComponents/TGModernToolbarButton.h>
+#import <LegacyComponents/TGNavigationBar.h>
+#import <LegacyComponents/TGNavigationController.h>
+#import <LegacyComponents/TGObserverProxy.h>
+#import <LegacyComponents/TGOverlayController.h>
+#import <LegacyComponents/TGOverlayControllerWindow.h>
+#import <LegacyComponents/TGPIPAblePlayerView.h>
+#import <LegacyComponents/TGPaintShader.h>
+#import <LegacyComponents/TGPaintUndoManager.h>
+#import <LegacyComponents/TGPaintUtils.h>
+#import <LegacyComponents/TGPaintingData.h>
+#import <LegacyComponents/TGPassportAttachMenu.h>
+#import <LegacyComponents/TGPassportICloud.h>
+#import <LegacyComponents/TGPassportMRZ.h>
+#import <LegacyComponents/TGPassportOCR.h>
+#import <LegacyComponents/TGPassportScanController.h>
+#import <LegacyComponents/TGPeerIdAdapter.h>
+#import <LegacyComponents/TGPhoneUtils.h>
+#import <LegacyComponents/TGPhotoEditorAnimation.h>
+#import <LegacyComponents/TGPhotoEditorButton.h>
+#import <LegacyComponents/TGPhotoEditorController.h>
+#import <LegacyComponents/TGPhotoEditorInterfaceAssets.h>
+#import <LegacyComponents/TGPhotoEditorSliderView.h>
+#import <LegacyComponents/TGPhotoEditorToolView.h>
+#import <LegacyComponents/TGPhotoEditorUtils.h>
+#import <LegacyComponents/TGPhotoMaskPosition.h>
+#import <LegacyComponents/TGPhotoPaintEntity.h>
+#import <LegacyComponents/TGPhotoPaintStickerEntity.h>
+#import <LegacyComponents/TGPhotoToolbarView.h>
+#import <LegacyComponents/TGPhotoVideoEditor.h>
+#import <LegacyComponents/TGPluralization.h>
+#import <LegacyComponents/TGProgressSpinnerView.h>
+#import <LegacyComponents/TGProgressWindow.h>
+#import <LegacyComponents/TGProxyWindow.h>
+#import <LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h>
+#import <LegacyComponents/TGRemoteImageView.h>
+#import <LegacyComponents/TGReplyMarkupAttachment.h>
+#import <LegacyComponents/TGReplyMessageMediaAttachment.h>
+#import <LegacyComponents/TGSearchBar.h>
+#import <LegacyComponents/TGSearchDisplayMixin.h>
+#import <LegacyComponents/TGStaticBackdropAreaData.h>
+#import <LegacyComponents/TGStaticBackdropImageData.h>
+#import <LegacyComponents/TGStickerAssociation.h>
+#import <LegacyComponents/TGStickerKeyboardTabPanel.h>
+#import <LegacyComponents/TGStickerPack.h>
+#import <LegacyComponents/TGStickerPackReference.h>
+#import <LegacyComponents/TGStringUtils.h>
+#import <LegacyComponents/TGSuggestionContext.h>
+#import <LegacyComponents/TGTextCheckingResult.h>
+#import <LegacyComponents/TGTimerTarget.h>
+#import <LegacyComponents/TGToolbarButton.h>
+#import <LegacyComponents/TGTooltipView.h>
+#import <LegacyComponents/TGUnsupportedMediaAttachment.h>
+#import <LegacyComponents/TGUser.h>
+#import <LegacyComponents/TGViaUserAttachment.h>
+#import <LegacyComponents/TGVideoEditAdjustments.h>
+#import <LegacyComponents/TGVideoInfo.h>
+#import <LegacyComponents/TGVideoMediaAttachment.h>
+#import <LegacyComponents/TGVideoMessageCaptureController.h>
+#import <LegacyComponents/TGViewController+TGRecursiveEnumeration.h>
+#import <LegacyComponents/TGViewController.h>
+#import <LegacyComponents/TGWeakDelegate.h>
+#import <LegacyComponents/TGWebDocument.h>
+#import <LegacyComponents/TGWebPageMediaAttachment.h>
+#import <LegacyComponents/UICollectionView+Utils.h>
+#import <LegacyComponents/UIControl+HitTestEdgeInsets.h>
+#import <LegacyComponents/UIDevice+PlatformInfo.h>
+#import <LegacyComponents/UIImage+TG.h>
+#import <LegacyComponents/UIImage+TGMediaEditableItem.h>
+#import <LegacyComponents/UIScrollView+TGHacks.h>
+#import <LegacyComponents/lmdb.h>
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsAccessChecker.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsAccessChecker.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsAccessChecker.h
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsContext.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsContext.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsContext.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsContext.h
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsGlobals.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsGlobals.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyComponentsGlobals.h
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyHTTPRequestOperation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyHTTPRequestOperation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyHTTPRequestOperation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/LegacyHTTPRequestOperation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/NSInputStream+TL.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/NSInputStream+TL.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSInputStream+TL.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/NSInputStream+TL.h
diff --git a/submodules/LegacyComponents/LegacyComponents/NSObject+TGLock.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/NSObject+TGLock.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSObject+TGLock.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/NSObject+TGLock.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCamera.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCamera.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCamera.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCamera.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraCaptureSession.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraCaptureSession.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraCaptureSession.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraCaptureSession.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraDeviceAngleSampler.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraDeviceAngleSampler.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraDeviceAngleSampler.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraDeviceAngleSampler.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMomentSegment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMomentSegment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMomentSegment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMomentSegment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMomentSession.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMomentSession.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMomentSession.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMomentSession.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMovieWriter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMovieWriter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMovieWriter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraMovieWriter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraShotMetadata.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraShotMetadata.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraShotMetadata.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraShotMetadata.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraVolumeButtonHandler.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraVolumeButtonHandler.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraVolumeButtonHandler.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGCameraVolumeButtonHandler.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorValues.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGPhotoEditorValues.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorValues.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PGPhotoEditorValues.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimatableProperty.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimatableProperty.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimatableProperty.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimatableProperty.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationEvent.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimationEvent.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationEvent.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimationEvent.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationTracer.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimationTracer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationTracer.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPAnimationTracer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPBasicAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPBasicAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPBasicAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPBasicAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPCustomAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPCustomAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPCustomAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPCustomAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPDecayAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPDecayAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPDecayAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPDecayAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPGeometry.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPGeometry.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPGeometry.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPGeometry.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPPropertyAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPPropertyAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPPropertyAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPPropertyAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPSpringAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPSpringAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPSpringAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/POPSpringAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSCoding.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSCoding.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSCoding.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSCoding.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSData.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSData.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSData.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSData.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueCoder.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueCoder.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueCoder.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueCoder.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueDecoder.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueDecoder.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueDecoder.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueDecoder.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueEncoder.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueEncoder.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueEncoder.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueEncoder.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueReader.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueReader.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueReader.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueReader.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueStore.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueStore.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueStore.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueStore.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueWriter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueWriter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueWriter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSKeyValueWriter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueCursor.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueCursor.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueCursor.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueCursor.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueReaderWriter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueReaderWriter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueReaderWriter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueReaderWriter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueStore.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueStore.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueStore.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBKeyValueStore.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBTable.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBTable.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBTable.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/PSLMDBTable.h
diff --git a/submodules/LegacyComponents/LegacyComponents/RMPhoneFormat.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/RMPhoneFormat.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/RMPhoneFormat.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/RMPhoneFormat.h
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphListNode.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphListNode.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphListNode.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphListNode.h
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphNode.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphNode.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphNode.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphNode.h
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphObjectNode.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphObjectNode.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphObjectNode.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/SGraphObjectNode.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGActionMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGActionMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGActionMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGActionMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAlphacode.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAlphacode.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAlphacode.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAlphacode.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAnimationBlockDelegate.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAnimationBlockDelegate.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAnimationBlockDelegate.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAnimationBlockDelegate.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCameraView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCameraView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAttachmentCarouselItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAudioMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAudioMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAudioMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAudioMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAudioWaveform.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAudioWaveform.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAudioWaveform.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAudioWaveform.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAuthorSignatureMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAuthorSignatureMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAuthorSignatureMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGAuthorSignatureMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBackdropView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBackdropView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBackdropView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBackdropView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotComandInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotComandInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotComandInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotComandInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotContextResultAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotContextResultAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotContextResultAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotContextResultAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkup.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkup.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkup.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkup.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkupButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkupButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupRow.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkupRow.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupRow.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGBotReplyMarkupRow.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCache.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCache.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCache.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCache.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraCapturedPhoto.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraCapturedPhoto.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraCapturedPhoto.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraCapturedPhoto.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraCapturedVideo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraCapturedVideo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraCapturedVideo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraCapturedVideo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlashActiveView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlashActiveView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlashActiveView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlashActiveView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlashControl.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlashControl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlashControl.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlashControl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlipButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlipButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlipButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraFlipButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraInterfaceAssets.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraInterfaceAssets.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraInterfaceAssets.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraInterfaceAssets.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainPhoneView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainPhoneView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainPhoneView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainPhoneView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainTabletView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainTabletView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainTabletView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainTabletView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraMainView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraModeControl.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraModeControl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraModeControl.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraModeControl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraPhotoPreviewController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraPhotoPreviewController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraPhotoPreviewController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraPhotoPreviewController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraPreviewView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraPreviewView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraPreviewView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraPreviewView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraSegmentsView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraSegmentsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraSegmentsView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraSegmentsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraShutterButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraShutterButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraShutterButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraShutterButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraTimeCodeView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraTimeCodeView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraTimeCodeView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraTimeCodeView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraZoomView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraZoomView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraZoomView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCameraZoomView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGChannelAdminRights.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGChannelAdminRights.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGChannelAdminRights.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGChannelAdminRights.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGChannelBannedRights.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGChannelBannedRights.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGChannelBannedRights.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGChannelBannedRights.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCheckButtonView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCheckButtonView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCheckButtonView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGCheckButtonView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardGalleryMixin.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryMixin.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardGalleryMixin.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardGalleryPhotoItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardGalleryPhotoItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardMenu.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGClipboardMenu.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGContactMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGContactMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGContactMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGContactMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGConversation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGConversation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGConversation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGConversation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDataResource.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDataResource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDataResource.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDataResource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDatabaseMessageDraft.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDatabaseMessageDraft.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDatabaseMessageDraft.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDatabaseMessageDraft.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDateUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDateUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDateUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDateUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAnimated.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeAnimated.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAnimated.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeAnimated.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAudio.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeAudio.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAudio.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeAudio.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeFilename.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeFilename.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeFilename.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeFilename.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeImageSize.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeImageSize.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeImageSize.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeImageSize.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeSticker.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeSticker.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeSticker.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeSticker.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeVideo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeVideo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeVideo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentAttributeVideo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDocumentMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDoubleTapGestureRecognizer.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDoubleTapGestureRecognizer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDoubleTapGestureRecognizer.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGDoubleTapGestureRecognizer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPIPButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPIPButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPPullArrowView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPIPPullArrowView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPPullArrowView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPIPPullArrowView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerControls.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerControls.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerControls.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerControls.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerState.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerState.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerState.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerState.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGEmbedPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFileUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFileUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFileUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFileUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFont.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFont.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFont.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFont.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGForwardedMessageMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGForwardedMessageMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGForwardedMessageMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGForwardedMessageMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFullscreenContainerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFullscreenContainerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFullscreenContainerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGFullscreenContainerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGameMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGameMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGameMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGameMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGifConverter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGifConverter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGifConverter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGifConverter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGradientLabel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGradientLabel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGradientLabel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGGradientLabel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHacks.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHacks.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGHacks.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGIconSwitchView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGIconSwitchView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGIconSwitchView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGIconSwitchView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageBlur.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageBlur.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageBlur.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageBlur.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageDataSource.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageDataSource.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageLuminanceMap.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageLuminanceMap.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageLuminanceMap.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageLuminanceMap.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageManager.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageManager.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageManager.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageManager.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageManagerTask.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageManagerTask.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageManagerTask.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageManagerTask.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImagePickerController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImagePickerController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImagePickerController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImagePickerController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGImageView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInputTextTag.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInputTextTag.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInputTextTag.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInputTextTag.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInstantPage.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInstantPage.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInstantPage.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInstantPage.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInvoiceMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInvoiceMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInvoiceMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGInvoiceMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemMenuSheetPreviewView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemMenuSheetPreviewView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemMenuSheetPreviewView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemMenuSheetPreviewView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemPreviewController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemPreviewController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemPreviewController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemPreviewController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemPreviewView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemPreviewView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemPreviewView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGItemPreviewView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGKeyCommand.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGKeyCommand.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGKeyCommand.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGKeyCommand.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGKeyCommandController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGKeyCommandController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGKeyCommandController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGKeyCommandController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLabel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLabel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLabel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLabel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLegacyCameraController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLegacyCameraController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLegacyCameraController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLegacyCameraController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLetteredAvatarView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLetteredAvatarView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLetteredAvatarView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLetteredAvatarView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGListsTableView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGListsTableView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGListsTableView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGListsTableView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLiveUploadInterface.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLiveUploadInterface.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLiveUploadInterface.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLiveUploadInterface.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocalMessageMetaMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocalMessageMetaMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocalMessageMetaMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocalMessageMetaMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocalization.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocalization.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocalization.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocalization.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveElapsedView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationLiveElapsedView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveElapsedView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationLiveElapsedView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationLiveSessionItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationLiveSessionItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationMapViewController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationMapViewController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationPickerController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationPickerController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPulseView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationPulseView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPulseView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationPulseView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationVenue.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationVenue.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationVenue.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationVenue.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationViewController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationViewController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationViewController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationWavesView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationWavesView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationWavesView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGLocationWavesView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset+TGMediaEditableItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAsset+TGMediaEditableItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAsset+TGMediaEditableItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAsset+TGMediaEditableItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAsset.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAsset.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAsset.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResult.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetFetchResult.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResult.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetFetchResult.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResultChange.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetFetchResultChange.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResultChange.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetFetchResultChange.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetGroup.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetGroup.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetImageSignals.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetImageSignals.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetImageSignals.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetImageSignals.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetMoment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetMoment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetMoment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetMoment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetMomentList.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetMomentList.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetMomentList.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetMomentList.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLibrary.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsLibrary.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLibrary.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsLibrary.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsModernLibrary.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsModernLibrary.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAssetsUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarEditorTransition.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarEditorTransition.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAvatarEditorTransition.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarEditorTransition.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaAvatarMenuMixin.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaEditingContext.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaEditingContext.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaEditingContext.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaEditingContext.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaOriginInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaOriginInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaOriginInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaOriginInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerCaptionInputPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerCaptionInputPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerCaptionInputPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerCaptionInputPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerCell.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerCell.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryInterfaceView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryInterfaceView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryModel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryModel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryModel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryModel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryPhotoItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryPhotoItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryVideoItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryVideoItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryVideoItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerGalleryVideoItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerLayoutMetrics.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerLayoutMetrics.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerLayoutMetrics.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerLayoutMetrics.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerModernGalleryMixin.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerModernGalleryMixin.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerSendActionSheetController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerSendActionSheetController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerSendActionSheetController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerSendActionSheetController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerToolbarView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerToolbarView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerToolbarView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaPickerToolbarView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaSelectionContext.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaSelectionContext.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaSelectionContext.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaSelectionContext.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaVideoConverter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaVideoConverter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaVideoConverter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMediaVideoConverter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMemoryImageCache.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMemoryImageCache.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMemoryImageCache.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMemoryImageCache.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetButtonItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetButtonItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetCollectionView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetCollectionView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetCollectionView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetCollectionView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetTitleItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetTitleItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetTitleItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetTitleItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuSheetView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMenuView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessage.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessage.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessage.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessage.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntitiesAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntitiesAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntitiesAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntitiesAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntity.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntity.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntity.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntity.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityBold.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityBold.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityBold.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityBold.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityBotCommand.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityBotCommand.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityBotCommand.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityBotCommand.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityCashtag.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityCashtag.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityCashtag.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityCashtag.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityCode.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityCode.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityCode.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityCode.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityEmail.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityEmail.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityEmail.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityEmail.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityHashtag.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityHashtag.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityHashtag.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityHashtag.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityItalic.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityItalic.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityItalic.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityItalic.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityMention.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityMention.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityMention.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityMention.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityMentionName.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityMentionName.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityMentionName.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityMentionName.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityPhone.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityPhone.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityPhone.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityPhone.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityPre.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityPre.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityPre.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityPre.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityTextUrl.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityTextUrl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityTextUrl.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityTextUrl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityUrl.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityUrl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityUrl.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageEntityUrl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageGroup.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageGroup.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageGroup.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageGroup.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageHole.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageHole.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageHole.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageHole.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageImageViewOverlayView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageImageViewOverlayView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageViewCountContentProperty.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageViewCountContentProperty.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageViewCountContentProperty.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGMessageViewCountContentProperty.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernBackToolbarButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernBackToolbarButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernBackToolbarButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernBackToolbarButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernBarButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernBarButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernBarButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernBarButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernCache.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernCache.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernCache.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernCache.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationAssociatedInputPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationAssociatedInputPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationAssociatedInputPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationAssociatedInputPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationInputMicButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationInputMicButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationInputMicButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationMentionsAssociatedPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationMentionsAssociatedPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationMentionsAssociatedPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationMentionsAssociatedPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationTitleActivityIndicator.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationTitleActivityIndicator.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationTitleActivityIndicator.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernConversationTitleActivityIndicator.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryContainerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryContainerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryContainerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryContainerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultFooterAccessoryView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultFooterView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultFooterView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultFooterView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultFooterView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultHeaderView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultHeaderView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultHeaderView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultHeaderView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultInterfaceView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultInterfaceView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultInterfaceView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryDefaultInterfaceView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryEditableItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEditableItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryEditableItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEditableItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryEditableItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEditableItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryEditableItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEditableItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemContainerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemContainerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemContainerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemContainerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemImageView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemImageView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemImageView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemImageView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryImageItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryInterfaceView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryInterfaceView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryInterfaceView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryInterfaceView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryModel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryModel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryModel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryModel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryScrollView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryScrollView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryScrollView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryScrollView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGallerySelectableItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGallerySelectableItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGallerySelectableItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGallerySelectableItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryTransitionView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryTransitionView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryTransitionView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryTransitionView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryVideoView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryVideoView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemViewContent.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableItemViewContent.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemViewContent.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableItemViewContent.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableScrollView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableScrollView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernMediaListItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernMediaListItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernToolbarButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernToolbarButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernToolbarButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGModernToolbarButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGNavigationBar.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGNavigationBar.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGNavigationBar.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGNavigationBar.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGNavigationController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGNavigationController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGNavigationController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGNavigationController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGObserverProxy.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGObserverProxy.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGObserverProxy.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGObserverProxy.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGOverlayController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGOverlayController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayControllerWindow.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGOverlayControllerWindow.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayControllerWindow.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGOverlayControllerWindow.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPIPAblePlayerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPIPAblePlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPIPAblePlayerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPIPAblePlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintShader.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintShader.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintShader.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintShader.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintUndoManager.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintUndoManager.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintUndoManager.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintUndoManager.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintingData.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintingData.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintingData.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPaintingData.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportAttachMenu.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportAttachMenu.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportICloud.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportICloud.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportICloud.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportICloud.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportMRZ.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportMRZ.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportMRZ.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportMRZ.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportOCR.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportOCR.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportOCR.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportOCR.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportScanController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportScanController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportScanController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPassportScanController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPeerIdAdapter.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPeerIdAdapter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPeerIdAdapter.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPeerIdAdapter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhoneUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhoneUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhoneUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhoneUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoAvatarCropView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoAvatarCropView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionInputMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoCaptionInputMixin.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionInputMixin.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoCaptionInputMixin.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorAnimation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorAnimation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorAnimation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorAnimation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorInterfaceAssets.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorInterfaceAssets.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorInterfaceAssets.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorInterfaceAssets.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorSliderView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorSliderView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorSliderView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTabController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorTabController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTabController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorTabController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorToolView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorToolView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoEditorUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoMaskPosition.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoMaskPosition.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoMaskPosition.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoMaskPosition.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntity.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintEntity.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntity.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintEntity.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntityView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintEntityView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntityView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintEntityView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintStickerEntity.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintStickerEntity.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintStickerEntity.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoPaintStickerEntity.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolbarView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoToolbarView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolbarView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoToolbarView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoVideoEditor.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPhotoVideoEditor.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPluralization.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPluralization.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPluralization.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGPluralization.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProgressSpinnerView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProgressSpinnerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProgressSpinnerView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProgressSpinnerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProgressWindow.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProgressWindow.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProgressWindow.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProgressWindow.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProxyWindow.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProxyWindow.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProxyWindow.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGProxyWindow.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGRemoteImageView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGRemoteImageView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGRemoteImageView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGRemoteImageView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGReplyMarkupAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGReplyMarkupAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGReplyMarkupAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGReplyMarkupAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGReplyMessageMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGReplyMessageMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGReplyMessageMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGReplyMessageMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSearchBar.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSearchBar.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSearchBar.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSearchBar.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSearchDisplayMixin.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSearchDisplayMixin.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSearchDisplayMixin.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSearchDisplayMixin.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSecretTimerMenu.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSecretTimerMenu.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStaticBackdropAreaData.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStaticBackdropAreaData.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStaticBackdropAreaData.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStaticBackdropAreaData.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStaticBackdropImageData.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStaticBackdropImageData.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStaticBackdropImageData.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStaticBackdropImageData.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerAssociation.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerAssociation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerAssociation.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerAssociation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabPanel.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerKeyboardTabPanel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabPanel.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerKeyboardTabPanel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerPack.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerPack.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerPack.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerPack.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerPackReference.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerPackReference.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerPackReference.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStickerPackReference.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStringUtils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStringUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStringUtils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGStringUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSuggestionContext.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSuggestionContext.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSuggestionContext.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGSuggestionContext.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTextCheckingResult.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTextCheckingResult.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTextCheckingResult.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTextCheckingResult.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTextField.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTextField.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTextField.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTextField.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTimerTarget.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTimerTarget.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTimerTarget.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTimerTarget.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGToolbarButton.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGToolbarButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGToolbarButton.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGToolbarButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTooltipView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTooltipView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTooltipView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGTooltipView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGUnsupportedMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGUnsupportedMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGUnsupportedMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGUnsupportedMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGUser.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGUser.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGUser.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGUser.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViaUserAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViaUserAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViaUserAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViaUserAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLRenderer.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraGLRenderer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLRenderer.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraGLRenderer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraGLView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraGLView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraMovieRecorder.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraMovieRecorder.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraMovieRecorder.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoCameraMovieRecorder.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoEditAdjustments.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoEditAdjustments.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoEditAdjustments.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoEditAdjustments.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageCaptureController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageCaptureController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageCaptureController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageControls.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageControls.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageControls.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageControls.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageRingView.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageRingView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageRingView.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageRingView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageScrubber.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGVideoMessageScrubber.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViewController+TGRecursiveEnumeration.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViewController+TGRecursiveEnumeration.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViewController+TGRecursiveEnumeration.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViewController+TGRecursiveEnumeration.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViewController.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViewController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViewController.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGViewController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWeakDelegate.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWeakDelegate.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWeakDelegate.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWeakDelegate.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWebDocument.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWebDocument.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWebDocument.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWebDocument.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWebPageMediaAttachment.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWebPageMediaAttachment.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWebPageMediaAttachment.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/TGWebPageMediaAttachment.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UICollectionView+Utils.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UICollectionView+Utils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UICollectionView+Utils.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UICollectionView+Utils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UIControl+HitTestEdgeInsets.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIControl+HitTestEdgeInsets.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIControl+HitTestEdgeInsets.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIControl+HitTestEdgeInsets.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UIDevice+PlatformInfo.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIDevice+PlatformInfo.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIDevice+PlatformInfo.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIDevice+PlatformInfo.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UIImage+TG.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIImage+TG.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIImage+TG.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIImage+TG.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UIImage+TGMediaEditableItem.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIImage+TGMediaEditableItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIImage+TGMediaEditableItem.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIImage+TGMediaEditableItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UIScrollView+TGHacks.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIScrollView+TGHacks.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIScrollView+TGHacks.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/UIScrollView+TGHacks.h
diff --git a/submodules/LegacyComponents/LegacyComponents/lmdb.h b/submodules/LegacyComponents/PublicHeaders/LegacyComponents/lmdb.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/lmdb.h
rename to submodules/LegacyComponents/PublicHeaders/LegacyComponents/lmdb.h
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentMenuInteractiveCameraIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentTipIcons@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentTipIcons@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentTipIcons@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/AttachmentTipIcons@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutAccessory@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutAccessory@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutAccessory@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutAccessory@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow_Highlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow_Highlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow_Highlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutArrow_Highlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground_Highlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground_Highlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground_Highlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutBackground_Highlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground_Highlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground_Highlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground_Highlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingBackground_Highlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CalloutDrivingIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraAutoFocusCrosshairs@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraDeleteIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraExposureIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraExposureIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraExposureIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraExposureIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashActive@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashActive@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashActive@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashActive@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlashButton@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFlipButton@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraFocusCrosshairs@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraLargeFlipButton@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraSegmentsBack@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraSegmentsBack@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraSegmentsBack@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CameraSegmentsBack@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CoubWatermark@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CoubWatermark@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/CoubWatermark@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/CoubWatermark@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoFullScreenIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoFullScreenIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoFullScreenIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoFullScreenIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPIPIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPIPIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPIPIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPIPIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPauseIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPauseIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPauseIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPauseIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPlayIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPlayIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPlayIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoPlayIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoTrackHollow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoTrackHollow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoTrackHollow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/EmbedVideoTrackHollow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/FoursquareAttribution@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/FoursquareAttribution@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/FoursquareAttribution@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/FoursquareAttribution@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ImagePickerPhotoCounter_Close@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/InputMicRecordingOverlay@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationInfo_Active@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessageLiveIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinBackground@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationMessagePinShadow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPanelEdge_Highlighted@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPin@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPin@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPin@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPin@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinBackground@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinPoint@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinPoint@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinPoint@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinPoint@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationPinShadow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationSmallCircle@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationTopPanel@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationWave@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationWave@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationWave@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/LocationWave@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupAll@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupAll@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupAll@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupAll@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupBurst@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupBurst@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupBurst@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupBurst@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupFavorites@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupFavorites@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupFavorites@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupFavorites@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupPanoramas@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupPanoramas@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupPanoramas@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupPanoramas@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupScreenshots@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupScreenshots@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupScreenshots@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupScreenshots@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSelfPortraits@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSelfPortraits@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSelfPortraits@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSelfPortraits@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSlomo@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSlomo@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSlomo@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupSlomo@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupTimelapse@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupTimelapse@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupTimelapse@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupTimelapse@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupVideo@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupVideo@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupVideo@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaGroupVideo@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaMute@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerGroupPhotosIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaPickerUngroupPhotosIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/MediaSchedule@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernConversationAudioSlideToCancel@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernListsDisclosureIndicator@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaEmptyAlbumIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaEmptyAlbumIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaEmptyAlbumIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaEmptyAlbumIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemSloMoIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemSloMoIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemSloMoIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemSloMoIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemTimelapseIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemTimelapseIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemTimelapseIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemTimelapseIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemVideoIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemVideoIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemVideoIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernMediaItemVideoIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlBackground@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlDivider@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlHighlighted@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ModernSegmentedControlSelected@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/NavigationSearchIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/NavigationSearchIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/NavigationSearchIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/NavigationSearchIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintBrushIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintCheck@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintCheck@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintCheck@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintCheck@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintEraserIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintMirrorIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupCenterBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupCenterBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupCenterBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupCenterBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeLeftBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeLeftBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeLeftBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeLeftBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeRightBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeRightBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeRightBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupLandscapeRightBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupPortraitBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupPortraitBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupPortraitBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintPopupPortraitBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintRedoIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintRedoIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintRedoIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintRedoIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintSegmentedControlHighlighted@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintSegmentedControlHighlighted@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintSegmentedControlHighlighted@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintSegmentedControlHighlighted@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintStickersIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintTextSettingsIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PaintUndoIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.vsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.vsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.vsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Blit.vsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithEraseMask.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithEraseMask.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithEraseMask.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithEraseMask.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMask.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMask.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMask.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMask.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMaskLight.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMaskLight.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMaskLight.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BlitWithMaskLight.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.vsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.vsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.vsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_Brush.vsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLight.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLight.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLight.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLight.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLightPreview.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLightPreview.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLightPreview.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_BrushLightPreview.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithEraseMask.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithEraseMask.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithEraseMask.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithEraseMask.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMask.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMask.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMask.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMask.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMaskLight.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMaskLight.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMaskLight.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_CompositeWithMaskLight.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_NonPremultipliedBlit.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_NonPremultipliedBlit.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_NonPremultipliedBlit.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Paint_NonPremultipliedBlit.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.vsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.vsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.vsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Passthrough.vsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOff@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PermissionSwitchOn@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorAspectRatioIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurLinear@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurOff@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorBlurRadial@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCamera@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCaption@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCrop@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCropCorners@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCropCorners@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCropCorners@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCropCorners@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorCurvesIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGif@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGifShadow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorGroupPhotosIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMirrorIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMute@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMute@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMute@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMute@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMuteActive@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMuteActive@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMuteActive@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorMuteActive@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorPaint@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorQuality@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotateIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationNeedle@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationNeedle@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationNeedle@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationNeedle@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheel@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheel@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheel@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheel@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelLeft@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelLeft@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelLeft@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelLeft@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelRight@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelRight@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelRight@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorRotationWheelRight@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer0@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTimer@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintTool@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintTool@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintTool@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTintTool@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoEditorTools@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerArrow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerBackIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerCancelIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerDoneIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PhotoPickerSendIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewSheetShadow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewSheetShadow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewSheetShadow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewSheetShadow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewUpArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewUpArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewUpArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/PreviewUpArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordSendIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/RecordVideoIconOverlay@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/Star@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardFavoriteTab@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardGifIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@1x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@1x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@1x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@1x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardRecentTab@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardSettingsIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/StickerKeyboardTrendingIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipArrow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TooltipBackground@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingHeading@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocation@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/TrackingLocationOff@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.fsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.fsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.fsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.fsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.vsh b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.vsh
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.vsh
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessage.vsh
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageLeftHandle@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageLeftHandle@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageLeftHandle@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageLeftHandle@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageMutedIcon@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessagePlaceholder.jpg b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessagePlaceholder.jpg
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessagePlaceholder.jpg
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessagePlaceholder.jpg
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageRightHandle@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageRightHandle@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageRightHandle@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageRightHandle@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberLeftMask@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberLeftMask@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberLeftMask@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberLeftMask@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberRightMask@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberRightMask@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberRightMask@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageScrubberRightMask@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoMessageShadow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordArrow@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@3x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@3x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@3x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoRecordPositionSwitch@3x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberLeftArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberLeftArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberLeftArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberLeftArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberRightArrow@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberRightArrow@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberRightArrow@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VideoScrubberRightArrow@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VineWatermark@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VineWatermark@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/VineWatermark@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/VineWatermark@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/YoutubeWatermark@2x.png b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/YoutubeWatermark@2x.png
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/YoutubeWatermark@2x.png
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/YoutubeWatermark@2x.png
diff --git a/submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ocr_nn.bin b/submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ocr_nn.bin
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Resources/LegacyComponentsResources.bundle/ocr_nn.bin
rename to submodules/LegacyComponents/Resources/LegacyComponentsResources.bundle/ocr_nn.bin
diff --git a/submodules/LegacyComponents/LegacyComponents/ASActor.m b/submodules/LegacyComponents/Sources/ASActor.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASActor.m
rename to submodules/LegacyComponents/Sources/ASActor.m
diff --git a/submodules/LegacyComponents/LegacyComponents/ASHandle.m b/submodules/LegacyComponents/Sources/ASHandle.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASHandle.m
rename to submodules/LegacyComponents/Sources/ASHandle.m
diff --git a/submodules/LegacyComponents/LegacyComponents/ASQueue.m b/submodules/LegacyComponents/Sources/ASQueue.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ASQueue.m
rename to submodules/LegacyComponents/Sources/ASQueue.m
diff --git a/submodules/LegacyComponents/LegacyComponents/AVAsset+CBExtension.h b/submodules/LegacyComponents/Sources/AVAsset+CBExtension.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/AVAsset+CBExtension.h
rename to submodules/LegacyComponents/Sources/AVAsset+CBExtension.h
diff --git a/submodules/LegacyComponents/LegacyComponents/AVAsset+CBExtension.m b/submodules/LegacyComponents/Sources/AVAsset+CBExtension.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/AVAsset+CBExtension.m
rename to submodules/LegacyComponents/Sources/AVAsset+CBExtension.m
diff --git a/submodules/LegacyComponents/LegacyComponents/AVURLAsset+TGMediaItem.m b/submodules/LegacyComponents/Sources/AVURLAsset+TGMediaItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/AVURLAsset+TGMediaItem.m
rename to submodules/LegacyComponents/Sources/AVURLAsset+TGMediaItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/ActionStage.mm b/submodules/LegacyComponents/Sources/ActionStage.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ActionStage.mm
rename to submodules/LegacyComponents/Sources/ActionStage.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/CBAssetDownloadManager.h b/submodules/LegacyComponents/Sources/CBAssetDownloadManager.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBAssetDownloadManager.h
rename to submodules/LegacyComponents/Sources/CBAssetDownloadManager.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBAssetDownloadManager.m b/submodules/LegacyComponents/Sources/CBAssetDownloadManager.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBAssetDownloadManager.m
rename to submodules/LegacyComponents/Sources/CBAssetDownloadManager.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBChunkDownloadOperation.h b/submodules/LegacyComponents/Sources/CBChunkDownloadOperation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBChunkDownloadOperation.h
rename to submodules/LegacyComponents/Sources/CBChunkDownloadOperation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBChunkDownloadOperation.m b/submodules/LegacyComponents/Sources/CBChunkDownloadOperation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBChunkDownloadOperation.m
rename to submodules/LegacyComponents/Sources/CBChunkDownloadOperation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBConstance.h b/submodules/LegacyComponents/Sources/CBConstance.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBConstance.h
rename to submodules/LegacyComponents/Sources/CBConstance.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBConstance.m b/submodules/LegacyComponents/Sources/CBConstance.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBConstance.m
rename to submodules/LegacyComponents/Sources/CBConstance.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubAsset.h b/submodules/LegacyComponents/Sources/CBCoubAsset.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubAsset.h
rename to submodules/LegacyComponents/Sources/CBCoubAsset.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubAudioSource.h b/submodules/LegacyComponents/Sources/CBCoubAudioSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubAudioSource.h
rename to submodules/LegacyComponents/Sources/CBCoubAudioSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubAudioSource.m b/submodules/LegacyComponents/Sources/CBCoubAudioSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubAudioSource.m
rename to submodules/LegacyComponents/Sources/CBCoubAudioSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubAuthorVO.h b/submodules/LegacyComponents/Sources/CBCoubAuthorVO.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubAuthorVO.h
rename to submodules/LegacyComponents/Sources/CBCoubAuthorVO.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubAuthorVO.m b/submodules/LegacyComponents/Sources/CBCoubAuthorVO.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubAuthorVO.m
rename to submodules/LegacyComponents/Sources/CBCoubAuthorVO.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubDownloadOperation.h b/submodules/LegacyComponents/Sources/CBCoubDownloadOperation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubDownloadOperation.h
rename to submodules/LegacyComponents/Sources/CBCoubDownloadOperation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubDownloadOperation.m b/submodules/LegacyComponents/Sources/CBCoubDownloadOperation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubDownloadOperation.m
rename to submodules/LegacyComponents/Sources/CBCoubDownloadOperation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubLoopCompositionMaker.h b/submodules/LegacyComponents/Sources/CBCoubLoopCompositionMaker.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubLoopCompositionMaker.h
rename to submodules/LegacyComponents/Sources/CBCoubLoopCompositionMaker.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubLoopCompositionMaker.m b/submodules/LegacyComponents/Sources/CBCoubLoopCompositionMaker.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubLoopCompositionMaker.m
rename to submodules/LegacyComponents/Sources/CBCoubLoopCompositionMaker.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubNew.h b/submodules/LegacyComponents/Sources/CBCoubNew.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubNew.h
rename to submodules/LegacyComponents/Sources/CBCoubNew.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubNew.m b/submodules/LegacyComponents/Sources/CBCoubNew.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubNew.m
rename to submodules/LegacyComponents/Sources/CBCoubNew.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubPlayer.h b/submodules/LegacyComponents/Sources/CBCoubPlayer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubPlayer.h
rename to submodules/LegacyComponents/Sources/CBCoubPlayer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubPlayer.m b/submodules/LegacyComponents/Sources/CBCoubPlayer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubPlayer.m
rename to submodules/LegacyComponents/Sources/CBCoubPlayer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubPlayerContance.h b/submodules/LegacyComponents/Sources/CBCoubPlayerContance.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubPlayerContance.h
rename to submodules/LegacyComponents/Sources/CBCoubPlayerContance.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubPlayerContance.m b/submodules/LegacyComponents/Sources/CBCoubPlayerContance.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubPlayerContance.m
rename to submodules/LegacyComponents/Sources/CBCoubPlayerContance.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubVideoSource.h b/submodules/LegacyComponents/Sources/CBCoubVideoSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubVideoSource.h
rename to submodules/LegacyComponents/Sources/CBCoubVideoSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBCoubVideoSource.m b/submodules/LegacyComponents/Sources/CBCoubVideoSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBCoubVideoSource.m
rename to submodules/LegacyComponents/Sources/CBCoubVideoSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBDownloadOperation.h b/submodules/LegacyComponents/Sources/CBDownloadOperation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBDownloadOperation.h
rename to submodules/LegacyComponents/Sources/CBDownloadOperation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBDownloadOperationDelegate.h b/submodules/LegacyComponents/Sources/CBDownloadOperationDelegate.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBDownloadOperationDelegate.h
rename to submodules/LegacyComponents/Sources/CBDownloadOperationDelegate.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBGenericDownloadOperation.h b/submodules/LegacyComponents/Sources/CBGenericDownloadOperation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBGenericDownloadOperation.h
rename to submodules/LegacyComponents/Sources/CBGenericDownloadOperation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBGenericDownloadOperation.m b/submodules/LegacyComponents/Sources/CBGenericDownloadOperation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBGenericDownloadOperation.m
rename to submodules/LegacyComponents/Sources/CBGenericDownloadOperation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBJSONCoubMapper.h b/submodules/LegacyComponents/Sources/CBJSONCoubMapper.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBJSONCoubMapper.h
rename to submodules/LegacyComponents/Sources/CBJSONCoubMapper.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBJSONCoubMapper.m b/submodules/LegacyComponents/Sources/CBJSONCoubMapper.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBJSONCoubMapper.m
rename to submodules/LegacyComponents/Sources/CBJSONCoubMapper.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBLibrary.h b/submodules/LegacyComponents/Sources/CBLibrary.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBLibrary.h
rename to submodules/LegacyComponents/Sources/CBLibrary.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBLibrary.m b/submodules/LegacyComponents/Sources/CBLibrary.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBLibrary.m
rename to submodules/LegacyComponents/Sources/CBLibrary.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBPlayerLayerView.h b/submodules/LegacyComponents/Sources/CBPlayerLayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBPlayerLayerView.h
rename to submodules/LegacyComponents/Sources/CBPlayerLayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBPlayerLayerView.m b/submodules/LegacyComponents/Sources/CBPlayerLayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBPlayerLayerView.m
rename to submodules/LegacyComponents/Sources/CBPlayerLayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBPlayerView.h b/submodules/LegacyComponents/Sources/CBPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBPlayerView.h
rename to submodules/LegacyComponents/Sources/CBPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBPlayerView.m b/submodules/LegacyComponents/Sources/CBPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBPlayerView.m
rename to submodules/LegacyComponents/Sources/CBPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBTagNew.h b/submodules/LegacyComponents/Sources/CBTagNew.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBTagNew.h
rename to submodules/LegacyComponents/Sources/CBTagNew.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBTagNew.m b/submodules/LegacyComponents/Sources/CBTagNew.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBTagNew.m
rename to submodules/LegacyComponents/Sources/CBTagNew.m
diff --git a/submodules/LegacyComponents/LegacyComponents/CBVideoPlayer.h b/submodules/LegacyComponents/Sources/CBVideoPlayer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBVideoPlayer.h
rename to submodules/LegacyComponents/Sources/CBVideoPlayer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/CBVideoPlayer.m b/submodules/LegacyComponents/Sources/CBVideoPlayer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/CBVideoPlayer.m
rename to submodules/LegacyComponents/Sources/CBVideoPlayer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/FLAnimatedImage.h b/submodules/LegacyComponents/Sources/FLAnimatedImage.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/FLAnimatedImage.h
rename to submodules/LegacyComponents/Sources/FLAnimatedImage.h
diff --git a/submodules/LegacyComponents/LegacyComponents/FLAnimatedImage.m b/submodules/LegacyComponents/Sources/FLAnimatedImage.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/FLAnimatedImage.m
rename to submodules/LegacyComponents/Sources/FLAnimatedImage.m
diff --git a/submodules/LegacyComponents/LegacyComponents/FloatConversion.h b/submodules/LegacyComponents/Sources/FloatConversion.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/FloatConversion.h
rename to submodules/LegacyComponents/Sources/FloatConversion.h
diff --git a/submodules/LegacyComponents/LegacyComponents/Freedom.mm b/submodules/LegacyComponents/Sources/Freedom.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/Freedom.mm
rename to submodules/LegacyComponents/Sources/Freedom.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/FreedomUIKit.m b/submodules/LegacyComponents/Sources/FreedomUIKit.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/FreedomUIKit.m
rename to submodules/LegacyComponents/Sources/FreedomUIKit.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GLProgram.h b/submodules/LegacyComponents/Sources/GLProgram.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GLProgram.h
rename to submodules/LegacyComponents/Sources/GLProgram.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GLProgram.m b/submodules/LegacyComponents/Sources/GLProgram.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GLProgram.m
rename to submodules/LegacyComponents/Sources/GLProgram.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImage.h b/submodules/LegacyComponents/Sources/GPUImage.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImage.h
rename to submodules/LegacyComponents/Sources/GPUImage.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageContext.h b/submodules/LegacyComponents/Sources/GPUImageContext.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageContext.h
rename to submodules/LegacyComponents/Sources/GPUImageContext.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageContext.m b/submodules/LegacyComponents/Sources/GPUImageContext.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageContext.m
rename to submodules/LegacyComponents/Sources/GPUImageContext.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFilter.h b/submodules/LegacyComponents/Sources/GPUImageFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFilter.h
rename to submodules/LegacyComponents/Sources/GPUImageFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFilter.m b/submodules/LegacyComponents/Sources/GPUImageFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFilter.m
rename to submodules/LegacyComponents/Sources/GPUImageFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFramebuffer.h b/submodules/LegacyComponents/Sources/GPUImageFramebuffer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFramebuffer.h
rename to submodules/LegacyComponents/Sources/GPUImageFramebuffer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFramebuffer.m b/submodules/LegacyComponents/Sources/GPUImageFramebuffer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFramebuffer.m
rename to submodules/LegacyComponents/Sources/GPUImageFramebuffer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFramebufferCache.h b/submodules/LegacyComponents/Sources/GPUImageFramebufferCache.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFramebufferCache.h
rename to submodules/LegacyComponents/Sources/GPUImageFramebufferCache.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageFramebufferCache.m b/submodules/LegacyComponents/Sources/GPUImageFramebufferCache.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageFramebufferCache.m
rename to submodules/LegacyComponents/Sources/GPUImageFramebufferCache.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageOutput.h b/submodules/LegacyComponents/Sources/GPUImageOutput.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageOutput.h
rename to submodules/LegacyComponents/Sources/GPUImageOutput.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageOutput.m b/submodules/LegacyComponents/Sources/GPUImageOutput.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageOutput.m
rename to submodules/LegacyComponents/Sources/GPUImageOutput.m
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageTwoInputFilter.h b/submodules/LegacyComponents/Sources/GPUImageTwoInputFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageTwoInputFilter.h
rename to submodules/LegacyComponents/Sources/GPUImageTwoInputFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/GPUImageTwoInputFilter.m b/submodules/LegacyComponents/Sources/GPUImageTwoInputFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/GPUImageTwoInputFilter.m
rename to submodules/LegacyComponents/Sources/GPUImageTwoInputFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/HPGrowingTextView.m b/submodules/LegacyComponents/Sources/HPGrowingTextView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/HPGrowingTextView.m
rename to submodules/LegacyComponents/Sources/HPGrowingTextView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/HPTextViewInternal.m b/submodules/LegacyComponents/Sources/HPTextViewInternal.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/HPTextViewInternal.m
rename to submodules/LegacyComponents/Sources/HPTextViewInternal.m
diff --git a/submodules/LegacyComponents/LegacyComponents/JNWSpringAnimation.m b/submodules/LegacyComponents/Sources/JNWSpringAnimation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/JNWSpringAnimation.m
rename to submodules/LegacyComponents/Sources/JNWSpringAnimation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsContext.m b/submodules/LegacyComponents/Sources/LegacyComponentsContext.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsContext.m
rename to submodules/LegacyComponents/Sources/LegacyComponentsContext.m
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsGlobals.m b/submodules/LegacyComponents/Sources/LegacyComponentsGlobals.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsGlobals.m
rename to submodules/LegacyComponents/Sources/LegacyComponentsGlobals.m
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.h b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.h
rename to submodules/LegacyComponents/Sources/LegacyComponentsInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m b/submodules/LegacyComponents/Sources/LegacyComponentsInternal.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/LegacyComponentsInternal.m
rename to submodules/LegacyComponents/Sources/LegacyComponentsInternal.m
diff --git a/submodules/LegacyComponents/LegacyComponents/NSDictionary+CBExtensions.h b/submodules/LegacyComponents/Sources/NSDictionary+CBExtensions.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSDictionary+CBExtensions.h
rename to submodules/LegacyComponents/Sources/NSDictionary+CBExtensions.h
diff --git a/submodules/LegacyComponents/LegacyComponents/NSDictionary+CBExtensions.m b/submodules/LegacyComponents/Sources/NSDictionary+CBExtensions.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSDictionary+CBExtensions.m
rename to submodules/LegacyComponents/Sources/NSDictionary+CBExtensions.m
diff --git a/submodules/LegacyComponents/LegacyComponents/NSInputStream+TL.m b/submodules/LegacyComponents/Sources/NSInputStream+TL.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSInputStream+TL.m
rename to submodules/LegacyComponents/Sources/NSInputStream+TL.m
diff --git a/submodules/LegacyComponents/LegacyComponents/NSMutableArray+STKAudioPlayer.h b/submodules/LegacyComponents/Sources/NSMutableArray+STKAudioPlayer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSMutableArray+STKAudioPlayer.h
rename to submodules/LegacyComponents/Sources/NSMutableArray+STKAudioPlayer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/NSMutableArray+STKAudioPlayer.m b/submodules/LegacyComponents/Sources/NSMutableArray+STKAudioPlayer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSMutableArray+STKAudioPlayer.m
rename to submodules/LegacyComponents/Sources/NSMutableArray+STKAudioPlayer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/NSObject+TGLock.m b/submodules/LegacyComponents/Sources/NSObject+TGLock.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSObject+TGLock.m
rename to submodules/LegacyComponents/Sources/NSObject+TGLock.m
diff --git a/submodules/LegacyComponents/LegacyComponents/NSValue+JNWAdditions.h b/submodules/LegacyComponents/Sources/NSValue+JNWAdditions.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSValue+JNWAdditions.h
rename to submodules/LegacyComponents/Sources/NSValue+JNWAdditions.h
diff --git a/submodules/LegacyComponents/LegacyComponents/NSValue+JNWAdditions.m b/submodules/LegacyComponents/Sources/NSValue+JNWAdditions.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/NSValue+JNWAdditions.m
rename to submodules/LegacyComponents/Sources/NSValue+JNWAdditions.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGBlurTool.h b/submodules/LegacyComponents/Sources/PGBlurTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGBlurTool.h
rename to submodules/LegacyComponents/Sources/PGBlurTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGBlurTool.m b/submodules/LegacyComponents/Sources/PGBlurTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGBlurTool.m
rename to submodules/LegacyComponents/Sources/PGBlurTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCamera.m b/submodules/LegacyComponents/Sources/PGCamera.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCamera.m
rename to submodules/LegacyComponents/Sources/PGCamera.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraCaptureSession.m b/submodules/LegacyComponents/Sources/PGCameraCaptureSession.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraCaptureSession.m
rename to submodules/LegacyComponents/Sources/PGCameraCaptureSession.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraDeviceAngleSampler.m b/submodules/LegacyComponents/Sources/PGCameraDeviceAngleSampler.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraDeviceAngleSampler.m
rename to submodules/LegacyComponents/Sources/PGCameraDeviceAngleSampler.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMomentSegment.m b/submodules/LegacyComponents/Sources/PGCameraMomentSegment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMomentSegment.m
rename to submodules/LegacyComponents/Sources/PGCameraMomentSegment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMomentSession.m b/submodules/LegacyComponents/Sources/PGCameraMomentSession.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMomentSession.m
rename to submodules/LegacyComponents/Sources/PGCameraMomentSession.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraMovieWriter.m b/submodules/LegacyComponents/Sources/PGCameraMovieWriter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraMovieWriter.m
rename to submodules/LegacyComponents/Sources/PGCameraMovieWriter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraShotMetadata.m b/submodules/LegacyComponents/Sources/PGCameraShotMetadata.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraShotMetadata.m
rename to submodules/LegacyComponents/Sources/PGCameraShotMetadata.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCameraVolumeButtonHandler.m b/submodules/LegacyComponents/Sources/PGCameraVolumeButtonHandler.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCameraVolumeButtonHandler.m
rename to submodules/LegacyComponents/Sources/PGCameraVolumeButtonHandler.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGContrastTool.h b/submodules/LegacyComponents/Sources/PGContrastTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGContrastTool.h
rename to submodules/LegacyComponents/Sources/PGContrastTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGContrastTool.m b/submodules/LegacyComponents/Sources/PGContrastTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGContrastTool.m
rename to submodules/LegacyComponents/Sources/PGContrastTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCurvesTool.h b/submodules/LegacyComponents/Sources/PGCurvesTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCurvesTool.h
rename to submodules/LegacyComponents/Sources/PGCurvesTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGCurvesTool.m b/submodules/LegacyComponents/Sources/PGCurvesTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGCurvesTool.m
rename to submodules/LegacyComponents/Sources/PGCurvesTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGEnhanceTool.h b/submodules/LegacyComponents/Sources/PGEnhanceTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGEnhanceTool.h
rename to submodules/LegacyComponents/Sources/PGEnhanceTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGEnhanceTool.m b/submodules/LegacyComponents/Sources/PGEnhanceTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGEnhanceTool.m
rename to submodules/LegacyComponents/Sources/PGEnhanceTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGExposureTool.h b/submodules/LegacyComponents/Sources/PGExposureTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGExposureTool.h
rename to submodules/LegacyComponents/Sources/PGExposureTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGExposureTool.m b/submodules/LegacyComponents/Sources/PGExposureTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGExposureTool.m
rename to submodules/LegacyComponents/Sources/PGExposureTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGFadeTool.h b/submodules/LegacyComponents/Sources/PGFadeTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGFadeTool.h
rename to submodules/LegacyComponents/Sources/PGFadeTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGFadeTool.m b/submodules/LegacyComponents/Sources/PGFadeTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGFadeTool.m
rename to submodules/LegacyComponents/Sources/PGFadeTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGGrainTool.h b/submodules/LegacyComponents/Sources/PGGrainTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGGrainTool.h
rename to submodules/LegacyComponents/Sources/PGGrainTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGGrainTool.m b/submodules/LegacyComponents/Sources/PGGrainTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGGrainTool.m
rename to submodules/LegacyComponents/Sources/PGGrainTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGHighlightsTool.h b/submodules/LegacyComponents/Sources/PGHighlightsTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGHighlightsTool.h
rename to submodules/LegacyComponents/Sources/PGHighlightsTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGHighlightsTool.m b/submodules/LegacyComponents/Sources/PGHighlightsTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGHighlightsTool.m
rename to submodules/LegacyComponents/Sources/PGHighlightsTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoBlurPass.h b/submodules/LegacyComponents/Sources/PGPhotoBlurPass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoBlurPass.h
rename to submodules/LegacyComponents/Sources/PGPhotoBlurPass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoBlurPass.m b/submodules/LegacyComponents/Sources/PGPhotoBlurPass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoBlurPass.m
rename to submodules/LegacyComponents/Sources/PGPhotoBlurPass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoCustomFilterPass.h b/submodules/LegacyComponents/Sources/PGPhotoCustomFilterPass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoCustomFilterPass.h
rename to submodules/LegacyComponents/Sources/PGPhotoCustomFilterPass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoCustomFilterPass.m b/submodules/LegacyComponents/Sources/PGPhotoCustomFilterPass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoCustomFilterPass.m
rename to submodules/LegacyComponents/Sources/PGPhotoCustomFilterPass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditor.h b/submodules/LegacyComponents/Sources/PGPhotoEditor.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditor.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditor.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditor.m b/submodules/LegacyComponents/Sources/PGPhotoEditor.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditor.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditor.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorItem.h b/submodules/LegacyComponents/Sources/PGPhotoEditorItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorItem.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditorItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorPicture.h b/submodules/LegacyComponents/Sources/PGPhotoEditorPicture.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorPicture.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditorPicture.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorPicture.m b/submodules/LegacyComponents/Sources/PGPhotoEditorPicture.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorPicture.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditorPicture.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataInput.h b/submodules/LegacyComponents/Sources/PGPhotoEditorRawDataInput.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataInput.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditorRawDataInput.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataInput.m b/submodules/LegacyComponents/Sources/PGPhotoEditorRawDataInput.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataInput.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditorRawDataInput.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataOutput.h b/submodules/LegacyComponents/Sources/PGPhotoEditorRawDataOutput.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataOutput.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditorRawDataOutput.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataOutput.m b/submodules/LegacyComponents/Sources/PGPhotoEditorRawDataOutput.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorRawDataOutput.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditorRawDataOutput.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorValues.m b/submodules/LegacyComponents/Sources/PGPhotoEditorValues.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorValues.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditorValues.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorView.h b/submodules/LegacyComponents/Sources/PGPhotoEditorView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorView.h
rename to submodules/LegacyComponents/Sources/PGPhotoEditorView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEditorView.m b/submodules/LegacyComponents/Sources/PGPhotoEditorView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEditorView.m
rename to submodules/LegacyComponents/Sources/PGPhotoEditorView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceColorConversionFilter.h b/submodules/LegacyComponents/Sources/PGPhotoEnhanceColorConversionFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceColorConversionFilter.h
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceColorConversionFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceColorConversionFilter.m b/submodules/LegacyComponents/Sources/PGPhotoEnhanceColorConversionFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceColorConversionFilter.m
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceColorConversionFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceInterpolationFilter.h b/submodules/LegacyComponents/Sources/PGPhotoEnhanceInterpolationFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceInterpolationFilter.h
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceInterpolationFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceInterpolationFilter.m b/submodules/LegacyComponents/Sources/PGPhotoEnhanceInterpolationFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceInterpolationFilter.m
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceInterpolationFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceLUTGenerator.h b/submodules/LegacyComponents/Sources/PGPhotoEnhanceLUTGenerator.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceLUTGenerator.h
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceLUTGenerator.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceLUTGenerator.m b/submodules/LegacyComponents/Sources/PGPhotoEnhanceLUTGenerator.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhanceLUTGenerator.m
rename to submodules/LegacyComponents/Sources/PGPhotoEnhanceLUTGenerator.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhancePass.h b/submodules/LegacyComponents/Sources/PGPhotoEnhancePass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhancePass.h
rename to submodules/LegacyComponents/Sources/PGPhotoEnhancePass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoEnhancePass.m b/submodules/LegacyComponents/Sources/PGPhotoEnhancePass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoEnhancePass.m
rename to submodules/LegacyComponents/Sources/PGPhotoEnhancePass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilter.h b/submodules/LegacyComponents/Sources/PGPhotoFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilter.h
rename to submodules/LegacyComponents/Sources/PGPhotoFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilter.m b/submodules/LegacyComponents/Sources/PGPhotoFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilter.m
rename to submodules/LegacyComponents/Sources/PGPhotoFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilterDefinition.h b/submodules/LegacyComponents/Sources/PGPhotoFilterDefinition.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilterDefinition.h
rename to submodules/LegacyComponents/Sources/PGPhotoFilterDefinition.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilterDefinition.m b/submodules/LegacyComponents/Sources/PGPhotoFilterDefinition.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilterDefinition.m
rename to submodules/LegacyComponents/Sources/PGPhotoFilterDefinition.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilterThumbnailManager.h b/submodules/LegacyComponents/Sources/PGPhotoFilterThumbnailManager.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilterThumbnailManager.h
rename to submodules/LegacyComponents/Sources/PGPhotoFilterThumbnailManager.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoFilterThumbnailManager.m b/submodules/LegacyComponents/Sources/PGPhotoFilterThumbnailManager.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoFilterThumbnailManager.m
rename to submodules/LegacyComponents/Sources/PGPhotoFilterThumbnailManager.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoGaussianBlurFilter.h b/submodules/LegacyComponents/Sources/PGPhotoGaussianBlurFilter.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoGaussianBlurFilter.h
rename to submodules/LegacyComponents/Sources/PGPhotoGaussianBlurFilter.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoGaussianBlurFilter.m b/submodules/LegacyComponents/Sources/PGPhotoGaussianBlurFilter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoGaussianBlurFilter.m
rename to submodules/LegacyComponents/Sources/PGPhotoGaussianBlurFilter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoHistogram.h b/submodules/LegacyComponents/Sources/PGPhotoHistogram.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoHistogram.h
rename to submodules/LegacyComponents/Sources/PGPhotoHistogram.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoHistogram.m b/submodules/LegacyComponents/Sources/PGPhotoHistogram.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoHistogram.m
rename to submodules/LegacyComponents/Sources/PGPhotoHistogram.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoHistogramGenerator.h b/submodules/LegacyComponents/Sources/PGPhotoHistogramGenerator.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoHistogramGenerator.h
rename to submodules/LegacyComponents/Sources/PGPhotoHistogramGenerator.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoHistogramGenerator.m b/submodules/LegacyComponents/Sources/PGPhotoHistogramGenerator.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoHistogramGenerator.m
rename to submodules/LegacyComponents/Sources/PGPhotoHistogramGenerator.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoLookupFilterPass.h b/submodules/LegacyComponents/Sources/PGPhotoLookupFilterPass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoLookupFilterPass.h
rename to submodules/LegacyComponents/Sources/PGPhotoLookupFilterPass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoLookupFilterPass.m b/submodules/LegacyComponents/Sources/PGPhotoLookupFilterPass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoLookupFilterPass.m
rename to submodules/LegacyComponents/Sources/PGPhotoLookupFilterPass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoProcessPass.h b/submodules/LegacyComponents/Sources/PGPhotoProcessPass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoProcessPass.h
rename to submodules/LegacyComponents/Sources/PGPhotoProcessPass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoProcessPass.m b/submodules/LegacyComponents/Sources/PGPhotoProcessPass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoProcessPass.m
rename to submodules/LegacyComponents/Sources/PGPhotoProcessPass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoSharpenPass.h b/submodules/LegacyComponents/Sources/PGPhotoSharpenPass.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoSharpenPass.h
rename to submodules/LegacyComponents/Sources/PGPhotoSharpenPass.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoSharpenPass.m b/submodules/LegacyComponents/Sources/PGPhotoSharpenPass.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoSharpenPass.m
rename to submodules/LegacyComponents/Sources/PGPhotoSharpenPass.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoTool.h b/submodules/LegacyComponents/Sources/PGPhotoTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoTool.h
rename to submodules/LegacyComponents/Sources/PGPhotoTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoTool.m b/submodules/LegacyComponents/Sources/PGPhotoTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoTool.m
rename to submodules/LegacyComponents/Sources/PGPhotoTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoToolComposer.h b/submodules/LegacyComponents/Sources/PGPhotoToolComposer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoToolComposer.h
rename to submodules/LegacyComponents/Sources/PGPhotoToolComposer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGPhotoToolComposer.m b/submodules/LegacyComponents/Sources/PGPhotoToolComposer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGPhotoToolComposer.m
rename to submodules/LegacyComponents/Sources/PGPhotoToolComposer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGSaturationTool.h b/submodules/LegacyComponents/Sources/PGSaturationTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGSaturationTool.h
rename to submodules/LegacyComponents/Sources/PGSaturationTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGSaturationTool.m b/submodules/LegacyComponents/Sources/PGSaturationTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGSaturationTool.m
rename to submodules/LegacyComponents/Sources/PGSaturationTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGShadowsTool.h b/submodules/LegacyComponents/Sources/PGShadowsTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGShadowsTool.h
rename to submodules/LegacyComponents/Sources/PGShadowsTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGShadowsTool.m b/submodules/LegacyComponents/Sources/PGShadowsTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGShadowsTool.m
rename to submodules/LegacyComponents/Sources/PGShadowsTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGSharpenTool.h b/submodules/LegacyComponents/Sources/PGSharpenTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGSharpenTool.h
rename to submodules/LegacyComponents/Sources/PGSharpenTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGSharpenTool.m b/submodules/LegacyComponents/Sources/PGSharpenTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGSharpenTool.m
rename to submodules/LegacyComponents/Sources/PGSharpenTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGTintTool.h b/submodules/LegacyComponents/Sources/PGTintTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGTintTool.h
rename to submodules/LegacyComponents/Sources/PGTintTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGTintTool.m b/submodules/LegacyComponents/Sources/PGTintTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGTintTool.m
rename to submodules/LegacyComponents/Sources/PGTintTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGVignetteTool.h b/submodules/LegacyComponents/Sources/PGVignetteTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGVignetteTool.h
rename to submodules/LegacyComponents/Sources/PGVignetteTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGVignetteTool.m b/submodules/LegacyComponents/Sources/PGVignetteTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGVignetteTool.m
rename to submodules/LegacyComponents/Sources/PGVignetteTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PGWarmthTool.h b/submodules/LegacyComponents/Sources/PGWarmthTool.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGWarmthTool.h
rename to submodules/LegacyComponents/Sources/PGWarmthTool.h
diff --git a/submodules/LegacyComponents/LegacyComponents/PGWarmthTool.m b/submodules/LegacyComponents/Sources/PGWarmthTool.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PGWarmthTool.m
rename to submodules/LegacyComponents/Sources/PGWarmthTool.m
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAction.h b/submodules/LegacyComponents/Sources/POPAction.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAction.h
rename to submodules/LegacyComponents/Sources/POPAction.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimatableProperty.mm b/submodules/LegacyComponents/Sources/POPAnimatableProperty.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimatableProperty.mm
rename to submodules/LegacyComponents/Sources/POPAnimatableProperty.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimation.mm b/submodules/LegacyComponents/Sources/POPAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimation.mm
rename to submodules/LegacyComponents/Sources/POPAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationEvent.mm b/submodules/LegacyComponents/Sources/POPAnimationEvent.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationEvent.mm
rename to submodules/LegacyComponents/Sources/POPAnimationEvent.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationEventInternal.h b/submodules/LegacyComponents/Sources/POPAnimationEventInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationEventInternal.h
rename to submodules/LegacyComponents/Sources/POPAnimationEventInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationExtras.h b/submodules/LegacyComponents/Sources/POPAnimationExtras.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationExtras.h
rename to submodules/LegacyComponents/Sources/POPAnimationExtras.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationExtras.mm b/submodules/LegacyComponents/Sources/POPAnimationExtras.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationExtras.mm
rename to submodules/LegacyComponents/Sources/POPAnimationExtras.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationInternal.h b/submodules/LegacyComponents/Sources/POPAnimationInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationInternal.h
rename to submodules/LegacyComponents/Sources/POPAnimationInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationPrivate.h b/submodules/LegacyComponents/Sources/POPAnimationPrivate.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationPrivate.h
rename to submodules/LegacyComponents/Sources/POPAnimationPrivate.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationRuntime.h b/submodules/LegacyComponents/Sources/POPAnimationRuntime.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationRuntime.h
rename to submodules/LegacyComponents/Sources/POPAnimationRuntime.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationRuntime.mm b/submodules/LegacyComponents/Sources/POPAnimationRuntime.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationRuntime.mm
rename to submodules/LegacyComponents/Sources/POPAnimationRuntime.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationTracer.mm b/submodules/LegacyComponents/Sources/POPAnimationTracer.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationTracer.mm
rename to submodules/LegacyComponents/Sources/POPAnimationTracer.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimationTracerInternal.h b/submodules/LegacyComponents/Sources/POPAnimationTracerInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimationTracerInternal.h
rename to submodules/LegacyComponents/Sources/POPAnimationTracerInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimator.h b/submodules/LegacyComponents/Sources/POPAnimator.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimator.h
rename to submodules/LegacyComponents/Sources/POPAnimator.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimator.mm b/submodules/LegacyComponents/Sources/POPAnimator.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimator.mm
rename to submodules/LegacyComponents/Sources/POPAnimator.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPAnimatorPrivate.h b/submodules/LegacyComponents/Sources/POPAnimatorPrivate.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPAnimatorPrivate.h
rename to submodules/LegacyComponents/Sources/POPAnimatorPrivate.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPBasicAnimation.mm b/submodules/LegacyComponents/Sources/POPBasicAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPBasicAnimation.mm
rename to submodules/LegacyComponents/Sources/POPBasicAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPBasicAnimationInternal.h b/submodules/LegacyComponents/Sources/POPBasicAnimationInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPBasicAnimationInternal.h
rename to submodules/LegacyComponents/Sources/POPBasicAnimationInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPCGUtils.h b/submodules/LegacyComponents/Sources/POPCGUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPCGUtils.h
rename to submodules/LegacyComponents/Sources/POPCGUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPCGUtils.mm b/submodules/LegacyComponents/Sources/POPCGUtils.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPCGUtils.mm
rename to submodules/LegacyComponents/Sources/POPCGUtils.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPCustomAnimation.mm b/submodules/LegacyComponents/Sources/POPCustomAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPCustomAnimation.mm
rename to submodules/LegacyComponents/Sources/POPCustomAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPDecayAnimation.mm b/submodules/LegacyComponents/Sources/POPDecayAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPDecayAnimation.mm
rename to submodules/LegacyComponents/Sources/POPDecayAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPDecayAnimationInternal.h b/submodules/LegacyComponents/Sources/POPDecayAnimationInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPDecayAnimationInternal.h
rename to submodules/LegacyComponents/Sources/POPDecayAnimationInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPDefines.h b/submodules/LegacyComponents/Sources/POPDefines.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPDefines.h
rename to submodules/LegacyComponents/Sources/POPDefines.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPGeometry.mm b/submodules/LegacyComponents/Sources/POPGeometry.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPGeometry.mm
rename to submodules/LegacyComponents/Sources/POPGeometry.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPLayerExtras.h b/submodules/LegacyComponents/Sources/POPLayerExtras.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPLayerExtras.h
rename to submodules/LegacyComponents/Sources/POPLayerExtras.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPLayerExtras.mm b/submodules/LegacyComponents/Sources/POPLayerExtras.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPLayerExtras.mm
rename to submodules/LegacyComponents/Sources/POPLayerExtras.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPMath.h b/submodules/LegacyComponents/Sources/POPMath.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPMath.h
rename to submodules/LegacyComponents/Sources/POPMath.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPMath.mm b/submodules/LegacyComponents/Sources/POPMath.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPMath.mm
rename to submodules/LegacyComponents/Sources/POPMath.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPPropertyAnimation.mm b/submodules/LegacyComponents/Sources/POPPropertyAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPPropertyAnimation.mm
rename to submodules/LegacyComponents/Sources/POPPropertyAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPPropertyAnimationInternal.h b/submodules/LegacyComponents/Sources/POPPropertyAnimationInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPPropertyAnimationInternal.h
rename to submodules/LegacyComponents/Sources/POPPropertyAnimationInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPSpringAnimation.mm b/submodules/LegacyComponents/Sources/POPSpringAnimation.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPSpringAnimation.mm
rename to submodules/LegacyComponents/Sources/POPSpringAnimation.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/POPSpringAnimationInternal.h b/submodules/LegacyComponents/Sources/POPSpringAnimationInternal.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPSpringAnimationInternal.h
rename to submodules/LegacyComponents/Sources/POPSpringAnimationInternal.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPSpringSolver.h b/submodules/LegacyComponents/Sources/POPSpringSolver.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPSpringSolver.h
rename to submodules/LegacyComponents/Sources/POPSpringSolver.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPVector.h b/submodules/LegacyComponents/Sources/POPVector.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPVector.h
rename to submodules/LegacyComponents/Sources/POPVector.h
diff --git a/submodules/LegacyComponents/LegacyComponents/POPVector.mm b/submodules/LegacyComponents/Sources/POPVector.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/POPVector.mm
rename to submodules/LegacyComponents/Sources/POPVector.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueCoder.m b/submodules/LegacyComponents/Sources/PSKeyValueCoder.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueCoder.m
rename to submodules/LegacyComponents/Sources/PSKeyValueCoder.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueDecoder.m b/submodules/LegacyComponents/Sources/PSKeyValueDecoder.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueDecoder.m
rename to submodules/LegacyComponents/Sources/PSKeyValueDecoder.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSKeyValueEncoder.m b/submodules/LegacyComponents/Sources/PSKeyValueEncoder.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSKeyValueEncoder.m
rename to submodules/LegacyComponents/Sources/PSKeyValueEncoder.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueCursor.m b/submodules/LegacyComponents/Sources/PSLMDBKeyValueCursor.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueCursor.m
rename to submodules/LegacyComponents/Sources/PSLMDBKeyValueCursor.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueReaderWriter.m b/submodules/LegacyComponents/Sources/PSLMDBKeyValueReaderWriter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueReaderWriter.m
rename to submodules/LegacyComponents/Sources/PSLMDBKeyValueReaderWriter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueStore.m b/submodules/LegacyComponents/Sources/PSLMDBKeyValueStore.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBKeyValueStore.m
rename to submodules/LegacyComponents/Sources/PSLMDBKeyValueStore.m
diff --git a/submodules/LegacyComponents/LegacyComponents/PSLMDBTable.m b/submodules/LegacyComponents/Sources/PSLMDBTable.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/PSLMDBTable.m
rename to submodules/LegacyComponents/Sources/PSLMDBTable.m
diff --git a/submodules/LegacyComponents/LegacyComponents/RMPhoneFormat.m b/submodules/LegacyComponents/Sources/RMPhoneFormat.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/RMPhoneFormat.m
rename to submodules/LegacyComponents/Sources/RMPhoneFormat.m
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphListNode.m b/submodules/LegacyComponents/Sources/SGraphListNode.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphListNode.m
rename to submodules/LegacyComponents/Sources/SGraphListNode.m
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphNode.m b/submodules/LegacyComponents/Sources/SGraphNode.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphNode.m
rename to submodules/LegacyComponents/Sources/SGraphNode.m
diff --git a/submodules/LegacyComponents/LegacyComponents/SGraphObjectNode.m b/submodules/LegacyComponents/Sources/SGraphObjectNode.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/SGraphObjectNode.m
rename to submodules/LegacyComponents/Sources/SGraphObjectNode.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKAudioPlayer.h b/submodules/LegacyComponents/Sources/STKAudioPlayer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKAudioPlayer.h
rename to submodules/LegacyComponents/Sources/STKAudioPlayer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKAudioPlayer.m b/submodules/LegacyComponents/Sources/STKAudioPlayer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKAudioPlayer.m
rename to submodules/LegacyComponents/Sources/STKAudioPlayer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKAutoRecoveringHTTPDataSource.h b/submodules/LegacyComponents/Sources/STKAutoRecoveringHTTPDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKAutoRecoveringHTTPDataSource.h
rename to submodules/LegacyComponents/Sources/STKAutoRecoveringHTTPDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKAutoRecoveringHTTPDataSource.m b/submodules/LegacyComponents/Sources/STKAutoRecoveringHTTPDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKAutoRecoveringHTTPDataSource.m
rename to submodules/LegacyComponents/Sources/STKAutoRecoveringHTTPDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKCoreFoundationDataSource.h b/submodules/LegacyComponents/Sources/STKCoreFoundationDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKCoreFoundationDataSource.h
rename to submodules/LegacyComponents/Sources/STKCoreFoundationDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKCoreFoundationDataSource.m b/submodules/LegacyComponents/Sources/STKCoreFoundationDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKCoreFoundationDataSource.m
rename to submodules/LegacyComponents/Sources/STKCoreFoundationDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKDataSource.h b/submodules/LegacyComponents/Sources/STKDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKDataSource.h
rename to submodules/LegacyComponents/Sources/STKDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKDataSource.m b/submodules/LegacyComponents/Sources/STKDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKDataSource.m
rename to submodules/LegacyComponents/Sources/STKDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKDataSourceWrapper.h b/submodules/LegacyComponents/Sources/STKDataSourceWrapper.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKDataSourceWrapper.h
rename to submodules/LegacyComponents/Sources/STKDataSourceWrapper.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKDataSourceWrapper.m b/submodules/LegacyComponents/Sources/STKDataSourceWrapper.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKDataSourceWrapper.m
rename to submodules/LegacyComponents/Sources/STKDataSourceWrapper.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKHTTPDataSource.h b/submodules/LegacyComponents/Sources/STKHTTPDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKHTTPDataSource.h
rename to submodules/LegacyComponents/Sources/STKHTTPDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKHTTPDataSource.m b/submodules/LegacyComponents/Sources/STKHTTPDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKHTTPDataSource.m
rename to submodules/LegacyComponents/Sources/STKHTTPDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKLocalFileDataSource.h b/submodules/LegacyComponents/Sources/STKLocalFileDataSource.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKLocalFileDataSource.h
rename to submodules/LegacyComponents/Sources/STKLocalFileDataSource.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKLocalFileDataSource.m b/submodules/LegacyComponents/Sources/STKLocalFileDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKLocalFileDataSource.m
rename to submodules/LegacyComponents/Sources/STKLocalFileDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/STKQueueEntry.h b/submodules/LegacyComponents/Sources/STKQueueEntry.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKQueueEntry.h
rename to submodules/LegacyComponents/Sources/STKQueueEntry.h
diff --git a/submodules/LegacyComponents/LegacyComponents/STKQueueEntry.m b/submodules/LegacyComponents/Sources/STKQueueEntry.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/STKQueueEntry.m
rename to submodules/LegacyComponents/Sources/STKQueueEntry.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGActionMediaAttachment.m b/submodules/LegacyComponents/Sources/TGActionMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGActionMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGActionMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAlphacode.m b/submodules/LegacyComponents/Sources/TGAlphacode.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAlphacode.m
rename to submodules/LegacyComponents/Sources/TGAlphacode.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAlphacodePanelCell.h b/submodules/LegacyComponents/Sources/TGAlphacodePanelCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAlphacodePanelCell.h
rename to submodules/LegacyComponents/Sources/TGAlphacodePanelCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAlphacodePanelCell.m b/submodules/LegacyComponents/Sources/TGAlphacodePanelCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAlphacodePanelCell.m
rename to submodules/LegacyComponents/Sources/TGAlphacodePanelCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAnimationBlockDelegate.m b/submodules/LegacyComponents/Sources/TGAnimationBlockDelegate.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAnimationBlockDelegate.m
rename to submodules/LegacyComponents/Sources/TGAnimationBlockDelegate.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAnimationUtils.h b/submodules/LegacyComponents/Sources/TGAnimationUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAnimationUtils.h
rename to submodules/LegacyComponents/Sources/TGAnimationUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAnimationUtils.m b/submodules/LegacyComponents/Sources/TGAnimationUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAnimationUtils.m
rename to submodules/LegacyComponents/Sources/TGAnimationUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentAssetCell.h b/submodules/LegacyComponents/Sources/TGAttachmentAssetCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentAssetCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentAssetCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentAssetCell.m b/submodules/LegacyComponents/Sources/TGAttachmentAssetCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentAssetCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentAssetCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraCell.h b/submodules/LegacyComponents/Sources/TGAttachmentCameraCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentCameraCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraCell.m b/submodules/LegacyComponents/Sources/TGAttachmentCameraCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentCameraCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraView.m b/submodules/LegacyComponents/Sources/TGAttachmentCameraView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCameraView.m
rename to submodules/LegacyComponents/Sources/TGAttachmentCameraView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m b/submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentCarouselItemView.m
rename to submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentGifCell.h b/submodules/LegacyComponents/Sources/TGAttachmentGifCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentGifCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentGifCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentGifCell.m b/submodules/LegacyComponents/Sources/TGAttachmentGifCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentGifCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentGifCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentMenuCell.h b/submodules/LegacyComponents/Sources/TGAttachmentMenuCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentMenuCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentMenuCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentMenuCell.m b/submodules/LegacyComponents/Sources/TGAttachmentMenuCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentMenuCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentMenuCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentPhotoCell.h b/submodules/LegacyComponents/Sources/TGAttachmentPhotoCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentPhotoCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentPhotoCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentPhotoCell.m b/submodules/LegacyComponents/Sources/TGAttachmentPhotoCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentPhotoCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentPhotoCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentVideoCell.h b/submodules/LegacyComponents/Sources/TGAttachmentVideoCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentVideoCell.h
rename to submodules/LegacyComponents/Sources/TGAttachmentVideoCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAttachmentVideoCell.m b/submodules/LegacyComponents/Sources/TGAttachmentVideoCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAttachmentVideoCell.m
rename to submodules/LegacyComponents/Sources/TGAttachmentVideoCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAudioMediaAttachment.m b/submodules/LegacyComponents/Sources/TGAudioMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAudioMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGAudioMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAudioWaveform.m b/submodules/LegacyComponents/Sources/TGAudioWaveform.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAudioWaveform.m
rename to submodules/LegacyComponents/Sources/TGAudioWaveform.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGAuthorSignatureMediaAttachment.m b/submodules/LegacyComponents/Sources/TGAuthorSignatureMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGAuthorSignatureMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGAuthorSignatureMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBackdropView.m b/submodules/LegacyComponents/Sources/TGBackdropView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBackdropView.m
rename to submodules/LegacyComponents/Sources/TGBackdropView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotComandInfo.m b/submodules/LegacyComponents/Sources/TGBotComandInfo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotComandInfo.m
rename to submodules/LegacyComponents/Sources/TGBotComandInfo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotContextResultAttachment.m b/submodules/LegacyComponents/Sources/TGBotContextResultAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotContextResultAttachment.m
rename to submodules/LegacyComponents/Sources/TGBotContextResultAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotInfo.m b/submodules/LegacyComponents/Sources/TGBotInfo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotInfo.m
rename to submodules/LegacyComponents/Sources/TGBotInfo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkup.m b/submodules/LegacyComponents/Sources/TGBotReplyMarkup.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkup.m
rename to submodules/LegacyComponents/Sources/TGBotReplyMarkup.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupButton.m b/submodules/LegacyComponents/Sources/TGBotReplyMarkupButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupButton.m
rename to submodules/LegacyComponents/Sources/TGBotReplyMarkupButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupRow.m b/submodules/LegacyComponents/Sources/TGBotReplyMarkupRow.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGBotReplyMarkupRow.m
rename to submodules/LegacyComponents/Sources/TGBotReplyMarkupRow.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCache.m b/submodules/LegacyComponents/Sources/TGCache.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCache.m
rename to submodules/LegacyComponents/Sources/TGCache.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraCapturedPhoto.m b/submodules/LegacyComponents/Sources/TGCameraCapturedPhoto.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraCapturedPhoto.m
rename to submodules/LegacyComponents/Sources/TGCameraCapturedPhoto.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraCapturedVideo.m b/submodules/LegacyComponents/Sources/TGCameraCapturedVideo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraCapturedVideo.m
rename to submodules/LegacyComponents/Sources/TGCameraCapturedVideo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m b/submodules/LegacyComponents/Sources/TGCameraController.m
similarity index 99%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraController.m
rename to submodules/LegacyComponents/Sources/TGCameraController.m
index 80429b92c7..0472dc6420 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGCameraController.m
+++ b/submodules/LegacyComponents/Sources/TGCameraController.m
@@ -51,7 +51,7 @@
 #import "TGCameraCapturedPhoto.h"
 #import "TGCameraCapturedVideo.h"
 
-#import <LegacyComponents/TGAnimationUtils.h>
+#import "TGAnimationUtils.h"
 
 const CGFloat TGCameraSwipeMinimumVelocity = 600.0f;
 const CGFloat TGCameraSwipeVelocityThreshold = 700.0f;
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlashActiveView.m b/submodules/LegacyComponents/Sources/TGCameraFlashActiveView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlashActiveView.m
rename to submodules/LegacyComponents/Sources/TGCameraFlashActiveView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlashControl.m b/submodules/LegacyComponents/Sources/TGCameraFlashControl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlashControl.m
rename to submodules/LegacyComponents/Sources/TGCameraFlashControl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFlipButton.m b/submodules/LegacyComponents/Sources/TGCameraFlipButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFlipButton.m
rename to submodules/LegacyComponents/Sources/TGCameraFlipButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFocusCrosshairsControl.h b/submodules/LegacyComponents/Sources/TGCameraFocusCrosshairsControl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFocusCrosshairsControl.h
rename to submodules/LegacyComponents/Sources/TGCameraFocusCrosshairsControl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraFocusCrosshairsControl.m b/submodules/LegacyComponents/Sources/TGCameraFocusCrosshairsControl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraFocusCrosshairsControl.m
rename to submodules/LegacyComponents/Sources/TGCameraFocusCrosshairsControl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraInterfaceAssets.m b/submodules/LegacyComponents/Sources/TGCameraInterfaceAssets.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraInterfaceAssets.m
rename to submodules/LegacyComponents/Sources/TGCameraInterfaceAssets.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainPhoneView.m b/submodules/LegacyComponents/Sources/TGCameraMainPhoneView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainPhoneView.m
rename to submodules/LegacyComponents/Sources/TGCameraMainPhoneView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainTabletView.m b/submodules/LegacyComponents/Sources/TGCameraMainTabletView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainTabletView.m
rename to submodules/LegacyComponents/Sources/TGCameraMainTabletView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraMainView.m b/submodules/LegacyComponents/Sources/TGCameraMainView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraMainView.m
rename to submodules/LegacyComponents/Sources/TGCameraMainView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraModeControl.m b/submodules/LegacyComponents/Sources/TGCameraModeControl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraModeControl.m
rename to submodules/LegacyComponents/Sources/TGCameraModeControl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraPhotoPreviewController.m b/submodules/LegacyComponents/Sources/TGCameraPhotoPreviewController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraPhotoPreviewController.m
rename to submodules/LegacyComponents/Sources/TGCameraPhotoPreviewController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraPreviewView.m b/submodules/LegacyComponents/Sources/TGCameraPreviewView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraPreviewView.m
rename to submodules/LegacyComponents/Sources/TGCameraPreviewView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraSegmentsView.m b/submodules/LegacyComponents/Sources/TGCameraSegmentsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraSegmentsView.m
rename to submodules/LegacyComponents/Sources/TGCameraSegmentsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraShutterButton.m b/submodules/LegacyComponents/Sources/TGCameraShutterButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraShutterButton.m
rename to submodules/LegacyComponents/Sources/TGCameraShutterButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraTimeCodeView.m b/submodules/LegacyComponents/Sources/TGCameraTimeCodeView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraTimeCodeView.m
rename to submodules/LegacyComponents/Sources/TGCameraTimeCodeView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCameraZoomView.m b/submodules/LegacyComponents/Sources/TGCameraZoomView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCameraZoomView.m
rename to submodules/LegacyComponents/Sources/TGCameraZoomView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGChannelAdminRights.m b/submodules/LegacyComponents/Sources/TGChannelAdminRights.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGChannelAdminRights.m
rename to submodules/LegacyComponents/Sources/TGChannelAdminRights.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGChannelBannedRights.m b/submodules/LegacyComponents/Sources/TGChannelBannedRights.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGChannelBannedRights.m
rename to submodules/LegacyComponents/Sources/TGChannelBannedRights.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGCheckButtonView.m b/submodules/LegacyComponents/Sources/TGCheckButtonView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGCheckButtonView.m
rename to submodules/LegacyComponents/Sources/TGCheckButtonView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryMixin.m b/submodules/LegacyComponents/Sources/TGClipboardGalleryMixin.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryMixin.m
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryMixin.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryModel.h b/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryModel.h
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryModel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryModel.m b/submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryModel.m
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryModel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItem.m b/submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItem.m
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItemView.h b/submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItemView.h
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItemView.m b/submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardGalleryPhotoItemView.m
rename to submodules/LegacyComponents/Sources/TGClipboardGalleryPhotoItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m b/submodules/LegacyComponents/Sources/TGClipboardMenu.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardMenu.m
rename to submodules/LegacyComponents/Sources/TGClipboardMenu.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewCell.h b/submodules/LegacyComponents/Sources/TGClipboardPreviewCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewCell.h
rename to submodules/LegacyComponents/Sources/TGClipboardPreviewCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewCell.m b/submodules/LegacyComponents/Sources/TGClipboardPreviewCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewCell.m
rename to submodules/LegacyComponents/Sources/TGClipboardPreviewCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewItemView.h b/submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewItemView.h
rename to submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewItemView.m b/submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGClipboardPreviewItemView.m
rename to submodules/LegacyComponents/Sources/TGClipboardPreviewItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGColor.h b/submodules/LegacyComponents/Sources/TGColor.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGColor.h
rename to submodules/LegacyComponents/Sources/TGColor.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGColor.m b/submodules/LegacyComponents/Sources/TGColor.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGColor.m
rename to submodules/LegacyComponents/Sources/TGColor.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGContactMediaAttachment.m b/submodules/LegacyComponents/Sources/TGContactMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGContactMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGContactMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGConversation.m b/submodules/LegacyComponents/Sources/TGConversation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGConversation.m
rename to submodules/LegacyComponents/Sources/TGConversation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDataResource.m b/submodules/LegacyComponents/Sources/TGDataResource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDataResource.m
rename to submodules/LegacyComponents/Sources/TGDataResource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDatabaseMessageDraft.m b/submodules/LegacyComponents/Sources/TGDatabaseMessageDraft.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDatabaseMessageDraft.m
rename to submodules/LegacyComponents/Sources/TGDatabaseMessageDraft.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDateUtils.mm b/submodules/LegacyComponents/Sources/TGDateUtils.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDateUtils.mm
rename to submodules/LegacyComponents/Sources/TGDateUtils.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAnimated.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeAnimated.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAnimated.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeAnimated.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAudio.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeAudio.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeAudio.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeAudio.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeFilename.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeFilename.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeFilename.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeFilename.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeImageSize.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeImageSize.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeImageSize.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeImageSize.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeSticker.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeSticker.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeSticker.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeSticker.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeVideo.m b/submodules/LegacyComponents/Sources/TGDocumentAttributeVideo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentAttributeVideo.m
rename to submodules/LegacyComponents/Sources/TGDocumentAttributeVideo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDocumentMediaAttachment.m b/submodules/LegacyComponents/Sources/TGDocumentMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDocumentMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGDocumentMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDoubleTapGestureRecognizer.m b/submodules/LegacyComponents/Sources/TGDoubleTapGestureRecognizer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDoubleTapGestureRecognizer.m
rename to submodules/LegacyComponents/Sources/TGDoubleTapGestureRecognizer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionView.h b/submodules/LegacyComponents/Sources/TGDraggableCollectionView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionView.h
rename to submodules/LegacyComponents/Sources/TGDraggableCollectionView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionView.m b/submodules/LegacyComponents/Sources/TGDraggableCollectionView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionView.m
rename to submodules/LegacyComponents/Sources/TGDraggableCollectionView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionViewFlowLayout.h b/submodules/LegacyComponents/Sources/TGDraggableCollectionViewFlowLayout.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionViewFlowLayout.h
rename to submodules/LegacyComponents/Sources/TGDraggableCollectionViewFlowLayout.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionViewFlowLayout.m b/submodules/LegacyComponents/Sources/TGDraggableCollectionViewFlowLayout.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGDraggableCollectionViewFlowLayout.m
rename to submodules/LegacyComponents/Sources/TGDraggableCollectionViewFlowLayout.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedCoubPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedCoubPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedCoubPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedCoubPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedCoubPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedCoubPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedCoubPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedCoubPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedInstagramPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedInstagramPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedInstagramPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedInstagramPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedInstagramPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedInstagramPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedInstagramPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedInstagramPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPButton.m b/submodules/LegacyComponents/Sources/TGEmbedPIPButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPButton.m
rename to submodules/LegacyComponents/Sources/TGEmbedPIPButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPPullArrowView.m b/submodules/LegacyComponents/Sources/TGEmbedPIPPullArrowView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPPullArrowView.m
rename to submodules/LegacyComponents/Sources/TGEmbedPIPPullArrowView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPScrubber.h b/submodules/LegacyComponents/Sources/TGEmbedPIPScrubber.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPScrubber.h
rename to submodules/LegacyComponents/Sources/TGEmbedPIPScrubber.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPIPScrubber.m b/submodules/LegacyComponents/Sources/TGEmbedPIPScrubber.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPIPScrubber.m
rename to submodules/LegacyComponents/Sources/TGEmbedPIPScrubber.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerControls.m b/submodules/LegacyComponents/Sources/TGEmbedPlayerControls.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerControls.m
rename to submodules/LegacyComponents/Sources/TGEmbedPlayerControls.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerScrubber.h b/submodules/LegacyComponents/Sources/TGEmbedPlayerScrubber.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerScrubber.h
rename to submodules/LegacyComponents/Sources/TGEmbedPlayerScrubber.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerScrubber.m b/submodules/LegacyComponents/Sources/TGEmbedPlayerScrubber.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerScrubber.m
rename to submodules/LegacyComponents/Sources/TGEmbedPlayerScrubber.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerState.m b/submodules/LegacyComponents/Sources/TGEmbedPlayerState.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerState.m
rename to submodules/LegacyComponents/Sources/TGEmbedPlayerState.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedSoundCloudPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedSoundCloudPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedSoundCloudPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedSoundCloudPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedSoundCloudPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedSoundCloudPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedSoundCloudPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedSoundCloudPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedTwitchPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedTwitchPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedTwitchPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedTwitchPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedTwitchPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedTwitchPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedTwitchPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedTwitchPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVKPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedVKPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVKPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedVKPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVKPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedVKPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVKPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedVKPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVideoPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedVideoPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVideoPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedVideoPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVideoPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedVideoPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVideoPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedVideoPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVimeoPlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedVimeoPlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVimeoPlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedVimeoPlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVimeoPlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedVimeoPlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVimeoPlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedVimeoPlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVinePlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedVinePlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVinePlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedVinePlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedVinePlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedVinePlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedVinePlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedVinePlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedYoutubePlayerView.h b/submodules/LegacyComponents/Sources/TGEmbedYoutubePlayerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedYoutubePlayerView.h
rename to submodules/LegacyComponents/Sources/TGEmbedYoutubePlayerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGEmbedYoutubePlayerView.m b/submodules/LegacyComponents/Sources/TGEmbedYoutubePlayerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGEmbedYoutubePlayerView.m
rename to submodules/LegacyComponents/Sources/TGEmbedYoutubePlayerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFileUtils.m b/submodules/LegacyComponents/Sources/TGFileUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFileUtils.m
rename to submodules/LegacyComponents/Sources/TGFileUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFont.mm b/submodules/LegacyComponents/Sources/TGFont.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFont.mm
rename to submodules/LegacyComponents/Sources/TGFont.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGForwardedMessageMediaAttachment.m b/submodules/LegacyComponents/Sources/TGForwardedMessageMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGForwardedMessageMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGForwardedMessageMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGFullscreenContainerView.m b/submodules/LegacyComponents/Sources/TGFullscreenContainerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGFullscreenContainerView.m
rename to submodules/LegacyComponents/Sources/TGFullscreenContainerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGameMediaAttachment.m b/submodules/LegacyComponents/Sources/TGGameMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGameMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGGameMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGifConverter.m b/submodules/LegacyComponents/Sources/TGGifConverter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGifConverter.m
rename to submodules/LegacyComponents/Sources/TGGifConverter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGGradientLabel.m b/submodules/LegacyComponents/Sources/TGGradientLabel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGGradientLabel.m
rename to submodules/LegacyComponents/Sources/TGGradientLabel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHacks.m b/submodules/LegacyComponents/Sources/TGHacks.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHacks.m
rename to submodules/LegacyComponents/Sources/TGHacks.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHashtagPanelCell.h b/submodules/LegacyComponents/Sources/TGHashtagPanelCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHashtagPanelCell.h
rename to submodules/LegacyComponents/Sources/TGHashtagPanelCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHashtagPanelCell.m b/submodules/LegacyComponents/Sources/TGHashtagPanelCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHashtagPanelCell.m
rename to submodules/LegacyComponents/Sources/TGHashtagPanelCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHistogramView.h b/submodules/LegacyComponents/Sources/TGHistogramView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHistogramView.h
rename to submodules/LegacyComponents/Sources/TGHistogramView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGHistogramView.m b/submodules/LegacyComponents/Sources/TGHistogramView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGHistogramView.m
rename to submodules/LegacyComponents/Sources/TGHistogramView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGIconSwitchView.m b/submodules/LegacyComponents/Sources/TGIconSwitchView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGIconSwitchView.m
rename to submodules/LegacyComponents/Sources/TGIconSwitchView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageBlur.m b/submodules/LegacyComponents/Sources/TGImageBlur.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageBlur.m
rename to submodules/LegacyComponents/Sources/TGImageBlur.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageDataSource.m b/submodules/LegacyComponents/Sources/TGImageDataSource.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageDataSource.m
rename to submodules/LegacyComponents/Sources/TGImageDataSource.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageInfo.mm b/submodules/LegacyComponents/Sources/TGImageInfo.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageInfo.mm
rename to submodules/LegacyComponents/Sources/TGImageInfo.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageLuminanceMap.m b/submodules/LegacyComponents/Sources/TGImageLuminanceMap.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageLuminanceMap.m
rename to submodules/LegacyComponents/Sources/TGImageLuminanceMap.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageManager.m b/submodules/LegacyComponents/Sources/TGImageManager.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageManager.m
rename to submodules/LegacyComponents/Sources/TGImageManager.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageManagerTask.m b/submodules/LegacyComponents/Sources/TGImageManagerTask.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageManagerTask.m
rename to submodules/LegacyComponents/Sources/TGImageManagerTask.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageMediaAttachment.m b/submodules/LegacyComponents/Sources/TGImageMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGImageMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImagePickerController.mm b/submodules/LegacyComponents/Sources/TGImagePickerController.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImagePickerController.mm
rename to submodules/LegacyComponents/Sources/TGImagePickerController.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageUtils.mm b/submodules/LegacyComponents/Sources/TGImageUtils.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageUtils.mm
rename to submodules/LegacyComponents/Sources/TGImageUtils.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGImageView.m b/submodules/LegacyComponents/Sources/TGImageView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGImageView.m
rename to submodules/LegacyComponents/Sources/TGImageView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInputTextTag.m b/submodules/LegacyComponents/Sources/TGInputTextTag.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInputTextTag.m
rename to submodules/LegacyComponents/Sources/TGInputTextTag.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInstantPage.m b/submodules/LegacyComponents/Sources/TGInstantPage.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInstantPage.m
rename to submodules/LegacyComponents/Sources/TGInstantPage.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGInvoiceMediaAttachment.m b/submodules/LegacyComponents/Sources/TGInvoiceMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGInvoiceMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGInvoiceMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemMenuSheetPreviewView.m b/submodules/LegacyComponents/Sources/TGItemMenuSheetPreviewView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemMenuSheetPreviewView.m
rename to submodules/LegacyComponents/Sources/TGItemMenuSheetPreviewView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemPreviewController.m b/submodules/LegacyComponents/Sources/TGItemPreviewController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemPreviewController.m
rename to submodules/LegacyComponents/Sources/TGItemPreviewController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGItemPreviewView.m b/submodules/LegacyComponents/Sources/TGItemPreviewView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGItemPreviewView.m
rename to submodules/LegacyComponents/Sources/TGItemPreviewView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGKeyCommand.m b/submodules/LegacyComponents/Sources/TGKeyCommand.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGKeyCommand.m
rename to submodules/LegacyComponents/Sources/TGKeyCommand.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGKeyCommandController.m b/submodules/LegacyComponents/Sources/TGKeyCommandController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGKeyCommandController.m
rename to submodules/LegacyComponents/Sources/TGKeyCommandController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLabel.m b/submodules/LegacyComponents/Sources/TGLabel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLabel.m
rename to submodules/LegacyComponents/Sources/TGLabel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLegacyCameraController.m b/submodules/LegacyComponents/Sources/TGLegacyCameraController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLegacyCameraController.m
rename to submodules/LegacyComponents/Sources/TGLegacyCameraController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLegacyMediaPickerTipView.h b/submodules/LegacyComponents/Sources/TGLegacyMediaPickerTipView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLegacyMediaPickerTipView.h
rename to submodules/LegacyComponents/Sources/TGLegacyMediaPickerTipView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLegacyMediaPickerTipView.m b/submodules/LegacyComponents/Sources/TGLegacyMediaPickerTipView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLegacyMediaPickerTipView.m
rename to submodules/LegacyComponents/Sources/TGLegacyMediaPickerTipView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLetteredAvatarView.m b/submodules/LegacyComponents/Sources/TGLetteredAvatarView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLetteredAvatarView.m
rename to submodules/LegacyComponents/Sources/TGLetteredAvatarView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGListsTableView.m b/submodules/LegacyComponents/Sources/TGListsTableView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGListsTableView.m
rename to submodules/LegacyComponents/Sources/TGListsTableView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocalMessageMetaMediaAttachment.m b/submodules/LegacyComponents/Sources/TGLocalMessageMetaMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocalMessageMetaMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGLocalMessageMetaMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocalization.m b/submodules/LegacyComponents/Sources/TGLocalization.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocalization.m
rename to submodules/LegacyComponents/Sources/TGLocalization.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationAnnotation.h b/submodules/LegacyComponents/Sources/TGLocationAnnotation.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationAnnotation.h
rename to submodules/LegacyComponents/Sources/TGLocationAnnotation.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationAnnotation.m b/submodules/LegacyComponents/Sources/TGLocationAnnotation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationAnnotation.m
rename to submodules/LegacyComponents/Sources/TGLocationAnnotation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h b/submodules/LegacyComponents/Sources/TGLocationCurrentLocationCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.h
rename to submodules/LegacyComponents/Sources/TGLocationCurrentLocationCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m b/submodules/LegacyComponents/Sources/TGLocationCurrentLocationCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationCurrentLocationCell.m
rename to submodules/LegacyComponents/Sources/TGLocationCurrentLocationCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.h b/submodules/LegacyComponents/Sources/TGLocationInfoCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.h
rename to submodules/LegacyComponents/Sources/TGLocationInfoCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m b/submodules/LegacyComponents/Sources/TGLocationInfoCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationInfoCell.m
rename to submodules/LegacyComponents/Sources/TGLocationInfoCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveCell.h b/submodules/LegacyComponents/Sources/TGLocationLiveCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveCell.h
rename to submodules/LegacyComponents/Sources/TGLocationLiveCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveCell.m b/submodules/LegacyComponents/Sources/TGLocationLiveCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveCell.m
rename to submodules/LegacyComponents/Sources/TGLocationLiveCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveElapsedView.m b/submodules/LegacyComponents/Sources/TGLocationLiveElapsedView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveElapsedView.m
rename to submodules/LegacyComponents/Sources/TGLocationLiveElapsedView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m b/submodules/LegacyComponents/Sources/TGLocationLiveSessionItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationLiveSessionItemView.m
rename to submodules/LegacyComponents/Sources/TGLocationLiveSessionItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapModeControl.h b/submodules/LegacyComponents/Sources/TGLocationMapModeControl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapModeControl.h
rename to submodules/LegacyComponents/Sources/TGLocationMapModeControl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapModeControl.m b/submodules/LegacyComponents/Sources/TGLocationMapModeControl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapModeControl.m
rename to submodules/LegacyComponents/Sources/TGLocationMapModeControl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapView.h b/submodules/LegacyComponents/Sources/TGLocationMapView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapView.h
rename to submodules/LegacyComponents/Sources/TGLocationMapView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapView.m b/submodules/LegacyComponents/Sources/TGLocationMapView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapView.m
rename to submodules/LegacyComponents/Sources/TGLocationMapView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m b/submodules/LegacyComponents/Sources/TGLocationMapViewController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMapViewController.m
rename to submodules/LegacyComponents/Sources/TGLocationMapViewController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationMediaAttachment.m b/submodules/LegacyComponents/Sources/TGLocationMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGLocationMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationOptionsView.h b/submodules/LegacyComponents/Sources/TGLocationOptionsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationOptionsView.h
rename to submodules/LegacyComponents/Sources/TGLocationOptionsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationOptionsView.m b/submodules/LegacyComponents/Sources/TGLocationOptionsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationOptionsView.m
rename to submodules/LegacyComponents/Sources/TGLocationOptionsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m b/submodules/LegacyComponents/Sources/TGLocationPickerController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPickerController.m
rename to submodules/LegacyComponents/Sources/TGLocationPickerController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h b/submodules/LegacyComponents/Sources/TGLocationPinAnnotationView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.h
rename to submodules/LegacyComponents/Sources/TGLocationPinAnnotationView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m b/submodules/LegacyComponents/Sources/TGLocationPinAnnotationView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPinAnnotationView.m
rename to submodules/LegacyComponents/Sources/TGLocationPinAnnotationView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinView.h b/submodules/LegacyComponents/Sources/TGLocationPinView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPinView.h
rename to submodules/LegacyComponents/Sources/TGLocationPinView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPinView.m b/submodules/LegacyComponents/Sources/TGLocationPinView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPinView.m
rename to submodules/LegacyComponents/Sources/TGLocationPinView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationPulseView.m b/submodules/LegacyComponents/Sources/TGLocationPulseView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationPulseView.m
rename to submodules/LegacyComponents/Sources/TGLocationPulseView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationReverseGeocodeResult.h b/submodules/LegacyComponents/Sources/TGLocationReverseGeocodeResult.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationReverseGeocodeResult.h
rename to submodules/LegacyComponents/Sources/TGLocationReverseGeocodeResult.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationReverseGeocodeResult.m b/submodules/LegacyComponents/Sources/TGLocationReverseGeocodeResult.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationReverseGeocodeResult.m
rename to submodules/LegacyComponents/Sources/TGLocationReverseGeocodeResult.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationSectionHeaderCell.h b/submodules/LegacyComponents/Sources/TGLocationSectionHeaderCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationSectionHeaderCell.h
rename to submodules/LegacyComponents/Sources/TGLocationSectionHeaderCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationSectionHeaderCell.m b/submodules/LegacyComponents/Sources/TGLocationSectionHeaderCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationSectionHeaderCell.m
rename to submodules/LegacyComponents/Sources/TGLocationSectionHeaderCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationSignals.h b/submodules/LegacyComponents/Sources/TGLocationSignals.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationSignals.h
rename to submodules/LegacyComponents/Sources/TGLocationSignals.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationSignals.m b/submodules/LegacyComponents/Sources/TGLocationSignals.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationSignals.m
rename to submodules/LegacyComponents/Sources/TGLocationSignals.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationTitleView.h b/submodules/LegacyComponents/Sources/TGLocationTitleView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationTitleView.h
rename to submodules/LegacyComponents/Sources/TGLocationTitleView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationTitleView.m b/submodules/LegacyComponents/Sources/TGLocationTitleView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationTitleView.m
rename to submodules/LegacyComponents/Sources/TGLocationTitleView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationTrackingButton.h b/submodules/LegacyComponents/Sources/TGLocationTrackingButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationTrackingButton.h
rename to submodules/LegacyComponents/Sources/TGLocationTrackingButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationTrackingButton.m b/submodules/LegacyComponents/Sources/TGLocationTrackingButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationTrackingButton.m
rename to submodules/LegacyComponents/Sources/TGLocationTrackingButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationUtils.h b/submodules/LegacyComponents/Sources/TGLocationUtils.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationUtils.h
rename to submodules/LegacyComponents/Sources/TGLocationUtils.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationUtils.m b/submodules/LegacyComponents/Sources/TGLocationUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationUtils.m
rename to submodules/LegacyComponents/Sources/TGLocationUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationVenue.m b/submodules/LegacyComponents/Sources/TGLocationVenue.m
similarity index 98%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationVenue.m
rename to submodules/LegacyComponents/Sources/TGLocationVenue.m
index a151c076ab..b981c95cd2 100644
--- a/submodules/LegacyComponents/LegacyComponents/TGLocationVenue.m
+++ b/submodules/LegacyComponents/Sources/TGLocationVenue.m
@@ -1,6 +1,6 @@
 #import "TGLocationVenue.h"
 
-#import <LegacyComponents/LegacyComponents.h>
+#import <LegacyComponents/TGLocationMediaAttachment.h>
 
 NSString *const TGLocationGooglePlacesVenueProvider = @"google";
 NSString *const TGLocationFoursquareVenueProvider = @"foursquare";
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationVenueCell.h b/submodules/LegacyComponents/Sources/TGLocationVenueCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationVenueCell.h
rename to submodules/LegacyComponents/Sources/TGLocationVenueCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationVenueCell.m b/submodules/LegacyComponents/Sources/TGLocationVenueCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationVenueCell.m
rename to submodules/LegacyComponents/Sources/TGLocationVenueCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m b/submodules/LegacyComponents/Sources/TGLocationViewController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationViewController.m
rename to submodules/LegacyComponents/Sources/TGLocationViewController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGLocationWavesView.m b/submodules/LegacyComponents/Sources/TGLocationWavesView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGLocationWavesView.m
rename to submodules/LegacyComponents/Sources/TGLocationWavesView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset+TGMediaEditableItem.m b/submodules/LegacyComponents/Sources/TGMediaAsset+TGMediaEditableItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAsset+TGMediaEditableItem.m
rename to submodules/LegacyComponents/Sources/TGMediaAsset+TGMediaEditableItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m b/submodules/LegacyComponents/Sources/TGMediaAsset.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAsset.m
rename to submodules/LegacyComponents/Sources/TGMediaAsset.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResult.m b/submodules/LegacyComponents/Sources/TGMediaAssetFetchResult.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResult.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetFetchResult.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResultChange.m b/submodules/LegacyComponents/Sources/TGMediaAssetFetchResultChange.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetFetchResultChange.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetFetchResultChange.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m b/submodules/LegacyComponents/Sources/TGMediaAssetGroup.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetGroup.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetGroup.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetImageSignals.m b/submodules/LegacyComponents/Sources/TGMediaAssetImageSignals.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetImageSignals.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetImageSignals.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetLegacyImageSignals.h b/submodules/LegacyComponents/Sources/TGMediaAssetLegacyImageSignals.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetLegacyImageSignals.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetLegacyImageSignals.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetLegacyImageSignals.m b/submodules/LegacyComponents/Sources/TGMediaAssetLegacyImageSignals.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetLegacyImageSignals.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetLegacyImageSignals.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.h b/submodules/LegacyComponents/Sources/TGMediaAssetModernImageSignals.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetModernImageSignals.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m b/submodules/LegacyComponents/Sources/TGMediaAssetModernImageSignals.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetModernImageSignals.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetModernImageSignals.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetMoment.m b/submodules/LegacyComponents/Sources/TGMediaAssetMoment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetMoment.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetMoment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetMomentList.m b/submodules/LegacyComponents/Sources/TGMediaAssetMomentList.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetMomentList.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetMomentList.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsController.m b/submodules/LegacyComponents/Sources/TGMediaAssetsController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsController.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsGifCell.h b/submodules/LegacyComponents/Sources/TGMediaAssetsGifCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsGifCell.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsGifCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsGifCell.m b/submodules/LegacyComponents/Sources/TGMediaAssetsGifCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsGifCell.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsGifCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLegacyLibrary.h b/submodules/LegacyComponents/Sources/TGMediaAssetsLegacyLibrary.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLegacyLibrary.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsLegacyLibrary.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLegacyLibrary.m b/submodules/LegacyComponents/Sources/TGMediaAssetsLegacyLibrary.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLegacyLibrary.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsLegacyLibrary.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLibrary.m b/submodules/LegacyComponents/Sources/TGMediaAssetsLibrary.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsLibrary.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsLibrary.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m b/submodules/LegacyComponents/Sources/TGMediaAssetsModernLibrary.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsModernLibrary.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsModernLibrary.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPhotoCell.h b/submodules/LegacyComponents/Sources/TGMediaAssetsPhotoCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPhotoCell.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsPhotoCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPhotoCell.m b/submodules/LegacyComponents/Sources/TGMediaAssetsPhotoCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPhotoCell.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsPhotoCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPickerController.h b/submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPickerController.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPickerController.m b/submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsPickerController.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsTipView.h b/submodules/LegacyComponents/Sources/TGMediaAssetsTipView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsTipView.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsTipView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsTipView.m b/submodules/LegacyComponents/Sources/TGMediaAssetsTipView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsTipView.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsTipView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsUtils.m b/submodules/LegacyComponents/Sources/TGMediaAssetsUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsUtils.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsVideoCell.h b/submodules/LegacyComponents/Sources/TGMediaAssetsVideoCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsVideoCell.h
rename to submodules/LegacyComponents/Sources/TGMediaAssetsVideoCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAssetsVideoCell.m b/submodules/LegacyComponents/Sources/TGMediaAssetsVideoCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAssetsVideoCell.m
rename to submodules/LegacyComponents/Sources/TGMediaAssetsVideoCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAttachment.m b/submodules/LegacyComponents/Sources/TGMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarEditorTransition.m b/submodules/LegacyComponents/Sources/TGMediaAvatarEditorTransition.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAvatarEditorTransition.m
rename to submodules/LegacyComponents/Sources/TGMediaAvatarEditorTransition.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m b/submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaAvatarMenuMixin.m
rename to submodules/LegacyComponents/Sources/TGMediaAvatarMenuMixin.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaEditingContext.m b/submodules/LegacyComponents/Sources/TGMediaEditingContext.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaEditingContext.m
rename to submodules/LegacyComponents/Sources/TGMediaEditingContext.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.h b/submodules/LegacyComponents/Sources/TGMediaGroupCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.h
rename to submodules/LegacyComponents/Sources/TGMediaGroupCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m b/submodules/LegacyComponents/Sources/TGMediaGroupCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaGroupCell.m
rename to submodules/LegacyComponents/Sources/TGMediaGroupCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupsController.h b/submodules/LegacyComponents/Sources/TGMediaGroupsController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaGroupsController.h
rename to submodules/LegacyComponents/Sources/TGMediaGroupsController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaGroupsController.m b/submodules/LegacyComponents/Sources/TGMediaGroupsController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaGroupsController.m
rename to submodules/LegacyComponents/Sources/TGMediaGroupsController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaOriginInfo.m b/submodules/LegacyComponents/Sources/TGMediaOriginInfo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaOriginInfo.m
rename to submodules/LegacyComponents/Sources/TGMediaOriginInfo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerCaptionInputPanel.m b/submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerCaptionInputPanel.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerCaptionInputPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerCell.m b/submodules/LegacyComponents/Sources/TGMediaPickerCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerCell.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerController.m b/submodules/LegacyComponents/Sources/TGMediaPickerController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerController.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItem.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItem.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItem.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItem.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItemView.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItemView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItemView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryGifItemView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryGifItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryInterfaceView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryInterfaceView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryItem.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryItem.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryModel.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryModel.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryModel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItem.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItem.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItemView.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItemView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItemView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryPhotoItemView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryPhotoItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGallerySelectedItemsModel.h b/submodules/LegacyComponents/Sources/TGMediaPickerGallerySelectedItemsModel.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGallerySelectedItemsModel.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGallerySelectedItemsModel.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGallerySelectedItemsModel.m b/submodules/LegacyComponents/Sources/TGMediaPickerGallerySelectedItemsModel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGallerySelectedItemsModel.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGallerySelectedItemsModel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItem.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItem.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItemView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoItemView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubber.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubber.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubber.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubber.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubber.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubber.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubber.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubber.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubberThumbnailView.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubberThumbnailView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubberThumbnailView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubberThumbnailView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubberThumbnailView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubberThumbnailView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoScrubberThumbnailView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoScrubberThumbnailView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoTrimView.h b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoTrimView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoTrimView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoTrimView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoTrimView.m b/submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoTrimView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerGalleryVideoTrimView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerGalleryVideoTrimView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerLayoutMetrics.m b/submodules/LegacyComponents/Sources/TGMediaPickerLayoutMetrics.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerLayoutMetrics.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerLayoutMetrics.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m b/submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerModernGalleryMixin.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerModernGalleryMixin.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoCounterButton.h b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoCounterButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoCounterButton.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoCounterButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoCounterButton.m b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoCounterButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoCounterButton.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoCounterButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripCell.h b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripCell.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripCell.m b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripCell.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripView.h b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripView.m b/submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerPhotoStripView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerPhotoStripView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerScrubberHeaderView.h b/submodules/LegacyComponents/Sources/TGMediaPickerScrubberHeaderView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerScrubberHeaderView.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerScrubberHeaderView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerScrubberHeaderView.m b/submodules/LegacyComponents/Sources/TGMediaPickerScrubberHeaderView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerScrubberHeaderView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerScrubberHeaderView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerSelectionGestureRecognizer.h b/submodules/LegacyComponents/Sources/TGMediaPickerSelectionGestureRecognizer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerSelectionGestureRecognizer.h
rename to submodules/LegacyComponents/Sources/TGMediaPickerSelectionGestureRecognizer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerSelectionGestureRecognizer.m b/submodules/LegacyComponents/Sources/TGMediaPickerSelectionGestureRecognizer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerSelectionGestureRecognizer.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerSelectionGestureRecognizer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerSendActionSheetController.m b/submodules/LegacyComponents/Sources/TGMediaPickerSendActionSheetController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerSendActionSheetController.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerSendActionSheetController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaPickerToolbarView.m b/submodules/LegacyComponents/Sources/TGMediaPickerToolbarView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaPickerToolbarView.m
rename to submodules/LegacyComponents/Sources/TGMediaPickerToolbarView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaSelectionContext.m b/submodules/LegacyComponents/Sources/TGMediaSelectionContext.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaSelectionContext.m
rename to submodules/LegacyComponents/Sources/TGMediaSelectionContext.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMediaVideoConverter.m b/submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMediaVideoConverter.m
rename to submodules/LegacyComponents/Sources/TGMediaVideoConverter.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMemoryImageCache.m b/submodules/LegacyComponents/Sources/TGMemoryImageCache.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMemoryImageCache.m
rename to submodules/LegacyComponents/Sources/TGMemoryImageCache.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMentionPanelCell.h b/submodules/LegacyComponents/Sources/TGMentionPanelCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMentionPanelCell.h
rename to submodules/LegacyComponents/Sources/TGMentionPanelCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMentionPanelCell.m b/submodules/LegacyComponents/Sources/TGMentionPanelCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMentionPanelCell.m
rename to submodules/LegacyComponents/Sources/TGMentionPanelCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m b/submodules/LegacyComponents/Sources/TGMenuSheetButtonItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetButtonItemView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetButtonItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetCollectionView.m b/submodules/LegacyComponents/Sources/TGMenuSheetCollectionView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetCollectionView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetCollectionView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetController.m b/submodules/LegacyComponents/Sources/TGMenuSheetController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetController.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetDimView.h b/submodules/LegacyComponents/Sources/TGMenuSheetDimView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetDimView.h
rename to submodules/LegacyComponents/Sources/TGMenuSheetDimView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetDimView.m b/submodules/LegacyComponents/Sources/TGMenuSheetDimView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetDimView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetDimView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetItemView.m b/submodules/LegacyComponents/Sources/TGMenuSheetItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetItemView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetTitleItemView.m b/submodules/LegacyComponents/Sources/TGMenuSheetTitleItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetTitleItemView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetTitleItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuSheetView.m b/submodules/LegacyComponents/Sources/TGMenuSheetView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuSheetView.m
rename to submodules/LegacyComponents/Sources/TGMenuSheetView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMenuView.m b/submodules/LegacyComponents/Sources/TGMenuView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMenuView.m
rename to submodules/LegacyComponents/Sources/TGMenuView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessage.mm b/submodules/LegacyComponents/Sources/TGMessage.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessage.mm
rename to submodules/LegacyComponents/Sources/TGMessage.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntitiesAttachment.m b/submodules/LegacyComponents/Sources/TGMessageEntitiesAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntitiesAttachment.m
rename to submodules/LegacyComponents/Sources/TGMessageEntitiesAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntity.m b/submodules/LegacyComponents/Sources/TGMessageEntity.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntity.m
rename to submodules/LegacyComponents/Sources/TGMessageEntity.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityBold.m b/submodules/LegacyComponents/Sources/TGMessageEntityBold.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityBold.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityBold.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityBotCommand.m b/submodules/LegacyComponents/Sources/TGMessageEntityBotCommand.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityBotCommand.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityBotCommand.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityCashtag.m b/submodules/LegacyComponents/Sources/TGMessageEntityCashtag.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityCashtag.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityCashtag.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityCode.m b/submodules/LegacyComponents/Sources/TGMessageEntityCode.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityCode.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityCode.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityEmail.m b/submodules/LegacyComponents/Sources/TGMessageEntityEmail.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityEmail.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityEmail.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityHashtag.m b/submodules/LegacyComponents/Sources/TGMessageEntityHashtag.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityHashtag.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityHashtag.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityItalic.m b/submodules/LegacyComponents/Sources/TGMessageEntityItalic.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityItalic.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityItalic.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityMention.m b/submodules/LegacyComponents/Sources/TGMessageEntityMention.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityMention.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityMention.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityMentionName.m b/submodules/LegacyComponents/Sources/TGMessageEntityMentionName.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityMentionName.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityMentionName.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityPhone.m b/submodules/LegacyComponents/Sources/TGMessageEntityPhone.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityPhone.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityPhone.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityPre.m b/submodules/LegacyComponents/Sources/TGMessageEntityPre.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityPre.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityPre.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityTextUrl.m b/submodules/LegacyComponents/Sources/TGMessageEntityTextUrl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityTextUrl.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityTextUrl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageEntityUrl.m b/submodules/LegacyComponents/Sources/TGMessageEntityUrl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageEntityUrl.m
rename to submodules/LegacyComponents/Sources/TGMessageEntityUrl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageGroup.m b/submodules/LegacyComponents/Sources/TGMessageGroup.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageGroup.m
rename to submodules/LegacyComponents/Sources/TGMessageGroup.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageHole.m b/submodules/LegacyComponents/Sources/TGMessageHole.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageHole.m
rename to submodules/LegacyComponents/Sources/TGMessageHole.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m b/submodules/LegacyComponents/Sources/TGMessageImageViewOverlayView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageImageViewOverlayView.m
rename to submodules/LegacyComponents/Sources/TGMessageImageViewOverlayView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGMessageViewCountContentProperty.m b/submodules/LegacyComponents/Sources/TGMessageViewCountContentProperty.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGMessageViewCountContentProperty.m
rename to submodules/LegacyComponents/Sources/TGMessageViewCountContentProperty.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernAnimatedImagePlayer.h b/submodules/LegacyComponents/Sources/TGModernAnimatedImagePlayer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernAnimatedImagePlayer.h
rename to submodules/LegacyComponents/Sources/TGModernAnimatedImagePlayer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernAnimatedImagePlayer.m b/submodules/LegacyComponents/Sources/TGModernAnimatedImagePlayer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernAnimatedImagePlayer.m
rename to submodules/LegacyComponents/Sources/TGModernAnimatedImagePlayer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernBackToolbarButton.m b/submodules/LegacyComponents/Sources/TGModernBackToolbarButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernBackToolbarButton.m
rename to submodules/LegacyComponents/Sources/TGModernBackToolbarButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernBarButton.m b/submodules/LegacyComponents/Sources/TGModernBarButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernBarButton.m
rename to submodules/LegacyComponents/Sources/TGModernBarButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernButton.m b/submodules/LegacyComponents/Sources/TGModernButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernButton.m
rename to submodules/LegacyComponents/Sources/TGModernButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernCache.m b/submodules/LegacyComponents/Sources/TGModernCache.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernCache.m
rename to submodules/LegacyComponents/Sources/TGModernCache.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.m b/submodules/LegacyComponents/Sources/TGModernConversationAlphacodeAssociatedPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationAlphacodeAssociatedPanel.m
rename to submodules/LegacyComponents/Sources/TGModernConversationAlphacodeAssociatedPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationAssociatedInputPanel.m b/submodules/LegacyComponents/Sources/TGModernConversationAssociatedInputPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationAssociatedInputPanel.m
rename to submodules/LegacyComponents/Sources/TGModernConversationAssociatedInputPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.m b/submodules/LegacyComponents/Sources/TGModernConversationHashtagsAssociatedPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationHashtagsAssociatedPanel.m
rename to submodules/LegacyComponents/Sources/TGModernConversationHashtagsAssociatedPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationInputMicButton.m b/submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationInputMicButton.m
rename to submodules/LegacyComponents/Sources/TGModernConversationInputMicButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationMentionsAssociatedPanel.m b/submodules/LegacyComponents/Sources/TGModernConversationMentionsAssociatedPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationMentionsAssociatedPanel.m
rename to submodules/LegacyComponents/Sources/TGModernConversationMentionsAssociatedPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernConversationTitleActivityIndicator.m b/submodules/LegacyComponents/Sources/TGModernConversationTitleActivityIndicator.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernConversationTitleActivityIndicator.m
rename to submodules/LegacyComponents/Sources/TGModernConversationTitleActivityIndicator.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryContainerView.m b/submodules/LegacyComponents/Sources/TGModernGalleryContainerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryContainerView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryContainerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryController.m b/submodules/LegacyComponents/Sources/TGModernGalleryController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryController.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultInterfaceView.m b/submodules/LegacyComponents/Sources/TGModernGalleryDefaultInterfaceView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryDefaultInterfaceView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryDefaultInterfaceView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.m b/submodules/LegacyComponents/Sources/TGModernGalleryEmbeddedStickersHeaderView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryEmbeddedStickersHeaderView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryEmbeddedStickersHeaderView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItem.m b/submodules/LegacyComponents/Sources/TGModernGalleryImageItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItem.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryImageItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemContainerView.m b/submodules/LegacyComponents/Sources/TGModernGalleryImageItemContainerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemContainerView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryImageItemContainerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemImageView.m b/submodules/LegacyComponents/Sources/TGModernGalleryImageItemImageView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemImageView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryImageItemImageView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemView.m b/submodules/LegacyComponents/Sources/TGModernGalleryImageItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryImageItemView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryImageItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryItemView.m b/submodules/LegacyComponents/Sources/TGModernGalleryItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryItemView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryModel.m b/submodules/LegacyComponents/Sources/TGModernGalleryModel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryModel.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryModel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryScrollView.m b/submodules/LegacyComponents/Sources/TGModernGalleryScrollView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryScrollView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryScrollView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryTransitionView.m b/submodules/LegacyComponents/Sources/TGModernGalleryTransitionView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryTransitionView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryTransitionView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoContentView.h b/submodules/LegacyComponents/Sources/TGModernGalleryVideoContentView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoContentView.h
rename to submodules/LegacyComponents/Sources/TGModernGalleryVideoContentView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoContentView.m b/submodules/LegacyComponents/Sources/TGModernGalleryVideoContentView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoContentView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryVideoContentView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoView.m b/submodules/LegacyComponents/Sources/TGModernGalleryVideoView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryVideoView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryVideoView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryView.m b/submodules/LegacyComponents/Sources/TGModernGalleryView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemView.m b/submodules/LegacyComponents/Sources/TGModernGalleryZoomableItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableItemView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryZoomableItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollView.m b/submodules/LegacyComponents/Sources/TGModernGalleryZoomableScrollView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollView.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryZoomableScrollView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.m b/submodules/LegacyComponents/Sources/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.m
rename to submodules/LegacyComponents/Sources/TGModernGalleryZoomableScrollViewSwipeGestureRecognizer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemContentView.h b/submodules/LegacyComponents/Sources/TGModernMediaListItemContentView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemContentView.h
rename to submodules/LegacyComponents/Sources/TGModernMediaListItemContentView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemContentView.m b/submodules/LegacyComponents/Sources/TGModernMediaListItemContentView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemContentView.m
rename to submodules/LegacyComponents/Sources/TGModernMediaListItemContentView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemView.h b/submodules/LegacyComponents/Sources/TGModernMediaListItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemView.h
rename to submodules/LegacyComponents/Sources/TGModernMediaListItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemView.m b/submodules/LegacyComponents/Sources/TGModernMediaListItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListItemView.m
rename to submodules/LegacyComponents/Sources/TGModernMediaListItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernMediaListSelectableItem.h b/submodules/LegacyComponents/Sources/TGModernMediaListSelectableItem.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernMediaListSelectableItem.h
rename to submodules/LegacyComponents/Sources/TGModernMediaListSelectableItem.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGModernToolbarButton.m b/submodules/LegacyComponents/Sources/TGModernToolbarButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGModernToolbarButton.m
rename to submodules/LegacyComponents/Sources/TGModernToolbarButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGNavigationBar.m b/submodules/LegacyComponents/Sources/TGNavigationBar.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGNavigationBar.m
rename to submodules/LegacyComponents/Sources/TGNavigationBar.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGNavigationController.m b/submodules/LegacyComponents/Sources/TGNavigationController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGNavigationController.m
rename to submodules/LegacyComponents/Sources/TGNavigationController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGObserverProxy.m b/submodules/LegacyComponents/Sources/TGObserverProxy.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGObserverProxy.m
rename to submodules/LegacyComponents/Sources/TGObserverProxy.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayController.m b/submodules/LegacyComponents/Sources/TGOverlayController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayController.m
rename to submodules/LegacyComponents/Sources/TGOverlayController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayControllerWindow.m b/submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayControllerWindow.m
rename to submodules/LegacyComponents/Sources/TGOverlayControllerWindow.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetController.h b/submodules/LegacyComponents/Sources/TGOverlayFormsheetController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetController.h
rename to submodules/LegacyComponents/Sources/TGOverlayFormsheetController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetController.m b/submodules/LegacyComponents/Sources/TGOverlayFormsheetController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetController.m
rename to submodules/LegacyComponents/Sources/TGOverlayFormsheetController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetWindow.h b/submodules/LegacyComponents/Sources/TGOverlayFormsheetWindow.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetWindow.h
rename to submodules/LegacyComponents/Sources/TGOverlayFormsheetWindow.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetWindow.m b/submodules/LegacyComponents/Sources/TGOverlayFormsheetWindow.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGOverlayFormsheetWindow.m
rename to submodules/LegacyComponents/Sources/TGOverlayFormsheetWindow.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBrush.h b/submodules/LegacyComponents/Sources/TGPaintBrush.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBrush.h
rename to submodules/LegacyComponents/Sources/TGPaintBrush.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBrush.m b/submodules/LegacyComponents/Sources/TGPaintBrush.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBrush.m
rename to submodules/LegacyComponents/Sources/TGPaintBrush.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBrushPreview.h b/submodules/LegacyComponents/Sources/TGPaintBrushPreview.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBrushPreview.h
rename to submodules/LegacyComponents/Sources/TGPaintBrushPreview.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBrushPreview.m b/submodules/LegacyComponents/Sources/TGPaintBrushPreview.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBrushPreview.m
rename to submodules/LegacyComponents/Sources/TGPaintBrushPreview.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBuffers.h b/submodules/LegacyComponents/Sources/TGPaintBuffers.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBuffers.h
rename to submodules/LegacyComponents/Sources/TGPaintBuffers.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintBuffers.m b/submodules/LegacyComponents/Sources/TGPaintBuffers.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintBuffers.m
rename to submodules/LegacyComponents/Sources/TGPaintBuffers.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintCanvas.h b/submodules/LegacyComponents/Sources/TGPaintCanvas.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintCanvas.h
rename to submodules/LegacyComponents/Sources/TGPaintCanvas.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintCanvas.m b/submodules/LegacyComponents/Sources/TGPaintCanvas.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintCanvas.m
rename to submodules/LegacyComponents/Sources/TGPaintCanvas.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintEllipticalBrush.h b/submodules/LegacyComponents/Sources/TGPaintEllipticalBrush.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintEllipticalBrush.h
rename to submodules/LegacyComponents/Sources/TGPaintEllipticalBrush.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintEllipticalBrush.m b/submodules/LegacyComponents/Sources/TGPaintEllipticalBrush.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintEllipticalBrush.m
rename to submodules/LegacyComponents/Sources/TGPaintEllipticalBrush.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintFaceDebugView.h b/submodules/LegacyComponents/Sources/TGPaintFaceDebugView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintFaceDebugView.h
rename to submodules/LegacyComponents/Sources/TGPaintFaceDebugView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintFaceDebugView.m b/submodules/LegacyComponents/Sources/TGPaintFaceDebugView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintFaceDebugView.m
rename to submodules/LegacyComponents/Sources/TGPaintFaceDebugView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintFaceDetector.h b/submodules/LegacyComponents/Sources/TGPaintFaceDetector.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintFaceDetector.h
rename to submodules/LegacyComponents/Sources/TGPaintFaceDetector.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintFaceDetector.m b/submodules/LegacyComponents/Sources/TGPaintFaceDetector.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintFaceDetector.m
rename to submodules/LegacyComponents/Sources/TGPaintFaceDetector.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintInput.h b/submodules/LegacyComponents/Sources/TGPaintInput.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintInput.h
rename to submodules/LegacyComponents/Sources/TGPaintInput.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintInput.m b/submodules/LegacyComponents/Sources/TGPaintInput.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintInput.m
rename to submodules/LegacyComponents/Sources/TGPaintInput.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintNeonBrush.h b/submodules/LegacyComponents/Sources/TGPaintNeonBrush.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintNeonBrush.h
rename to submodules/LegacyComponents/Sources/TGPaintNeonBrush.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintNeonBrush.m b/submodules/LegacyComponents/Sources/TGPaintNeonBrush.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintNeonBrush.m
rename to submodules/LegacyComponents/Sources/TGPaintNeonBrush.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintPanGestureRecognizer.h b/submodules/LegacyComponents/Sources/TGPaintPanGestureRecognizer.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintPanGestureRecognizer.h
rename to submodules/LegacyComponents/Sources/TGPaintPanGestureRecognizer.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintPanGestureRecognizer.m b/submodules/LegacyComponents/Sources/TGPaintPanGestureRecognizer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintPanGestureRecognizer.m
rename to submodules/LegacyComponents/Sources/TGPaintPanGestureRecognizer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintPath.h b/submodules/LegacyComponents/Sources/TGPaintPath.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintPath.h
rename to submodules/LegacyComponents/Sources/TGPaintPath.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintPath.m b/submodules/LegacyComponents/Sources/TGPaintPath.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintPath.m
rename to submodules/LegacyComponents/Sources/TGPaintPath.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintRadialBrush.h b/submodules/LegacyComponents/Sources/TGPaintRadialBrush.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintRadialBrush.h
rename to submodules/LegacyComponents/Sources/TGPaintRadialBrush.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintRadialBrush.m b/submodules/LegacyComponents/Sources/TGPaintRadialBrush.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintRadialBrush.m
rename to submodules/LegacyComponents/Sources/TGPaintRadialBrush.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintRender.h b/submodules/LegacyComponents/Sources/TGPaintRender.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintRender.h
rename to submodules/LegacyComponents/Sources/TGPaintRender.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintRender.m b/submodules/LegacyComponents/Sources/TGPaintRender.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintRender.m
rename to submodules/LegacyComponents/Sources/TGPaintRender.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintShader.m b/submodules/LegacyComponents/Sources/TGPaintShader.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintShader.m
rename to submodules/LegacyComponents/Sources/TGPaintShader.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintShaderSet.h b/submodules/LegacyComponents/Sources/TGPaintShaderSet.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintShaderSet.h
rename to submodules/LegacyComponents/Sources/TGPaintShaderSet.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintShaderSet.m b/submodules/LegacyComponents/Sources/TGPaintShaderSet.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintShaderSet.m
rename to submodules/LegacyComponents/Sources/TGPaintShaderSet.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintSlice.h b/submodules/LegacyComponents/Sources/TGPaintSlice.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintSlice.h
rename to submodules/LegacyComponents/Sources/TGPaintSlice.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintSlice.m b/submodules/LegacyComponents/Sources/TGPaintSlice.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintSlice.m
rename to submodules/LegacyComponents/Sources/TGPaintSlice.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintState.h b/submodules/LegacyComponents/Sources/TGPaintState.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintState.h
rename to submodules/LegacyComponents/Sources/TGPaintState.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintState.m b/submodules/LegacyComponents/Sources/TGPaintState.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintState.m
rename to submodules/LegacyComponents/Sources/TGPaintState.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintSwatch.h b/submodules/LegacyComponents/Sources/TGPaintSwatch.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintSwatch.h
rename to submodules/LegacyComponents/Sources/TGPaintSwatch.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintSwatch.m b/submodules/LegacyComponents/Sources/TGPaintSwatch.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintSwatch.m
rename to submodules/LegacyComponents/Sources/TGPaintSwatch.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintTexture.h b/submodules/LegacyComponents/Sources/TGPaintTexture.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintTexture.h
rename to submodules/LegacyComponents/Sources/TGPaintTexture.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintTexture.m b/submodules/LegacyComponents/Sources/TGPaintTexture.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintTexture.m
rename to submodules/LegacyComponents/Sources/TGPaintTexture.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintUndoManager.m b/submodules/LegacyComponents/Sources/TGPaintUndoManager.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintUndoManager.m
rename to submodules/LegacyComponents/Sources/TGPaintUndoManager.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintUtils.m b/submodules/LegacyComponents/Sources/TGPaintUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintUtils.m
rename to submodules/LegacyComponents/Sources/TGPaintUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPainting.h b/submodules/LegacyComponents/Sources/TGPainting.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPainting.h
rename to submodules/LegacyComponents/Sources/TGPainting.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPainting.m b/submodules/LegacyComponents/Sources/TGPainting.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPainting.m
rename to submodules/LegacyComponents/Sources/TGPainting.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintingData.m b/submodules/LegacyComponents/Sources/TGPaintingData.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintingData.m
rename to submodules/LegacyComponents/Sources/TGPaintingData.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintingWrapperView.h b/submodules/LegacyComponents/Sources/TGPaintingWrapperView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintingWrapperView.h
rename to submodules/LegacyComponents/Sources/TGPaintingWrapperView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPaintingWrapperView.m b/submodules/LegacyComponents/Sources/TGPaintingWrapperView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPaintingWrapperView.m
rename to submodules/LegacyComponents/Sources/TGPaintingWrapperView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m b/submodules/LegacyComponents/Sources/TGPassportAttachMenu.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportAttachMenu.m
rename to submodules/LegacyComponents/Sources/TGPassportAttachMenu.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportICloud.m b/submodules/LegacyComponents/Sources/TGPassportICloud.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportICloud.m
rename to submodules/LegacyComponents/Sources/TGPassportICloud.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportMRZ.m b/submodules/LegacyComponents/Sources/TGPassportMRZ.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportMRZ.m
rename to submodules/LegacyComponents/Sources/TGPassportMRZ.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportOCR.mm b/submodules/LegacyComponents/Sources/TGPassportOCR.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportOCR.mm
rename to submodules/LegacyComponents/Sources/TGPassportOCR.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportScanController.m b/submodules/LegacyComponents/Sources/TGPassportScanController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportScanController.m
rename to submodules/LegacyComponents/Sources/TGPassportScanController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportScanView.h b/submodules/LegacyComponents/Sources/TGPassportScanView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportScanView.h
rename to submodules/LegacyComponents/Sources/TGPassportScanView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPassportScanView.m b/submodules/LegacyComponents/Sources/TGPassportScanView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPassportScanView.m
rename to submodules/LegacyComponents/Sources/TGPassportScanView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhoneUtils.m b/submodules/LegacyComponents/Sources/TGPhoneUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhoneUtils.m
rename to submodules/LegacyComponents/Sources/TGPhoneUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropController.h b/submodules/LegacyComponents/Sources/TGPhotoAvatarCropController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropController.h
rename to submodules/LegacyComponents/Sources/TGPhotoAvatarCropController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropController.m b/submodules/LegacyComponents/Sources/TGPhotoAvatarCropController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropController.m
rename to submodules/LegacyComponents/Sources/TGPhotoAvatarCropController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropView.m b/submodules/LegacyComponents/Sources/TGPhotoAvatarCropView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoAvatarCropView.m
rename to submodules/LegacyComponents/Sources/TGPhotoAvatarCropView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoBrushSettingsView.h b/submodules/LegacyComponents/Sources/TGPhotoBrushSettingsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoBrushSettingsView.h
rename to submodules/LegacyComponents/Sources/TGPhotoBrushSettingsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoBrushSettingsView.m b/submodules/LegacyComponents/Sources/TGPhotoBrushSettingsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoBrushSettingsView.m
rename to submodules/LegacyComponents/Sources/TGPhotoBrushSettingsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionController.h b/submodules/LegacyComponents/Sources/TGPhotoCaptionController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionController.h
rename to submodules/LegacyComponents/Sources/TGPhotoCaptionController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionController.m b/submodules/LegacyComponents/Sources/TGPhotoCaptionController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionController.m
rename to submodules/LegacyComponents/Sources/TGPhotoCaptionController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionInputMixin.m b/submodules/LegacyComponents/Sources/TGPhotoCaptionInputMixin.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCaptionInputMixin.m
rename to submodules/LegacyComponents/Sources/TGPhotoCaptionInputMixin.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropAreaView.h b/submodules/LegacyComponents/Sources/TGPhotoCropAreaView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropAreaView.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropAreaView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropAreaView.m b/submodules/LegacyComponents/Sources/TGPhotoCropAreaView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropAreaView.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropAreaView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropControl.h b/submodules/LegacyComponents/Sources/TGPhotoCropControl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropControl.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropControl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropControl.m b/submodules/LegacyComponents/Sources/TGPhotoCropControl.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropControl.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropControl.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.h b/submodules/LegacyComponents/Sources/TGPhotoCropController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m b/submodules/LegacyComponents/Sources/TGPhotoCropController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropController.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropGridView.h b/submodules/LegacyComponents/Sources/TGPhotoCropGridView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropGridView.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropGridView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropGridView.m b/submodules/LegacyComponents/Sources/TGPhotoCropGridView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropGridView.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropGridView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropRotationView.h b/submodules/LegacyComponents/Sources/TGPhotoCropRotationView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropRotationView.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropRotationView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropRotationView.m b/submodules/LegacyComponents/Sources/TGPhotoCropRotationView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropRotationView.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropRotationView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropScrollView.h b/submodules/LegacyComponents/Sources/TGPhotoCropScrollView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropScrollView.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropScrollView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropScrollView.m b/submodules/LegacyComponents/Sources/TGPhotoCropScrollView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropScrollView.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropScrollView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropView.h b/submodules/LegacyComponents/Sources/TGPhotoCropView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropView.h
rename to submodules/LegacyComponents/Sources/TGPhotoCropView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoCropView.m b/submodules/LegacyComponents/Sources/TGPhotoCropView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoCropView.m
rename to submodules/LegacyComponents/Sources/TGPhotoCropView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorAnimation.m b/submodules/LegacyComponents/Sources/TGPhotoEditorAnimation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorAnimation.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorAnimation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurAreaView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurAreaView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurAreaView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurAreaView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurAreaView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurAreaView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurAreaView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurAreaView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurToolView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurToolView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurToolView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurToolView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurToolView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurToolView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurToolView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurToolView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurTypeButton.h b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurTypeButton.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurTypeButton.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurTypeButton.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurTypeButton.m b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurTypeButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurTypeButton.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurTypeButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorBlurView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorBlurView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorBlurView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorButton.m b/submodules/LegacyComponents/Sources/TGPhotoEditorButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorButton.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCollectionView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorCollectionView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCollectionView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCollectionView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCollectionView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorCollectionView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCollectionView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCollectionView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorController.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesHistogramView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorCurvesHistogramView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesHistogramView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCurvesHistogramView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesHistogramView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorCurvesHistogramView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesHistogramView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCurvesHistogramView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesToolView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorCurvesToolView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesToolView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCurvesToolView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesToolView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorCurvesToolView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorCurvesToolView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorCurvesToolView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorGenericToolView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorGenericToolView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorGenericToolView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorGenericToolView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorGenericToolView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorGenericToolView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorGenericToolView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorGenericToolView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorHUDView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorHUDView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorHUDView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorHUDView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorHUDView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorHUDView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorHUDView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorHUDView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorInterfaceAssets.m b/submodules/LegacyComponents/Sources/TGPhotoEditorInterfaceAssets.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorInterfaceAssets.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorInterfaceAssets.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorItemController.h b/submodules/LegacyComponents/Sources/TGPhotoEditorItemController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorItemController.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorItemController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorItemController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorItemController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorItemController.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorItemController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorLinearBlurView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorLinearBlurView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorLinearBlurView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorLinearBlurView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorLinearBlurView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorLinearBlurView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorLinearBlurView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorLinearBlurView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorPreviewView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorPreviewView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorPreviewView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorPreviewView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorPreviewView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorPreviewView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorPreviewView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorPreviewView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorRadialBlurView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorRadialBlurView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorRadialBlurView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorRadialBlurView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorRadialBlurView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorRadialBlurView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorRadialBlurView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorRadialBlurView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorSliderView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorSliderView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorSliderView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTabController.m b/submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTabController.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorTabController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintSwatchView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorTintSwatchView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintSwatchView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorTintSwatchView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintSwatchView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorTintSwatchView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintSwatchView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorTintSwatchView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintToolView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorTintToolView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintToolView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorTintToolView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintToolView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorTintToolView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorTintToolView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorTintToolView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolButtonsView.h b/submodules/LegacyComponents/Sources/TGPhotoEditorToolButtonsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolButtonsView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEditorToolButtonsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolButtonsView.m b/submodules/LegacyComponents/Sources/TGPhotoEditorToolButtonsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorToolButtonsView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorToolButtonsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEditorUtils.m b/submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEditorUtils.m
rename to submodules/LegacyComponents/Sources/TGPhotoEditorUtils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEntitiesContainerView.h b/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEntitiesContainerView.h
rename to submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoEntitiesContainerView.m b/submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoEntitiesContainerView.m
rename to submodules/LegacyComponents/Sources/TGPhotoEntitiesContainerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoFilterCell.h b/submodules/LegacyComponents/Sources/TGPhotoFilterCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoFilterCell.h
rename to submodules/LegacyComponents/Sources/TGPhotoFilterCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoFilterCell.m b/submodules/LegacyComponents/Sources/TGPhotoFilterCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoFilterCell.m
rename to submodules/LegacyComponents/Sources/TGPhotoFilterCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoMaskPosition.m b/submodules/LegacyComponents/Sources/TGPhotoMaskPosition.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoMaskPosition.m
rename to submodules/LegacyComponents/Sources/TGPhotoMaskPosition.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintActionsView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintActionsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintActionsView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintActionsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintActionsView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintActionsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintActionsView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintActionsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintColorPicker.h b/submodules/LegacyComponents/Sources/TGPhotoPaintColorPicker.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintColorPicker.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintColorPicker.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintColorPicker.m b/submodules/LegacyComponents/Sources/TGPhotoPaintColorPicker.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintColorPicker.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintColorPicker.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.h b/submodules/LegacyComponents/Sources/TGPhotoPaintController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m b/submodules/LegacyComponents/Sources/TGPhotoPaintController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintController.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntity.m b/submodules/LegacyComponents/Sources/TGPhotoPaintEntity.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntity.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintEntity.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntityView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintEntityView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintEntityView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintEntityView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintFont.h b/submodules/LegacyComponents/Sources/TGPhotoPaintFont.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintFont.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintFont.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintFont.m b/submodules/LegacyComponents/Sources/TGPhotoPaintFont.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintFont.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintFont.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintScrollView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintScrollView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintScrollView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintScrollView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintScrollView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintScrollView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintScrollView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintScrollView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSelectionContainerView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintSelectionContainerView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSelectionContainerView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSelectionContainerView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSelectionContainerView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintSelectionContainerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSelectionContainerView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSelectionContainerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintSettingsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSettingsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintSettingsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSettingsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsWrapperView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintSettingsWrapperView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsWrapperView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSettingsWrapperView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsWrapperView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintSettingsWrapperView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSettingsWrapperView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSettingsWrapperView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSparseView.h b/submodules/LegacyComponents/Sources/TGPhotoPaintSparseView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSparseView.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSparseView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSparseView.m b/submodules/LegacyComponents/Sources/TGPhotoPaintSparseView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintSparseView.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintSparseView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintStickerEntity.m b/submodules/LegacyComponents/Sources/TGPhotoPaintStickerEntity.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintStickerEntity.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintStickerEntity.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintTextEntity.h b/submodules/LegacyComponents/Sources/TGPhotoPaintTextEntity.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintTextEntity.h
rename to submodules/LegacyComponents/Sources/TGPhotoPaintTextEntity.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoPaintTextEntity.m b/submodules/LegacyComponents/Sources/TGPhotoPaintTextEntity.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoPaintTextEntity.m
rename to submodules/LegacyComponents/Sources/TGPhotoPaintTextEntity.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoQualityController.h b/submodules/LegacyComponents/Sources/TGPhotoQualityController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoQualityController.h
rename to submodules/LegacyComponents/Sources/TGPhotoQualityController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoQualityController.m b/submodules/LegacyComponents/Sources/TGPhotoQualityController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoQualityController.m
rename to submodules/LegacyComponents/Sources/TGPhotoQualityController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickerEntityView.h b/submodules/LegacyComponents/Sources/TGPhotoStickerEntityView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickerEntityView.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickerEntityView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickerEntityView.m b/submodules/LegacyComponents/Sources/TGPhotoStickerEntityView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickerEntityView.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickerEntityView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionLayout.h b/submodules/LegacyComponents/Sources/TGPhotoStickersCollectionLayout.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionLayout.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickersCollectionLayout.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionLayout.m b/submodules/LegacyComponents/Sources/TGPhotoStickersCollectionLayout.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionLayout.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickersCollectionLayout.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionView.h b/submodules/LegacyComponents/Sources/TGPhotoStickersCollectionView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionView.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickersCollectionView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionView.m b/submodules/LegacyComponents/Sources/TGPhotoStickersCollectionView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersCollectionView.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickersCollectionView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeader.h b/submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeader.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeader.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeader.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeader.m b/submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeader.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeader.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeader.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeaderView.h b/submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeaderView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeaderView.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeaderView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeaderView.m b/submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeaderView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersSectionHeaderView.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickersSectionHeaderView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersView.h b/submodules/LegacyComponents/Sources/TGPhotoStickersView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersView.h
rename to submodules/LegacyComponents/Sources/TGPhotoStickersView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoStickersView.m b/submodules/LegacyComponents/Sources/TGPhotoStickersView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoStickersView.m
rename to submodules/LegacyComponents/Sources/TGPhotoStickersView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoTextEntityView.h b/submodules/LegacyComponents/Sources/TGPhotoTextEntityView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoTextEntityView.h
rename to submodules/LegacyComponents/Sources/TGPhotoTextEntityView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoTextEntityView.m b/submodules/LegacyComponents/Sources/TGPhotoTextEntityView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoTextEntityView.m
rename to submodules/LegacyComponents/Sources/TGPhotoTextEntityView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoTextSettingsView.h b/submodules/LegacyComponents/Sources/TGPhotoTextSettingsView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoTextSettingsView.h
rename to submodules/LegacyComponents/Sources/TGPhotoTextSettingsView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoTextSettingsView.m b/submodules/LegacyComponents/Sources/TGPhotoTextSettingsView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoTextSettingsView.m
rename to submodules/LegacyComponents/Sources/TGPhotoTextSettingsView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolCell.h b/submodules/LegacyComponents/Sources/TGPhotoToolCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolCell.h
rename to submodules/LegacyComponents/Sources/TGPhotoToolCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolCell.m b/submodules/LegacyComponents/Sources/TGPhotoToolCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolCell.m
rename to submodules/LegacyComponents/Sources/TGPhotoToolCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolbarView.m b/submodules/LegacyComponents/Sources/TGPhotoToolbarView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolbarView.m
rename to submodules/LegacyComponents/Sources/TGPhotoToolbarView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolsController.h b/submodules/LegacyComponents/Sources/TGPhotoToolsController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolsController.h
rename to submodules/LegacyComponents/Sources/TGPhotoToolsController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoToolsController.m b/submodules/LegacyComponents/Sources/TGPhotoToolsController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoToolsController.m
rename to submodules/LegacyComponents/Sources/TGPhotoToolsController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m b/submodules/LegacyComponents/Sources/TGPhotoVideoEditor.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPhotoVideoEditor.m
rename to submodules/LegacyComponents/Sources/TGPhotoVideoEditor.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGPluralization.m b/submodules/LegacyComponents/Sources/TGPluralization.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGPluralization.m
rename to submodules/LegacyComponents/Sources/TGPluralization.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProgressSpinnerView.m b/submodules/LegacyComponents/Sources/TGProgressSpinnerView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProgressSpinnerView.m
rename to submodules/LegacyComponents/Sources/TGProgressSpinnerView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProgressWindow.m b/submodules/LegacyComponents/Sources/TGProgressWindow.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProgressWindow.m
rename to submodules/LegacyComponents/Sources/TGProgressWindow.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGProxyWindow.m b/submodules/LegacyComponents/Sources/TGProxyWindow.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGProxyWindow.m
rename to submodules/LegacyComponents/Sources/TGProxyWindow.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.m b/submodules/LegacyComponents/Sources/TGRTLScreenEdgePanGestureRecognizer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGRTLScreenEdgePanGestureRecognizer.m
rename to submodules/LegacyComponents/Sources/TGRTLScreenEdgePanGestureRecognizer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGRemoteImageView.m b/submodules/LegacyComponents/Sources/TGRemoteImageView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGRemoteImageView.m
rename to submodules/LegacyComponents/Sources/TGRemoteImageView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGReplyMarkupAttachment.m b/submodules/LegacyComponents/Sources/TGReplyMarkupAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGReplyMarkupAttachment.m
rename to submodules/LegacyComponents/Sources/TGReplyMarkupAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGReplyMessageMediaAttachment.m b/submodules/LegacyComponents/Sources/TGReplyMessageMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGReplyMessageMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGReplyMessageMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSearchBar.m b/submodules/LegacyComponents/Sources/TGSearchBar.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSearchBar.m
rename to submodules/LegacyComponents/Sources/TGSearchBar.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSearchDisplayMixin.m b/submodules/LegacyComponents/Sources/TGSearchDisplayMixin.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSearchDisplayMixin.m
rename to submodules/LegacyComponents/Sources/TGSearchDisplayMixin.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m b/submodules/LegacyComponents/Sources/TGSecretTimerMenu.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerMenu.m
rename to submodules/LegacyComponents/Sources/TGSecretTimerMenu.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerPickerItemView.h b/submodules/LegacyComponents/Sources/TGSecretTimerPickerItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerPickerItemView.h
rename to submodules/LegacyComponents/Sources/TGSecretTimerPickerItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerPickerItemView.m b/submodules/LegacyComponents/Sources/TGSecretTimerPickerItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerPickerItemView.m
rename to submodules/LegacyComponents/Sources/TGSecretTimerPickerItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueController.h b/submodules/LegacyComponents/Sources/TGSecretTimerValueController.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueController.h
rename to submodules/LegacyComponents/Sources/TGSecretTimerValueController.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueController.m b/submodules/LegacyComponents/Sources/TGSecretTimerValueController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueController.m
rename to submodules/LegacyComponents/Sources/TGSecretTimerValueController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueControllerItemView.h b/submodules/LegacyComponents/Sources/TGSecretTimerValueControllerItemView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueControllerItemView.h
rename to submodules/LegacyComponents/Sources/TGSecretTimerValueControllerItemView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueControllerItemView.m b/submodules/LegacyComponents/Sources/TGSecretTimerValueControllerItemView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSecretTimerValueControllerItemView.m
rename to submodules/LegacyComponents/Sources/TGSecretTimerValueControllerItemView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStaticBackdropAreaData.m b/submodules/LegacyComponents/Sources/TGStaticBackdropAreaData.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStaticBackdropAreaData.m
rename to submodules/LegacyComponents/Sources/TGStaticBackdropAreaData.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStaticBackdropImageData.m b/submodules/LegacyComponents/Sources/TGStaticBackdropImageData.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStaticBackdropImageData.m
rename to submodules/LegacyComponents/Sources/TGStaticBackdropImageData.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerAssociation.m b/submodules/LegacyComponents/Sources/TGStickerAssociation.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerAssociation.m
rename to submodules/LegacyComponents/Sources/TGStickerAssociation.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerCollectionViewCell.h b/submodules/LegacyComponents/Sources/TGStickerCollectionViewCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerCollectionViewCell.h
rename to submodules/LegacyComponents/Sources/TGStickerCollectionViewCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerCollectionViewCell.m b/submodules/LegacyComponents/Sources/TGStickerCollectionViewCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerCollectionViewCell.m
rename to submodules/LegacyComponents/Sources/TGStickerCollectionViewCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerItemPreviewView.h b/submodules/LegacyComponents/Sources/TGStickerItemPreviewView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerItemPreviewView.h
rename to submodules/LegacyComponents/Sources/TGStickerItemPreviewView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerItemPreviewView.m b/submodules/LegacyComponents/Sources/TGStickerItemPreviewView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerItemPreviewView.m
rename to submodules/LegacyComponents/Sources/TGStickerItemPreviewView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabCell.h b/submodules/LegacyComponents/Sources/TGStickerKeyboardTabCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabCell.h
rename to submodules/LegacyComponents/Sources/TGStickerKeyboardTabCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabCell.m b/submodules/LegacyComponents/Sources/TGStickerKeyboardTabCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabCell.m
rename to submodules/LegacyComponents/Sources/TGStickerKeyboardTabCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabPanel.m b/submodules/LegacyComponents/Sources/TGStickerKeyboardTabPanel.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabPanel.m
rename to submodules/LegacyComponents/Sources/TGStickerKeyboardTabPanel.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabSettingsCell.h b/submodules/LegacyComponents/Sources/TGStickerKeyboardTabSettingsCell.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabSettingsCell.h
rename to submodules/LegacyComponents/Sources/TGStickerKeyboardTabSettingsCell.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabSettingsCell.m b/submodules/LegacyComponents/Sources/TGStickerKeyboardTabSettingsCell.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerKeyboardTabSettingsCell.m
rename to submodules/LegacyComponents/Sources/TGStickerKeyboardTabSettingsCell.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerPack.m b/submodules/LegacyComponents/Sources/TGStickerPack.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerPack.m
rename to submodules/LegacyComponents/Sources/TGStickerPack.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStickerPackReference.m b/submodules/LegacyComponents/Sources/TGStickerPackReference.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStickerPackReference.m
rename to submodules/LegacyComponents/Sources/TGStickerPackReference.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGStringUtils.mm b/submodules/LegacyComponents/Sources/TGStringUtils.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGStringUtils.mm
rename to submodules/LegacyComponents/Sources/TGStringUtils.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGSuggestionContext.m b/submodules/LegacyComponents/Sources/TGSuggestionContext.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGSuggestionContext.m
rename to submodules/LegacyComponents/Sources/TGSuggestionContext.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTextCheckingResult.m b/submodules/LegacyComponents/Sources/TGTextCheckingResult.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTextCheckingResult.m
rename to submodules/LegacyComponents/Sources/TGTextCheckingResult.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTextField.m b/submodules/LegacyComponents/Sources/TGTextField.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTextField.m
rename to submodules/LegacyComponents/Sources/TGTextField.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTimerTarget.m b/submodules/LegacyComponents/Sources/TGTimerTarget.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTimerTarget.m
rename to submodules/LegacyComponents/Sources/TGTimerTarget.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGToolbarButton.m b/submodules/LegacyComponents/Sources/TGToolbarButton.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGToolbarButton.m
rename to submodules/LegacyComponents/Sources/TGToolbarButton.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTooltipView.m b/submodules/LegacyComponents/Sources/TGTooltipView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTooltipView.m
rename to submodules/LegacyComponents/Sources/TGTooltipView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTransitionLayout.h b/submodules/LegacyComponents/Sources/TGTransitionLayout.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTransitionLayout.h
rename to submodules/LegacyComponents/Sources/TGTransitionLayout.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGTransitionLayout.m b/submodules/LegacyComponents/Sources/TGTransitionLayout.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGTransitionLayout.m
rename to submodules/LegacyComponents/Sources/TGTransitionLayout.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGUnsupportedMediaAttachment.m b/submodules/LegacyComponents/Sources/TGUnsupportedMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGUnsupportedMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGUnsupportedMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGUser.m b/submodules/LegacyComponents/Sources/TGUser.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGUser.m
rename to submodules/LegacyComponents/Sources/TGUser.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViaUserAttachment.m b/submodules/LegacyComponents/Sources/TGViaUserAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViaUserAttachment.m
rename to submodules/LegacyComponents/Sources/TGViaUserAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLRenderer.m b/submodules/LegacyComponents/Sources/TGVideoCameraGLRenderer.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLRenderer.m
rename to submodules/LegacyComponents/Sources/TGVideoCameraGLRenderer.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLView.m b/submodules/LegacyComponents/Sources/TGVideoCameraGLView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraGLView.m
rename to submodules/LegacyComponents/Sources/TGVideoCameraGLView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraMovieRecorder.m b/submodules/LegacyComponents/Sources/TGVideoCameraMovieRecorder.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraMovieRecorder.m
rename to submodules/LegacyComponents/Sources/TGVideoCameraMovieRecorder.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.h b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.h
rename to submodules/LegacyComponents/Sources/TGVideoCameraPipeline.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m b/submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoCameraPipeline.m
rename to submodules/LegacyComponents/Sources/TGVideoCameraPipeline.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoEditAdjustments.m b/submodules/LegacyComponents/Sources/TGVideoEditAdjustments.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoEditAdjustments.m
rename to submodules/LegacyComponents/Sources/TGVideoEditAdjustments.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoInfo.mm b/submodules/LegacyComponents/Sources/TGVideoInfo.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoInfo.mm
rename to submodules/LegacyComponents/Sources/TGVideoInfo.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMediaAttachment.m b/submodules/LegacyComponents/Sources/TGVideoMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGVideoMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageCaptureController.m b/submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageCaptureController.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageCaptureController.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageControls.m b/submodules/LegacyComponents/Sources/TGVideoMessageControls.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageControls.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageControls.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageRingView.m b/submodules/LegacyComponents/Sources/TGVideoMessageRingView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageRingView.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageRingView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m b/submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubber.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageScrubber.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubberThumbnailView.h b/submodules/LegacyComponents/Sources/TGVideoMessageScrubberThumbnailView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubberThumbnailView.h
rename to submodules/LegacyComponents/Sources/TGVideoMessageScrubberThumbnailView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubberThumbnailView.m b/submodules/LegacyComponents/Sources/TGVideoMessageScrubberThumbnailView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageScrubberThumbnailView.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageScrubberThumbnailView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageTrimView.h b/submodules/LegacyComponents/Sources/TGVideoMessageTrimView.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageTrimView.h
rename to submodules/LegacyComponents/Sources/TGVideoMessageTrimView.h
diff --git a/submodules/LegacyComponents/LegacyComponents/TGVideoMessageTrimView.m b/submodules/LegacyComponents/Sources/TGVideoMessageTrimView.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGVideoMessageTrimView.m
rename to submodules/LegacyComponents/Sources/TGVideoMessageTrimView.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViewController+TGRecursiveEnumeration.m b/submodules/LegacyComponents/Sources/TGViewController+TGRecursiveEnumeration.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViewController+TGRecursiveEnumeration.m
rename to submodules/LegacyComponents/Sources/TGViewController+TGRecursiveEnumeration.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGViewController.mm b/submodules/LegacyComponents/Sources/TGViewController.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGViewController.mm
rename to submodules/LegacyComponents/Sources/TGViewController.mm
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWeakDelegate.m b/submodules/LegacyComponents/Sources/TGWeakDelegate.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWeakDelegate.m
rename to submodules/LegacyComponents/Sources/TGWeakDelegate.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWebDocument.m b/submodules/LegacyComponents/Sources/TGWebDocument.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWebDocument.m
rename to submodules/LegacyComponents/Sources/TGWebDocument.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TGWebPageMediaAttachment.m b/submodules/LegacyComponents/Sources/TGWebPageMediaAttachment.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TGWebPageMediaAttachment.m
rename to submodules/LegacyComponents/Sources/TGWebPageMediaAttachment.m
diff --git a/submodules/LegacyComponents/LegacyComponents/TransformationMatrix.cpp b/submodules/LegacyComponents/Sources/TransformationMatrix.cpp
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TransformationMatrix.cpp
rename to submodules/LegacyComponents/Sources/TransformationMatrix.cpp
diff --git a/submodules/LegacyComponents/LegacyComponents/TransformationMatrix.h b/submodules/LegacyComponents/Sources/TransformationMatrix.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/TransformationMatrix.h
rename to submodules/LegacyComponents/Sources/TransformationMatrix.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UICollectionView+TGTransitioning.h b/submodules/LegacyComponents/Sources/UICollectionView+TGTransitioning.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UICollectionView+TGTransitioning.h
rename to submodules/LegacyComponents/Sources/UICollectionView+TGTransitioning.h
diff --git a/submodules/LegacyComponents/LegacyComponents/UICollectionView+TGTransitioning.m b/submodules/LegacyComponents/Sources/UICollectionView+TGTransitioning.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UICollectionView+TGTransitioning.m
rename to submodules/LegacyComponents/Sources/UICollectionView+TGTransitioning.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UICollectionView+Utils.m b/submodules/LegacyComponents/Sources/UICollectionView+Utils.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UICollectionView+Utils.m
rename to submodules/LegacyComponents/Sources/UICollectionView+Utils.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UIControl+HitTestEdgeInsets.m b/submodules/LegacyComponents/Sources/UIControl+HitTestEdgeInsets.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIControl+HitTestEdgeInsets.m
rename to submodules/LegacyComponents/Sources/UIControl+HitTestEdgeInsets.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UIDevice+PlatformInfo.m b/submodules/LegacyComponents/Sources/UIDevice+PlatformInfo.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIDevice+PlatformInfo.m
rename to submodules/LegacyComponents/Sources/UIDevice+PlatformInfo.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UIImage+TG.m b/submodules/LegacyComponents/Sources/UIImage+TG.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIImage+TG.m
rename to submodules/LegacyComponents/Sources/UIImage+TG.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UIImage+TGMediaEditableItem.m b/submodules/LegacyComponents/Sources/UIImage+TGMediaEditableItem.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIImage+TGMediaEditableItem.m
rename to submodules/LegacyComponents/Sources/UIImage+TGMediaEditableItem.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UIScrollView+TGHacks.m b/submodules/LegacyComponents/Sources/UIScrollView+TGHacks.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UIScrollView+TGHacks.m
rename to submodules/LegacyComponents/Sources/UIScrollView+TGHacks.m
diff --git a/submodules/LegacyComponents/LegacyComponents/UnitBezier.h b/submodules/LegacyComponents/Sources/UnitBezier.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/UnitBezier.h
rename to submodules/LegacyComponents/Sources/UnitBezier.h
diff --git a/submodules/LegacyComponents/LegacyComponents/fast-edge.cpp b/submodules/LegacyComponents/Sources/fast-edge.cpp
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/fast-edge.cpp
rename to submodules/LegacyComponents/Sources/fast-edge.cpp
diff --git a/submodules/LegacyComponents/LegacyComponents/fast-edge.h b/submodules/LegacyComponents/Sources/fast-edge.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/fast-edge.h
rename to submodules/LegacyComponents/Sources/fast-edge.h
diff --git a/submodules/LegacyComponents/LegacyComponents/genann.c b/submodules/LegacyComponents/Sources/genann.c
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/genann.c
rename to submodules/LegacyComponents/Sources/genann.c
diff --git a/submodules/LegacyComponents/LegacyComponents/genann.h b/submodules/LegacyComponents/Sources/genann.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/genann.h
rename to submodules/LegacyComponents/Sources/genann.h
diff --git a/submodules/LegacyComponents/LegacyComponents/matrix.h b/submodules/LegacyComponents/Sources/matrix.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/matrix.h
rename to submodules/LegacyComponents/Sources/matrix.h
diff --git a/submodules/LegacyComponents/LegacyComponents/matrix.m b/submodules/LegacyComponents/Sources/matrix.m
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/matrix.m
rename to submodules/LegacyComponents/Sources/matrix.m
diff --git a/submodules/LegacyComponents/LegacyComponents/mdb.c b/submodules/LegacyComponents/Sources/mdb.c
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/mdb.c
rename to submodules/LegacyComponents/Sources/mdb.c
diff --git a/submodules/LegacyComponents/LegacyComponents/midl.c b/submodules/LegacyComponents/Sources/midl.c
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/midl.c
rename to submodules/LegacyComponents/Sources/midl.c
diff --git a/submodules/LegacyComponents/LegacyComponents/midl.h b/submodules/LegacyComponents/Sources/midl.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/midl.h
rename to submodules/LegacyComponents/Sources/midl.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ocr.h b/submodules/LegacyComponents/Sources/ocr.h
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ocr.h
rename to submodules/LegacyComponents/Sources/ocr.h
diff --git a/submodules/LegacyComponents/LegacyComponents/ocr.mm b/submodules/LegacyComponents/Sources/ocr.mm
similarity index 100%
rename from submodules/LegacyComponents/LegacyComponents/ocr.mm
rename to submodules/LegacyComponents/Sources/ocr.mm
diff --git a/submodules/MediaPlayer/BUILD b/submodules/MediaPlayer/BUILD
index eec7946dbb..4b4fe5392c 100644
--- a/submodules/MediaPlayer/BUILD
+++ b/submodules/MediaPlayer/BUILD
@@ -14,7 +14,7 @@ swift_library(
         "//submodules/AsyncDisplayKit:AsyncDisplayKit",
         "//submodules/Display:Display",
         "//submodules/TelegramAudio:TelegramAudio",
-        "//submodules/FFMpeg:FFMpeg",
+        "//submodules/FFMpegBinding:FFMpegBinding",
         "//submodules/RingBuffer:RingBuffer",
     ],
     visibility = [
diff --git a/submodules/MediaPlayer/Sources/FFMpegAudioFrameDecoder.swift b/submodules/MediaPlayer/Sources/FFMpegAudioFrameDecoder.swift
index 9b409f1926..580d15a5c4 100644
--- a/submodules/MediaPlayer/Sources/FFMpegAudioFrameDecoder.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegAudioFrameDecoder.swift
@@ -1,6 +1,6 @@
 import Foundation
 import CoreMedia
-import FFMpeg
+import FFMpegBinding
 
 final class FFMpegAudioFrameDecoder: MediaTrackFrameDecoder {
     private let codecContext: FFMpegAVCodecContext
diff --git a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContext.swift b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContext.swift
index 23cc63a345..a9e6e2ecaa 100644
--- a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContext.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContext.swift
@@ -4,7 +4,7 @@ import Postbox
 import CoreMedia
 import TelegramCore
 import SyncCore
-import FFMpeg
+import FFMpegBinding
 
 private struct StreamContext {
     let index: Int
diff --git a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContextHelpers.swift b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContextHelpers.swift
index 5252375acd..d6b005d92f 100644
--- a/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContextHelpers.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegMediaFrameSourceContextHelpers.swift
@@ -1,6 +1,6 @@
 import Foundation
 import CoreMedia
-import FFMpeg
+import FFMpegBinding
 
 public final class FFMpegMediaFrameSourceContextHelpers {
     public static let registerFFMpegGlobals: Void = {
diff --git a/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift b/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
index d77320d18a..1c87095692 100644
--- a/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
+++ b/submodules/MediaPlayer/Sources/FFMpegMediaVideoFrameDecoder.swift
@@ -1,7 +1,6 @@
 import CoreMedia
 import Accelerate
-import FFMpeg
-import Accelerate
+import FFMpegBinding
 
 private let bufferCount = 32
 
diff --git a/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift b/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
index 9bc5edcaa8..813d56a9b9 100644
--- a/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
+++ b/submodules/MediaPlayer/Sources/MediaPlayerFramePreview.swift
@@ -3,7 +3,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-import FFMpeg
+import FFMpegBinding
 
 private final class FramePreviewContext {
     let source: UniversalSoftwareVideoSource
diff --git a/submodules/MediaPlayer/Sources/MediaTrackDecodableFrame.swift b/submodules/MediaPlayer/Sources/MediaTrackDecodableFrame.swift
index 846c71bdb5..692e8f6484 100644
--- a/submodules/MediaPlayer/Sources/MediaTrackDecodableFrame.swift
+++ b/submodules/MediaPlayer/Sources/MediaTrackDecodableFrame.swift
@@ -1,6 +1,6 @@
 import Foundation
 import CoreMedia
-import FFMpeg
+import FFMpegBinding
 
 public enum MediaTrackFrameType {
     case video
diff --git a/submodules/MediaPlayer/Sources/RingByteBuffer.swift b/submodules/MediaPlayer/Sources/RingByteBuffer.swift
index 8ce25943d3..7093ce6878 100644
--- a/submodules/MediaPlayer/Sources/RingByteBuffer.swift
+++ b/submodules/MediaPlayer/Sources/RingByteBuffer.swift
@@ -1,5 +1,6 @@
 import Foundation
 import Darwin
+import RingBuffer
 
 public final class RingByteBuffer {
     public let size: Int
diff --git a/submodules/MediaPlayer/Sources/SoftwareVideoSource.swift b/submodules/MediaPlayer/Sources/SoftwareVideoSource.swift
index 25fb2ad9b0..94e1ffcfbf 100644
--- a/submodules/MediaPlayer/Sources/SoftwareVideoSource.swift
+++ b/submodules/MediaPlayer/Sources/SoftwareVideoSource.swift
@@ -2,7 +2,7 @@ import Foundation
 import UIKit
 import CoreMedia
 import SwiftSignalKit
-import FFMpeg
+import FFMpegBinding
 
 private func readPacketCallback(userData: UnsafeMutableRawPointer?, buffer: UnsafeMutablePointer<UInt8>?, bufferSize: Int32) -> Int32 {
     let context = Unmanaged<SoftwareVideoSource>.fromOpaque(userData!).takeUnretainedValue()
diff --git a/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift b/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
index 3d796ac046..f5e29c6572 100644
--- a/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
+++ b/submodules/MediaPlayer/Sources/UniversalSoftwareVideoSource.swift
@@ -3,7 +3,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-import FFMpeg
+import FFMpegBinding
 
 private func readPacketCallback(userData: UnsafeMutableRawPointer?, buffer: UnsafeMutablePointer<UInt8>?, bufferSize: Int32) -> Int32 {
     let context = Unmanaged<UniversalSoftwareVideoSourceImpl>.fromOpaque(userData!).takeUnretainedValue()
diff --git a/submodules/Opus/BUILD b/submodules/Opus/BUILD
new file mode 100644
index 0000000000..b3455dc804
--- /dev/null
+++ b/submodules/Opus/BUILD
@@ -0,0 +1,25 @@
+
+cc_library(
+    name = "opus_lib",
+    srcs = [
+        "Sources/opus/lib/libopus.a",
+    ],
+)
+
+objc_library(
+    name = "opus",
+    module_name = "opus",
+    enable_modules = True,
+    hdrs = glob([
+        "Public/**/*.h",
+    ]),
+    includes = [
+        "Public",
+    ],
+    deps = [
+        ":opus_lib",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/submodules/Opus/Info.plist b/submodules/Opus/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/Opus/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-</dict>
-</plist>
diff --git a/submodules/Opus/Sources/opus/opus.h b/submodules/Opus/Public/opus/opus.h
similarity index 100%
rename from submodules/Opus/Sources/opus/opus.h
rename to submodules/Opus/Public/opus/opus.h
diff --git a/submodules/Opus/Sources/opus_defines.h b/submodules/Opus/Public/opus/opus_defines.h
similarity index 100%
rename from submodules/Opus/Sources/opus_defines.h
rename to submodules/Opus/Public/opus/opus_defines.h
diff --git a/submodules/Opus/Sources/opus_multistream.h b/submodules/Opus/Public/opus/opus_multistream.h
similarity index 100%
rename from submodules/Opus/Sources/opus_multistream.h
rename to submodules/Opus/Public/opus/opus_multistream.h
diff --git a/submodules/Opus/Sources/opus_projection.h b/submodules/Opus/Public/opus/opus_projection.h
similarity index 100%
rename from submodules/Opus/Sources/opus_projection.h
rename to submodules/Opus/Public/opus/opus_projection.h
diff --git a/submodules/Opus/Sources/opus_types.h b/submodules/Opus/Public/opus/opus_types.h
similarity index 100%
rename from submodules/Opus/Sources/opus_types.h
rename to submodules/Opus/Public/opus/opus_types.h
diff --git a/submodules/OpusBinding/Info.plist b/submodules/OpusBinding/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/OpusBinding/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-</dict>
-</plist>
diff --git a/submodules/PhotoResources/BUILD b/submodules/PhotoResources/BUILD
index 5c34dc4950..6d3e633ed1 100644
--- a/submodules/PhotoResources/BUILD
+++ b/submodules/PhotoResources/BUILD
@@ -19,7 +19,7 @@ swift_library(
         "//submodules/AccountContext:AccountContext",
         "//submodules/MediaResources:MediaResources",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        "//submodules/WebP:WebPImage",
+        "//submodules/WebPBinding:WebPBinding",
         "//submodules/AppBundle:AppBundle",
     ],
     visibility = [
diff --git a/submodules/PhotoResources/Sources/PhotoResources.swift b/submodules/PhotoResources/Sources/PhotoResources.swift
index 5aa2304795..5a04a76fb2 100644
--- a/submodules/PhotoResources/Sources/PhotoResources.swift
+++ b/submodules/PhotoResources/Sources/PhotoResources.swift
@@ -7,16 +7,13 @@ import AVFoundation
 import ImageIO
 import TelegramCore
 import SyncCore
-#if BUCK
-import WebPImage
-#else
-import WebP
-#endif
+import WebPBinding
 import TelegramUIPreferences
 import MediaResources
 import AccountContext
 import Tuples
 import ImageBlur
+import FastBlur
 import TinyThumbnail
 import ImageTransparency
 import AppBundle
diff --git a/submodules/RingBuffer/BUILD b/submodules/RingBuffer/BUILD
index 85f82cd801..f9ad619740 100644
--- a/submodules/RingBuffer/BUILD
+++ b/submodules/RingBuffer/BUILD
@@ -1,8 +1,8 @@
 
 objc_library(
-    name = "Crc32",
+    name = "RingBuffer",
     enable_modules = True,
-    module_name = "Crc32",
+    module_name = "RingBuffer",
     srcs = glob([
         "Sources/*.m",
     ]),
diff --git a/submodules/StickerResources/BUILD b/submodules/StickerResources/BUILD
index ab46f0e461..fbc63bf800 100644
--- a/submodules/StickerResources/BUILD
+++ b/submodules/StickerResources/BUILD
@@ -7,16 +7,16 @@ swift_library(
 		"Sources/**/*.swift",
     ]),
     deps = [
-        "//submodules/TelegramCore:TelegramCore#shared",
-        "//submodules/SyncCore:SyncCore#shared",
-        "//submodules/Postbox:Postbox#shared",
-        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
-        "//submodules/Display:Display#shared",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/Postbox:Postbox",
+        "//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Display:Display",
         "//submodules/ImageBlur:ImageBlur",
         "//submodules/Tuples:Tuples",
         "//submodules/MediaResources:MediaResources",
         "//submodules/TelegramUIPreferences:TelegramUIPreferences",
-        "//submodules/WebP:WebPImage",
+        "//submodules/WebPBinding:WebPBinding",
     ],
     visibility = [
         "//visibility:public",
diff --git a/submodules/StickerResources/Sources/StickerResources.swift b/submodules/StickerResources/Sources/StickerResources.swift
index c2ec30423f..4543cc95d2 100644
--- a/submodules/StickerResources/Sources/StickerResources.swift
+++ b/submodules/StickerResources/Sources/StickerResources.swift
@@ -8,6 +8,7 @@ import SyncCore
 import MediaResources
 import Tuples
 import ImageBlur
+import FastBlur
 
 private func imageFromAJpeg(data: Data) -> (UIImage, UIImage)? {
     if let (colorData, alphaData) = data.withUnsafeBytes({ bytes -> (Data, Data)? in
diff --git a/submodules/TelegramAnimatedStickerNode/BUILD b/submodules/TelegramAnimatedStickerNode/BUILD
index 4edd05a482..0049c24af9 100644
--- a/submodules/TelegramAnimatedStickerNode/BUILD
+++ b/submodules/TelegramAnimatedStickerNode/BUILD
@@ -7,9 +7,9 @@ swift_library(
         "Sources/**/*.swift",
     ]),
     deps = [
-    	"//submodules/Postbox:Postbox#shared",
-        "//submodules/TelegramCore:TelegramCore#shared",
-        "//submodules/SyncCore:SyncCore#shared",
+    	"//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
         "//submodules/StickerResources:StickerResources",
         "//submodules/MediaResources:MediaResources",
         "//submodules/Tuples:Tuples",
diff --git a/submodules/TelegramBaseController/BUILD b/submodules/TelegramBaseController/BUILD
index 721a98252b..db407be8c9 100644
--- a/submodules/TelegramBaseController/BUILD
+++ b/submodules/TelegramBaseController/BUILD
@@ -7,12 +7,12 @@ swift_library(
         "Sources/**/*.swift",
     ]),
     deps = [
-    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit#shared",
-        "//submodules/Postbox:Postbox#shared",
-        "//submodules/TelegramCore:TelegramCore#shared",
-        "//submodules/SyncCore:SyncCore#shared",
-        "//submodules/AsyncDisplayKit:AsyncDisplayKit#shared",
-        "//submodules/Display:Display#shared",
+    	"//submodules/SSignalKit/SwiftSignalKit:SwiftSignalKit",
+        "//submodules/Postbox:Postbox",
+        "//submodules/TelegramCore:TelegramCore",
+        "//submodules/SyncCore:SyncCore",
+        "//submodules/AsyncDisplayKit:AsyncDisplayKit",
+        "//submodules/Display:Display",
         "//submodules/AvatarNode:AvatarNode",
         "//submodules/TelegramStringFormatting:TelegramStringFormatting",
         "//submodules/LiveLocationTimerNode:LiveLocationTimerNode",
diff --git a/submodules/TelegramPresentationData/Sources/PresentationData.swift b/submodules/TelegramPresentationData/Sources/PresentationData.swift
index f33079da79..b2ad1bd588 100644
--- a/submodules/TelegramPresentationData/Sources/PresentationData.swift
+++ b/submodules/TelegramPresentationData/Sources/PresentationData.swift
@@ -9,6 +9,7 @@ import AddressBook
 import Display
 import TelegramUIPreferences
 import AppBundle
+import Sunrise
 
 public struct PresentationDateTimeFormat: Equatable {
     public let timeFormat: PresentationTimeFormat
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourceKey.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesCallList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesCallList.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesCallList.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesChat.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesChatList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesChatList.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChatList.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesItemList.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesItemList.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesItemList.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesRootController.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesRootController.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesRootController.swift
diff --git a/submodules/TelegramPresentationData/Resources/PresentationResourcesSettings.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift
similarity index 100%
rename from submodules/TelegramPresentationData/Resources/PresentationResourcesSettings.swift
rename to submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesSettings.swift
diff --git a/submodules/TelegramUI/Sources/FetchVideoMediaResource.swift b/submodules/TelegramUI/Sources/FetchVideoMediaResource.swift
index b45263840c..808a58eaf0 100644
--- a/submodules/TelegramUI/Sources/FetchVideoMediaResource.swift
+++ b/submodules/TelegramUI/Sources/FetchVideoMediaResource.swift
@@ -5,7 +5,7 @@ import SwiftSignalKit
 import TelegramCore
 import SyncCore
 import LegacyComponents
-import FFMpeg
+import FFMpegBinding
 import LocalMediaResources
 
 private final class AVURLAssetCopyItem: MediaResourceDataFetchCopyLocalItem {
diff --git a/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift b/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
index 6205787284..2015895dab 100644
--- a/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
+++ b/submodules/TelegramUI/Sources/TimeBasedVideoPreload.swift
@@ -4,7 +4,7 @@ import SwiftSignalKit
 import Postbox
 import TelegramCore
 import SyncCore
-import FFMpeg
+import FFMpegBinding
 import UniversalMediaPlayer
 
 func preloadVideoResource(postbox: Postbox, resourceReference: MediaResourceReference, duration: Double) -> Signal<Never, NoError> {
diff --git a/submodules/WebPBinding/BUILD b/submodules/WebPBinding/BUILD
new file mode 100644
index 0000000000..892bb6cf46
--- /dev/null
+++ b/submodules/WebPBinding/BUILD
@@ -0,0 +1,26 @@
+
+objc_library(
+    name = "WebPBinding",
+    enable_modules = True,
+    module_name = "WebPBinding",
+    srcs = glob([
+        "Sources/**/*.m",
+        "Sources/**/*.h",
+    ]),
+    hdrs = glob([
+        "PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "PublicHeaders",
+    ],
+    deps = [
+        "//submodules/webp:webp",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/webp/WebP/UIImage+WebP.h b/submodules/WebPBinding/PublicHeaders/WebPBinding/UIImage+WebP.h
similarity index 100%
rename from submodules/webp/WebP/UIImage+WebP.h
rename to submodules/WebPBinding/PublicHeaders/WebPBinding/UIImage+WebP.h
diff --git a/submodules/WebPBinding/PublicHeaders/WebPBinding/WebPBinding.h b/submodules/WebPBinding/PublicHeaders/WebPBinding/WebPBinding.h
new file mode 100644
index 0000000000..eb36e579cb
--- /dev/null
+++ b/submodules/WebPBinding/PublicHeaders/WebPBinding/WebPBinding.h
@@ -0,0 +1,3 @@
+#import <UIKit/UIKit.h>
+
+#import <WebPBinding/UIImage+WebP.h>
diff --git a/submodules/webp/WebP/UIImage+WebP.m b/submodules/WebPBinding/Sources/UIImage+WebP.m
similarity index 99%
rename from submodules/webp/WebP/UIImage+WebP.m
rename to submodules/WebPBinding/Sources/UIImage+WebP.m
index 8fd9d53e84..19f4c6037d 100644
--- a/submodules/webp/WebP/UIImage+WebP.m
+++ b/submodules/WebPBinding/Sources/UIImage+WebP.m
@@ -1,4 +1,4 @@
-#import "UIImage+WebP.h"
+#import <WebPBinding/UIImage+WebP.h>
 
 #import "webp/encode.h"
 #import "webp/decode.h"
diff --git a/submodules/ffmpeg/BUILD b/submodules/ffmpeg/BUILD
index 7d3afd018c..c7524d20d3 100644
--- a/submodules/ffmpeg/BUILD
+++ b/submodules/ffmpeg/BUILD
@@ -111,11 +111,13 @@ ffmpeg_libs = [
     "libswresample.a",
 ]
 
+source_files = glob([
+    "Sources/**/*",
+], exclude = ["Sources/**/.*"])
+
 filegroup(
     name = "FFMpegSources",
-    srcs = glob([
-        "Sources/**/*",
-    ], exclude = ["Sources/**/.*"]),
+    srcs = source_files,
 )
 
 genrule(
@@ -123,11 +125,17 @@ genrule(
     srcs = [
         ":FFMpegSources",
     ],
-    cmd_bash = """
+    cmd_bash =
+    """
+        SOURCE_PATH="submodules/ffmpeg/Sources/FFMpeg"
+
         BUILD_DIR="$(RULEDIR)/build"
-        #rm -rf "$$BUILD_DIR"
+        rm -rf "$$BUILD_DIR"
         mkdir -p "$$BUILD_DIR"
         YASM_DIR="$$BUILD_DIR/yasm"
+        rm -rf "$$YASM_DIR"
+        mkdir -p "$$YASM_DIR"
+        tar -xf "$(location //third-party/yasm:yasm.tar)" -C "$$YASM_DIR"
 
         if [ "$(TARGET_CPU)" == "ios_armv7" ]; then
             BUILD_ARCH="armv7"
@@ -139,9 +147,15 @@ genrule(
             echo "Unsupported architecture $(TARGET_CPU)"
         fi
 
-        PATH="$$PATH:$$YASM_DIR" "$(location :FFMpegSources)/build-ffmpeg.sh" release "$$BUILD_ARCH" "$$BUILD_DIR" "$(location :FFMpegSources)"
-    """,
-    outs = ffmpeg_header_paths + ffmpeg_libs,
+        PATH="$$PATH:$$YASM_DIR" "$$SOURCE_PATH/build-ffmpeg.sh" release "$$BUILD_ARCH" "$$BUILD_DIR" "$$SOURCE_PATH"
+    """ + "\n" + "\n".join([
+        "cp \"$$BUILD_DIR/FFmpeg-iOS/include/{header_path}\" \"$(location Public/ffmpeg/{header_path})\"".format(header_path = header_path) for header_path in ffmpeg_header_paths
+    ]) + "\n" + "\n".join([
+        "cp \"$$BUILD_DIR/FFmpeg-iOS/lib/{lib}\" \"$(location {lib})\"".format(lib = lib) for lib in ffmpeg_libs
+    ]),
+    outs = [
+        "Public/ffmpeg/{}".format(header_path) for header_path in ffmpeg_header_paths
+    ] + ffmpeg_libs,
     tools = [
         "//third-party/yasm:yasm.tar",
     ],
@@ -156,77 +170,23 @@ cc_library(
 )
 
 objc_library(
-    name = "FFMpeg",
-    module_name = "FFMpeg",
+    name = "ffmpeg",
+    module_name = "ffmpeg",
     enable_modules = True,
-    srcs = glob([
-        "FFMpeg/*.m",
-        "FFMpeg/*.h",
-    ]),
-    #hdrs = ["Public/FFMpeg/" + x for x in openssl_headers],
+    hdrs = ["Public/ffmpeg/" + x for x in ffmpeg_header_paths],
     includes = [
-        "Public",
+        "Public/ffmpeg",
+    ],
+    sdk_dylibs = [
+        "libbz2",
+        "libiconv",
+        "z",
     ],
     deps = [
         ":ffmpeg_lib",
+        "//submodules/Opus:opus",
     ],
     visibility = [
         "//visibility:public",
     ]
 )
-
-"""apple_library(
-    name = "libffmpeg",
-    visibility = [
-        "//submodules/ffmpeg:FFMpeg"
-    ],
-    header_namespace = "ffmpeg",
-    exported_headers = ffmpeg_header_targets,
-    linker_flags = [
-        "-L$(location :libffmpeg_build)/FFmpeg-iOS/lib",
-        "-lavutil",
-        "-lavcodec",
-        "-lavformat",
-        "-lswresample",
-        "-lbz2",
-        "-liconv",
-        "-lz",
-    ],
-    exported_linker_flags = [
-        "-L$(location :libffmpeg_build)/FFmpeg-iOS/lib",
-        "-lavutil",
-        "-lavcodec",
-        "-lavformat",
-        "-lswresample",
-        "-lbz2",
-        "-liconv",
-        "-lz",
-    ],
-    deps = [
-        ":libffmpeg_build",
-        "//submodules/Opus:opus",
-    ],
-)
-
-static_library(
-    name = "FFMpeg",
-    srcs = glob([
-        "FFMpeg/*.m",
-    ]),
-    headers = ffmpeg_header_targets,
-    exported_headers = glob([
-        "FFMpeg/*.h",
-    ]),
-    deps = [
-        ":libffmpeg_build",
-        ":libffmpeg",
-        "//submodules/Opus:opus",
-    ],
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-        "$SDKROOT/System/Library/Frameworks/CoreMedia.framework",
-        "$SDKROOT/System/Library/Frameworks/AVFoundation.framework",
-    ],
-)
-"""
\ No newline at end of file
diff --git a/submodules/ffmpeg/Sources/FFMpeg/FFMpeg.h b/submodules/ffmpeg/Sources/FFMpeg/FFMpeg.h
deleted file mode 100644
index f636e140ae..0000000000
--- a/submodules/ffmpeg/Sources/FFMpeg/FFMpeg.h
+++ /dev/null
@@ -1,18 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for FFMpeg.
-FOUNDATION_EXPORT double FFMpegVersionNumber;
-
-//! Project version string for FFMpeg.
-FOUNDATION_EXPORT const unsigned char FFMpegVersionString[];
-
-#import <FFMpeg/FFMpegGlobals.h>
-#import <FFMpeg/FFMpegAVCodecContext.h>
-#import <FFMpeg/FFMpegAVIOContext.h>
-#import <FFMpeg/FFMpegAVFormatContext.h>
-#import <FFMpeg/FFMpegAVSampleFormat.h>
-#import <FFMpeg/FFMpegSWResample.h>
-#import <FFMpeg/FFMpegAVFrame.h>
-#import <FFMpeg/FFMpegPacket.h>
-#import <FFMpeg/FFMpegAVCodec.h>
-#import <FFMpeg/FFMpegRemuxer.h>
diff --git a/submodules/ffmpeg/Sources/FFMpeg/Info.plist b/submodules/ffmpeg/Sources/FFMpeg/Info.plist
deleted file mode 100644
index e1fe4cfb7b..0000000000
--- a/submodules/ffmpeg/Sources/FFMpeg/Info.plist
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>$(DEVELOPMENT_LANGUAGE)</string>
-	<key>CFBundleExecutable</key>
-	<string>$(EXECUTABLE_NAME)</string>
-	<key>CFBundleIdentifier</key>
-	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>$(PRODUCT_NAME)</string>
-	<key>CFBundlePackageType</key>
-	<string>FMWK</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleVersion</key>
-	<string>$(CURRENT_PROJECT_VERSION)</string>
-</dict>
-</plist>
diff --git a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg.sh b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg.sh
index cc7f8a753b..5d6664b16f 100755
--- a/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg.sh
+++ b/submodules/ffmpeg/Sources/FFMpeg/build-ffmpeg.sh
@@ -85,9 +85,8 @@ for ARCH in $ARCHS
 do
 	for LIB_NAME in $LIB_NAMES
 	do
-		LIB="$SCRATCH/$ARCH/$LIB_NAME/$LIB_NAME.a"
-		if [ -e "$LIB" ]
-		then
+		LIB="$THIN/$ARCH/lib/$LIB_NAME.a"
+		if [ -f "$LIB" ]; then
 			LIB_DATE=`crc32 "$LIB"`
 			LIBS_HASH="$LIBS_HASH $ARCH/$LIB:$LIB_DATE"
 		fi
@@ -117,12 +116,10 @@ then
 		exit 1
 	fi
 
-	CWD="$BUILD_DIR"
 	for ARCH in $ARCHS
 	do
 		echo "building $ARCH..."
 		mkdir -p "$SCRATCH/$ARCH"
-		cd "$SCRATCH/$ARCH"
 
 		LIBOPUS_PATH="$SOURCE_DIR/libopus"
 
@@ -181,7 +178,6 @@ then
 
 		CORE_COUNT=`sysctl -n hw.logicalcpu`
 		make -j$CORE_COUNT install $EXPORT || exit 1
-		cd "$CWD"
 	done
 fi
 
@@ -190,9 +186,8 @@ for ARCH in $ARCHS
 do
 	for LIB_NAME in $LIB_NAMES
 	do
-		LIB="$SCRATCH/$ARCH/$LIB_NAME/$LIB_NAME.a"
-		if [ -e "$LIB" ]
-		then
+		LIB="$THIN/$ARCH/lib/$LIB_NAME.a"
+		if [ -f "$LIB" ]; then
 			LIB_DATE=`crc32 "$LIB"`
 			UPDATED_LIBS_HASH="$UPDATED_LIBS_HASH $ARCH/$LIB:$LIB_DATE"
 		fi
@@ -210,20 +205,17 @@ fi
 
 if [ "$LIPO" ]
 then
-	echo "building fat binaries..."
+	echo "building fat binaries in $FAT"
 	mkdir -p "$FAT"/lib
 	set - $ARCHS
-	CWD="$BUILD_DIR"
-	cd "$THIN/$1/lib"
-	for LIB in *.a
+	for LIB in "$THIN/$1/lib/"*.a
 	do
-		cd "$CWD"
-		echo lipo -create `find "$THIN" -name "$LIB"` -output "$FAT/lib/$LIB" 1>&2
-		LIPO_INPUT=`find "$THIN" -name "$LIB"`
-		lipo -create $LIPO_INPUT -output "$FAT/lib/$LIB" || exit 1
+		LIB_NAME="$(basename $LIB)"
+		echo "LIPO_INPUT command find \"$THIN\" -name \"$LIB_NAME\""
+		LIPO_INPUT=`find "$THIN" -name "$LIB_NAME"`
+		lipo -create $LIPO_INPUT -output "$FAT/lib/$LIB_NAME" || exit 1
 	done
 
-	cd "$CWD"
 	cp -rf "$THIN/$1/include" "$FAT"
 fi
 
diff --git a/submodules/libphonenumber/Sources/NBAsYouTypeFormatter.m b/submodules/libphonenumber/Sources/NBAsYouTypeFormatter.m
index 5b73386866..32a5824c43 100755
--- a/submodules/libphonenumber/Sources/NBAsYouTypeFormatter.m
+++ b/submodules/libphonenumber/Sources/NBAsYouTypeFormatter.m
@@ -5,12 +5,12 @@
 //  Created by ishtar on 13. 2. 25..
 //
 
-#import "NBAsYouTypeFormatter.h"
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBAsYouTypeFormatter.h>
+#import <libphonenumber/NBPhoneNumberDefines.h>
 
 #import "NBMetadataHelper.h"
 
-#import "NBPhoneNumberUtil.h"
+#import <libphonenumber/NBPhoneNumberUtil.h>
 #import "NBPhoneMetaData.h"
 #import "NBNumberFormat.h"
 
diff --git a/submodules/libphonenumber/Sources/NBMetadataCore.m b/submodules/libphonenumber/Sources/NBMetadataCore.m
index efc4dc13cb..ac5cc6be47 100644
--- a/submodules/libphonenumber/Sources/NBMetadataCore.m
+++ b/submodules/libphonenumber/Sources/NBMetadataCore.m
@@ -1,7 +1,7 @@
 // DO NOT EDIT (This file was auto-generated from NBPhoneMetaDataGenerator)
 
 #import "NBMetadataCore.h"
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBPhoneNumberDefines.h>
 #import "NBPhoneNumberDesc.h"
 
 #import "NBNumberFormat.h"
diff --git a/submodules/libphonenumber/Sources/NBMetadataCoreTest.m b/submodules/libphonenumber/Sources/NBMetadataCoreTest.m
index 1a4c042808..02097a0f09 100644
--- a/submodules/libphonenumber/Sources/NBMetadataCoreTest.m
+++ b/submodules/libphonenumber/Sources/NBMetadataCoreTest.m
@@ -1,7 +1,7 @@
 // DO NOT EDIT (This file was auto-generated from NBPhoneMetaDataGenerator)
 
 #import "NBMetadataCoreTest.h"
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBPhoneNumberDefines.h>
 #import "NBPhoneNumberDesc.h"
 
 #import "NBNumberFormat.h"
diff --git a/submodules/libphonenumber/Sources/NBMetadataHelper.h b/submodules/libphonenumber/Sources/NBMetadataHelper.h
index 0429601295..cb05bab7a8 100644
--- a/submodules/libphonenumber/Sources/NBMetadataHelper.h
+++ b/submodules/libphonenumber/Sources/NBMetadataHelper.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBPhoneNumberDefines.h>
 
 
 @class NBPhoneMetaData;
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumber.m b/submodules/libphonenumber/Sources/NBPhoneNumber.m
index 919d0fa972..d70c71def8 100755
--- a/submodules/libphonenumber/Sources/NBPhoneNumber.m
+++ b/submodules/libphonenumber/Sources/NBPhoneNumber.m
@@ -4,8 +4,8 @@
 //
 //
 
-#import "NBPhoneNumber.h"
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBPhoneNumber.h>
+#import <libphonenumber/NBPhoneNumberDefines.h>
 
 
 @implementation NBPhoneNumber
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumberDefines.m b/submodules/libphonenumber/Sources/NBPhoneNumberDefines.m
index e0a3f17299..9462d92611 100644
--- a/submodules/libphonenumber/Sources/NBPhoneNumberDefines.m
+++ b/submodules/libphonenumber/Sources/NBPhoneNumberDefines.m
@@ -1,4 +1,4 @@
-#import "NBPhoneNumberDefines.h"
+#import <libphonenumber/NBPhoneNumberDefines.h>
 
 NSString * const NB_UNKNOWN_REGION = @"ZZ";
 NSString * const NB_NON_BREAKING_SPACE = @"\u00a0";
diff --git a/submodules/libphonenumber/Sources/NBPhoneNumberUtil.m b/submodules/libphonenumber/Sources/NBPhoneNumberUtil.m
index 282ca96cd1..474fd77e0f 100755
--- a/submodules/libphonenumber/Sources/NBPhoneNumberUtil.m
+++ b/submodules/libphonenumber/Sources/NBPhoneNumberUtil.m
@@ -6,9 +6,9 @@
 //  Copyright (c) 2015년 ohtalk.me. All rights reserved.
 //
 
-#import "NBPhoneNumberUtil.h"
-#import "NBPhoneNumberDefines.h"
-#import "NBPhoneNumber.h"
+#import <libphonenumber/NBPhoneNumberUtil.h>
+#import <libphonenumber/NBPhoneNumberDefines.h>
+#import <libphonenumber/NBPhoneNumber.h>
 #import "NBNumberFormat.h"
 #import "NBPhoneNumberDesc.h"
 #import "NBPhoneMetaData.h"
diff --git a/submodules/lottie-ios/BUILD b/submodules/lottie-ios/BUILD
new file mode 100644
index 0000000000..21e90b66c3
--- /dev/null
+++ b/submodules/lottie-ios/BUILD
@@ -0,0 +1,34 @@
+load("//build-system:unique_directories.bzl", "unique_directories")
+
+private_headers = glob([
+    "lottie-ios/**/*.h",
+], exclude = [
+    "lottie-ios/Classes/PublicHeaders/**/*.h",
+])
+
+objc_library(
+    name = "Lottie",
+    enable_modules = True,
+    module_name = "Lottie",
+    srcs = glob([
+        "lottie-ios/**/*.m",
+    ]) + private_headers,
+    copts = [
+        "-Isubmodules/lottie-ios/{}".format(directory) for directory in unique_directories(private_headers)
+    ] + [
+        "-Isubmodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie",
+    ],
+    hdrs = glob([
+        "lottie-ios/Classes/PublicHeaders/**/*.h",
+    ]),
+    includes = [
+        "lottie-ios/Classes/PublicHeaders",
+    ],
+    sdk_frameworks = [
+        "Foundation",
+        "UIKit",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimatedControl.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimatedControl.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimatedControl.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimatedControl.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimatedSwitch.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimatedSwitch.h
similarity index 97%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimatedSwitch.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimatedSwitch.h
index f313415976..b83ad80957 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimatedSwitch.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimatedSwitch.h
@@ -6,7 +6,7 @@
 //  Copyright © 2017 Airbnb. All rights reserved.
 //
 
-#import "LOTAnimatedControl.h"
+#import <Lottie/LOTAnimatedControl.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationCache.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationCache.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationCache.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationCache.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationLayerContainer.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationLayerContainer.h
similarity index 90%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationLayerContainer.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationLayerContainer.h
index 87681b8649..3ef18aff13 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationLayerContainer.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationLayerContainer.h
@@ -1,7 +1,7 @@
 #import <Foundation/Foundation.h>
 #import <UIKit/UIKit.h>
 
-#import "LOTComposition.h"
+#import <Lottie/LOTComposition.h>
 
 @interface LOTAnimationLayerContainer : NSObject
 
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationTransitionController.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationTransitionController.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationTransitionController.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationTransitionController.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationView.h
similarity index 98%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationView.h
index b1b41d96af..190cb7f70c 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationView.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationView.h
@@ -7,10 +7,10 @@
 //  Dream Big.
 
 #import <Foundation/Foundation.h>
-#import "LOTAnimationView_Compat.h"
-#import "LOTComposition.h"
-#import "LOTKeypath.h"
-#import "LOTValueDelegate.h"
+#import <Lottie/LOTAnimationView_Compat.h>
+#import <Lottie/LOTComposition.h>
+#import <Lottie/LOTKeypath.h>
+#import <Lottie/LOTValueDelegate.h>
 
 typedef void (^LOTAnimationCompletionBlock)(BOOL animationFinished);
 
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationView_Compat.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationView_Compat.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTAnimationView_Compat.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTAnimationView_Compat.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTBlockCallback.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTBlockCallback.h
similarity index 99%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTBlockCallback.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTBlockCallback.h
index 2288062dac..1406abfef1 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTBlockCallback.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTBlockCallback.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
-#import "LOTValueDelegate.h"
+#import <Lottie/LOTValueDelegate.h>
 
 /*!
  @brief A block that is used to change a Color value at keytime, the block is called continuously for a keypath while the aniamtion plays.
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTCacheProvider.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTCacheProvider.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTCacheProvider.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTCacheProvider.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTComposition.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTComposition.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTComposition.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTComposition.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTInterpolatorCallback.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTInterpolatorCallback.h
similarity index 98%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTInterpolatorCallback.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTInterpolatorCallback.h
index 7cf7198e1d..6d1bec042f 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTInterpolatorCallback.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTInterpolatorCallback.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
-#import "LOTValueDelegate.h"
+#import <Lottie/LOTValueDelegate.h>
 
 /*!
  @brief LOTPointInterpolatorCallback is a container for a CGPointRef. This container is a LOTPointValueDelegate that will return the point interpolated at currentProgress between fromPoint and toPoint. Externally changing currentProgress will change the point of the animation.
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTKeypath.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTKeypath.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTKeypath.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTKeypath.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTValueCallback.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTValueCallback.h
similarity index 98%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTValueCallback.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTValueCallback.h
index 05cb262524..127dcd9d24 100644
--- a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTValueCallback.h
+++ b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTValueCallback.h
@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import <CoreGraphics/CoreGraphics.h>
-#import "LOTValueDelegate.h"
+#import <Lottie/LOTValueDelegate.h>
 
 /*!
  @brief LOTColorValueCallback is a container for a CGColorRef. This container is a LOTColorValueDelegate that always returns the colorValue property to its animation delegate.
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTValueDelegate.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTValueDelegate.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/LOTValueDelegate.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/LOTValueDelegate.h
diff --git a/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie.h b/submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/Lottie.h
similarity index 100%
rename from submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie.h
rename to submodules/lottie-ios/lottie-ios/Classes/PublicHeaders/Lottie/Lottie.h
diff --git a/submodules/webp/BUILD b/submodules/webp/BUILD
new file mode 100644
index 0000000000..5c072543a8
--- /dev/null
+++ b/submodules/webp/BUILD
@@ -0,0 +1,25 @@
+
+cc_library(
+    name = "webp_lib",
+    srcs = [
+        "lib/libwebp.a",
+    ],
+)
+
+objc_library(
+    name = "webp",
+    module_name = "webp",
+    enable_modules = True,
+    hdrs = glob([
+        "include/**/*.h",
+    ]),
+    includes = [
+        "include",
+    ],
+    deps = [
+        ":webp_lib",
+    ],
+    visibility = [
+        "//visibility:public",
+    ]
+)
diff --git a/submodules/webp/WebP/WebP.h b/submodules/webp/WebP/WebP.h
deleted file mode 100644
index f07843d10d..0000000000
--- a/submodules/webp/WebP/WebP.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#import <UIKit/UIKit.h>
-
-//! Project version number for WebP.
-FOUNDATION_EXPORT double WebPVersionNumber;
-
-//! Project version string for WebP.
-FOUNDATION_EXPORT const unsigned char WebPVersionString[];
-
-#import <WebP/UIImage+WebP.h>